Merge pull request cholla-hydro#373 from helenarichie/dev

Patch to fix logic of floor warning messages
evaneschneider · Feb 8, 2024 · d2ac33b · d2ac33b
2 parents ae75fe3 + 5dfef2a
commit d2ac33b
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/src/global/global.cpp b/src/global/global.cpp
@@ -185,6 +185,27 @@ void Parse_Params(char *param_file, struct Parameters *parms, int argc, char **a
     Parse_Param(name, value, parms);
     chprintf("Override with %s=%s\n", name, value);
   }
+#ifdef TEMPERATURE_FLOOR
+  if (parms->temperature_floor == 0) {
+    chprintf(
+        "WARNING: temperature floor is set to its default value (zero)! It can be set to a different value in the "
+        "input parameter file.\n");
+  }
+#endif
+#ifdef DENSITY_FLOOR
+  if (parms->density_floor == 0) {
+    chprintf(
+        "WARNING: density floor is set to its default value (zero)! It can be set to a different value in the input "
+        "parameter file.\n");
+  }
+#endif
+#ifdef SCALAR_FLOOR
+  if (parms->scalar_floor == 0) {
+    chprintf(
+        "WARNING: scalar floor is set to its default value (zero)! It can be set to a different value in the input "
+        "parameter file.\n");
+  }
+#endif
 }
 
 /*! \fn void Parse_Param(char *name,char *value, struct Parameters *parms);
@@ -443,29 +464,14 @@ void Parse_Param(char *name, char *value, struct Parameters *parms)
 #ifdef TEMPERATURE_FLOOR
   } else if (strcmp(name, "temperature_floor") == 0) {
     parms->temperature_floor = atof(value);
-    if (parms->temperature_floor == 0) {
-      chprintf(
-          "WARNING: temperature floor is set to its default value (zero)! It can be set to a different value in the "
-          "input parameter file.\n");
-    }
 #endif
 #ifdef DENSITY_FLOOR
   } else if (strcmp(name, "density_floor") == 0) {
     parms->density_floor = atof(value);
-    if (parms->density_floor == 0) {
-      chprintf(
-          "WARNING: density floor is set to its default value (zero)! It can be set to a different value in the input "
-          "parameter file.\n");
-    }
 #endif
 #ifdef SCALAR_FLOOR
   } else if (strcmp(name, "scalar_floor") == 0) {
     parms->scalar_floor = atof(value);
-    if (parms->scalar_floor == 0) {
-      chprintf(
-          "WARNING: scalar floor is set to its default value (zero)! It can be set to a different value in the input "
-          "parameter file.\n");
-    }
 #endif
 #ifdef ANALYSIS
   } else if (strcmp(name, "analysis_scale_outputs_file") == 0) {