Merge remote-tracking branch 'origin/develop'

usgs · Jul 14, 2020 · 04bac2b · 04bac2b
2 parents bb16bf5 + 40eb585
commit 04bac2b
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 1,534 deletions.
diff --git a/benchmarks/basic_tests.py b/benchmarks/basic_tests.py
@@ -811,7 +811,7 @@ def ext_stdcol_test():
     obs.loc[pst.nnz_obs_names,"standard_deviation"] = 7.5
     pst.write(os.path.join(m_d,"pest_ext_stdcol.pst"),version=2)
     pyemu.os_utils.run("{0} pest_ext_stdcol.pst".format(exe_path),cwd=m_d)
-    df = pd.read_csv(os.path.join(m_d,"pest_ext_stdcol.base.obs.csv"),index_col=0).loc[:,pst.nnz_obs_names]
+    df = pd.read_csv(os.path.join(m_d,"pest_ext_stdcol.obs+noise.csv"),index_col=0).loc[:,pst.nnz_obs_names]
     d = (df.std() - obs.loc[pst.nnz_obs_names,"standard_deviation"]).apply(np.abs)
     print(d)
     assert d.max() < 0.1,d.max()
@@ -822,7 +822,7 @@ def ext_stdcol_test():
     par.loc[pst.adj_par_names[0],"mean"] = par.loc[pst.adj_par_names[0],"parubnd"]
     pst.write(os.path.join(m_d,"pest_ext_stdcol.pst"),version=2)
     pyemu.os_utils.run("{0} pest_ext_stdcol.pst".format(exe_path),cwd=m_d)
-    df = pd.read_csv(os.path.join(m_d,"pest_ext_stdcol.base.obs.csv"),index_col=0).loc[:,pst.nnz_obs_names]
+    df = pd.read_csv(os.path.join(m_d,"pest_ext_stdcol.obs+noise.csv"),index_col=0).loc[:,pst.nnz_obs_names]
     mn = df.min()
     mx = df.max()
     dmn = mn - obs.loc[pst.nnz_obs_names,"obsval"] * 0.9

diff --git a/documentation/pestpp4.3.18.docx → documentation/pestpp4.3.19.docx b/documentation/pestpp4.3.18.docx → documentation/pestpp4.3.19.docx
diff --git a/src/libs/common/config_os.h b/src/libs/common/config_os.h
@@ -2,7 +2,7 @@
 #define CONFIG_OS_H_
 
 
-#define PESTPP_VERSION "4.3.18";
+#define PESTPP_VERSION "4.3.19";
 
 #if defined(_WIN32) || defined(_WIN64)
 #define OS_WIN

diff --git a/src/libs/pestpp_common/EnsembleSmoother.cpp b/src/libs/pestpp_common/EnsembleSmoother.cpp
@@ -1220,19 +1220,20 @@ void IterEnsembleSmoother::initialize()
 	}
 	message(1, "saved initial parameter ensemble to ", ss.str());
 	message(2, "checking for denormal values in base oe");
-	oe.check_for_normal("base observation ensemble");
+	oe.check_for_normal("obs+noise observation ensemble");
 	ss.str("");
 	if (pest_scenario.get_pestpp_options().get_ies_save_binary())
 	{
-		ss << file_manager.get_base_filename() << ".base.obs.jcb";
+		ss << file_manager.get_base_filename() << ".obs+noise.jcb";
 		oe.to_binary(ss.str());
 	}
 	else
 	{
-		ss << file_manager.get_base_filename() << ".base.obs.csv";
+		ss << file_manager.get_base_filename() << ".obs+noise.csv";
 		oe.to_csv(ss.str());
 	}
-	message(1, "saved base observation ensemble (obsval+noise) to ", ss.str());
+	message(1, "saved obs+noise observation ensemble (obsval+noise) to ", ss.str());
+
 
 	if (center_on.size() > 0)
 	{

diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt
@@ -1,5 +1,5 @@
 # This CMake file is part of PEST++
 
-if(Fortran_ENABLED)
-  add_subdirectory(inschekpp)
-endif()
+# if(Fortran_ENABLED)
+#   add_subdirectory(inschekpp)
+# endif()
diff --git a/src/utilities/inschekpp/CMakeLists.txt b/src/utilities/inschekpp/CMakeLists.txt