Merge branch 'development' into SmagMost

erf-model · Jan 26, 2024 · 3bc1062 · 3bc1062
2 parents ed5a09a + bc627f2
commit 3bc1062
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/IO/Checkpoint.cpp b/Source/IO/Checkpoint.cpp
@@ -171,7 +171,7 @@ ERF::WriteCheckpointFile () const
 
 #ifdef ERF_USE_NETCDF
    // Write bdy_data files
-   if (ParallelDescriptor::IOProcessor() && (init_type == "real")) {
+   if (ParallelDescriptor::IOProcessor() && ((init_type=="real") || (init_type="metgrid"))) {
 
      // Vector dimensions
      int num_time = bdy_data_xlo.size();
@@ -372,7 +372,7 @@ ERF::ReadCheckpointFile ()
 
 #ifdef ERF_USE_NETCDF
     // Read bdy_data files
-    if (init_type == "real") {
+    if ((init_type=="real") || (init_type="metgrid")) {
         int ioproc = ParallelDescriptor::IOProcessorNumber();  // I/O rank
         int num_time;
         int num_var;

diff --git a/Source/Initialization/ERF_init_from_metgrid.cpp b/Source/Initialization/ERF_init_from_metgrid.cpp
@@ -499,7 +499,7 @@ ERF::init_from_metgrid (int lev)
                 xlo_plane = xlo_plane_no_stag; xhi_plane = xhi_plane_no_stag;
                 ylo_plane = ylo_plane_no_stag; yhi_plane = yhi_plane_no_stag;
             } else if (ivar == MetGridBdyVars::QV) {
-                multiply_rho = true;
+                multiply_rho = false;
                 xlo_plane = xlo_plane_no_stag; xhi_plane = xhi_plane_no_stag;
                 ylo_plane = ylo_plane_no_stag; yhi_plane = yhi_plane_no_stag;
             } // MetGridBdyVars::QV