passing surface_in_memory from XSCAPE to MUSIC

calling check_parameters() after all parameters were set from the external XSCAPE
MUSIC-fluid · Nov 15, 2023 · 92a458b · 92a458b
1 parent 4b064f7
commit 92a458b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/src/music.cpp b/src/music.cpp
@@ -99,6 +99,11 @@ void MUSIC::set_parameter(std::string parameter_name, double value) {
 }
 
 
+void MUSIC::check_parameters() {
+    ReadInParameters::check_parameters(DATA);
+}
+
+
 //! This function initialize hydro
 void MUSIC::initialize_hydro() {
     clean_all_the_surface_files();

diff --git a/src/music.h b/src/music.h
@@ -61,6 +61,7 @@ class MUSIC {
 
     //! This function change the parameter value in DATA
     void set_parameter(std::string parameter_name, double value);
+    void check_parameters();
 
     //! this is a shell function to run hydro
     int run_hydro();

diff --git a/src/read_in_parameters.cpp b/src/read_in_parameters.cpp
@@ -1080,7 +1080,7 @@ InitData read_in_parameters(std::string input_file) {
     parameter_list.dNdyptdpt_eta_max = temp_dNdyptdpt_eta_max;
 
     music_message.info("Done read_in_parameters.");
-    check_parameters(parameter_list, input_file);
+    check_parameters(parameter_list);
 
     return parameter_list;
 }
@@ -1121,6 +1121,14 @@ void set_parameter(InitData &parameter_list, std::string parameter_name,
     if (parameter_name == "Shear_to_S_ratio")
         parameter_list.shear_to_s = value;
 
+    if (parameter_name == "surface_in_memory") {
+        if (value == 1) {
+            parameter_list.surface_in_memory = true;
+        } else if (value == 0) {
+            parameter_list.surface_in_memory = false;
+        }
+    }
+
     if (parameter_name == "T_freeze") {
         parameter_list.TFO = value;
         parameter_list.useEpsFO = 0;
@@ -1180,7 +1188,7 @@ void set_parameter(InitData &parameter_list, std::string parameter_name,
 }
 
 
-void check_parameters(InitData &parameter_list, std::string input_file) {
+void check_parameters(InitData &parameter_list) {
     music_message.info("Checking input parameter list ... ");
 
     if (parameter_list.Initial_profile < 0) {

diff --git a/src/read_in_parameters.h b/src/read_in_parameters.h
@@ -11,7 +11,7 @@
 //! This class handles read in parameters
 namespace ReadInParameters {
     InitData read_in_parameters(std::string input_file);
-    void check_parameters(InitData &parameter_list, std::string input_file);
+    void check_parameters(InitData &parameter_list);
     void set_parameter(InitData &parameter_list, std::string parameter_name,
                        double value);
 }