analyze timestep scaling issue

Author: xLPMG

configs/config.json

@@ -7,7 +7,7 @@
     "nx":100,
     "ny":100,
     "setup":"CIRCULARDAMBREAK2D",
-    "writingFrequency":100,
+    "writingFrequency":50,
     "endTime":50,
     "stations":[
         { "name":"station_1", "locX":0, "locY":10 },

src/Simulator.cpp

@@ -85,7 +85,6 @@ void tsunami_lab::Simulator::loadConfiguration()
 {
   std::cout << ">> Loading configuration from local json data" << std::endl;
 
-  std::cout<<m_configData<<std::endl;
   m_solver = m_configData.value("solver", "fwave");
   // read size config
   m_nx = m_configData.value("nx", 1);
@@ -98,12 +97,10 @@ void tsunami_lab::Simulator::loadConfiguration()
   m_offsetX = m_configData.value("offsetX", 0);
   m_offsetY = m_configData.value("offsetY", 0);
   m_endTime = m_configData.value("endTime", 20);
-  m_height = m_configData.value("height",0);
-  m_baseHeight = m_configData.value("baseHeight", 0);
-  m_diameter = m_configData.value("diameter",0);
-  m_timeStepScaling = m_configData.value("timeStepScaling",100);
-
-  m_timeStepScaling /=100; // without this step m_timespteps was set to 0 every time a json value is not 1
+  m_height = m_configData.value("height",10);
+  m_baseHeight = m_configData.value("baseHeight", 5);
+  m_diameter = m_configData.value("diameter",10);
+  m_timeStepScaling = m_configData.value("timeStepScaling",1.0);
 
   // read boundary config
   std::string l_boundaryStringL = m_configData.value("boundaryL", "outflow");
@@ -510,7 +507,7 @@ void tsunami_lab::Simulator::deriveTimeStep()
   }
   else
   {
-    m_dt = m_timeStepScaling * 0.45 * std::min(m_dx, m_dy) / l_speedMax; //TODO Add timestepScaling
+    m_dt = m_timeStepScaling * 0.45 * std::min(m_dx, m_dy) / l_speedMax;
   }
 
   // calculate max time steps

src/ui/GUI.cpp

@@ -127,7 +127,7 @@ json tsunami_lab::ui::GUI::createConfigJson()
                    {"bathymetry", m_bathymetryFilePath},
                    {"displacement", m_displacementFilePath},
                    {"height", m_height},
-                   {"timeStepScaling", std::ceil(m_timeStepScaling * 100.0)},
+                   {"timeStepScaling", m_timeStepScaling},
                    {"baseHeight", m_baseHeight},
                    {"diameter", m_diameter}};
     // stations
@@ -1035,13 +1035,12 @@ int tsunami_lab::ui::GUI::launch()
                 ImGui::Text("Current time step scaling: %f", m_timeStepScaling);
                 ImGui::SliderFloat("Scaling (0-1)", &m_timeStepScaling, 0.1f, 1.0f, "%.2f");
                 ImGui::SameLine();
-                HelpMarker("The default value is 1. Smaller numbers lead to more timesteps and thus to a more detailed simulation");
+                HelpMarker("The default value is 1. Smaller numbers lead to more timesteps and thus to a more detailed simulation. However this also increases the computation time."); 
                 ImGui::TreePop();
             }
 
             if (ImGui::Button("Update server with changes"))
             {
-                std::cout<< "gui -"<<m_timeStepScaling<<std::endl;
                 xlpmg::Message saveConfigMsg = xlpmg::LOAD_CONFIG_JSON;
                 saveConfigMsg.args = createConfigJson();
                 m_communicator.sendToServer(xlpmg::messageToJsonString(saveConfigMsg));