Merge pull request #2019 from wenqing/fixing

Added a missed parameter documentation and ran clang-tidy for some files
ufz · Dec 11, 2017 · 9b2d028 · 9b2d028
2 parents c9abfb8 + 9179831
commit 9b2d028
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/...ation/ProjectFile/prj/processes/process/ComponentTransport/t_coupling_scheme.md b/...ation/ProjectFile/prj/processes/process/ComponentTransport/t_coupling_scheme.md
@@ -0,0 +1,2 @@
+An optional input to select the coupling scheme. So far, only the monolithic
+scheme is available for HYDRO_MECHANICS, and this input can be omitted.
diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
@@ -36,10 +36,10 @@ std::unique_ptr<Process> createComponentTransportProcess(
 
     DBUG("Create ComponentTransportProcess.");
     auto const staggered_scheme =
-        //! \ogs_file_param{prj__processes__process__coupling_scheme}
+        //! \ogs_file_param{prj__processes__process__ComponentTransport__coupling_scheme}
         config.getConfigParameterOptional<std::string>("coupling_scheme");
     const bool use_monolithic_scheme =
-        (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+        !(staggered_scheme && (*staggered_scheme == "staggered"));
 
     // Process variable.
 

diff --git a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp
@@ -39,7 +39,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
         //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS__coupling_scheme}
         config.getConfigParameterOptional<std::string>("coupling_scheme");
     const bool use_monolithic_scheme =
-        (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+        !(staggered_scheme && (*staggered_scheme == "staggered"));
 
     // Process variable.
 

diff --git a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
@@ -43,7 +43,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
         //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__coupling_scheme}
         config.getConfigParameterOptional<std::string>("coupling_scheme");
     const bool use_monolithic_scheme =
-        (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+        !(staggered_scheme && (*staggered_scheme == "staggered"));
 
     // Process variables
     //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__process_variables}

diff --git a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp
@@ -40,7 +40,7 @@ std::unique_ptr<Process> createPhaseFieldProcess(
         //! \ogs_file_param{prj__processes__process__PHASE_FIELD__coupling_scheme}
         config.getConfigParameterOptional<std::string>("coupling_scheme");
     const bool use_monolithic_scheme =
-        (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+        !(staggered_scheme && (*staggered_scheme == "staggered"));
 
     // Process variable.
 

diff --git a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp
@@ -40,7 +40,7 @@ std::unique_ptr<Process> createRichardsComponentTransportProcess(
         //! \ogs_file_param{prj__processes__process__RichardsComponentTransport__coupling_scheme}
         config.getConfigParameterOptional<std::string>("coupling_scheme");
     const bool use_monolithic_scheme =
-        (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+        !(staggered_scheme && (*staggered_scheme == "staggered"));
 
     // Process variable.
 

diff --git a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
@@ -40,7 +40,7 @@ std::unique_ptr<Process> createThermoMechanicsProcess(
         //! \ogs_file_param{prj__processes__process__THERMO_MECHANICS__coupling_scheme}
         config.getConfigParameterOptional<std::string>("coupling_scheme");
     const bool use_monolithic_scheme =
-        (staggered_scheme && (*staggered_scheme == "staggered")) ? false : true;
+        !(staggered_scheme && (*staggered_scheme == "staggered"));
 
     // Process variable.