update travis yml

.travis.yml

@@ -31,6 +31,8 @@ matrix:
       env: TEST_SCRIPT="smoother_tests.py"
     - name: "full meal deal tests"
       env: TEST_SCRIPT="full_meal_deal_tests.py"
+    - name: "plot tests"
+      env: TEST_SCRIPT="plot_tests.py"
 
 
 
@@ -63,7 +65,7 @@ before_install:
   - ln -fs /usr/bin/g++-6 "$HOME/.local/bin/g++" && g++ --version
   - ls -l /usr/bin/g++-6
   - export CXX="g++"
-  - git clone -b develop --depth 1 https://github.com/jtwhite79/pestpp
+  - git clone -b develop --depth 1 https://github.com/usgs/pestpp
   - cd pestpp/src
   - bindir=../../../../bin/linux COMPILER=gcc CXX=g++ FC=gfortran STATIC=no make -j 20 install
   - cd ../../

autotest/full_meal_deal_tests.py

@@ -13,7 +13,7 @@
 
 
 mf_exe_name = os.path.join(bin_path,"mfnwt")
-pp_exe_name = os.path.join(bin_path, "pestpp-inv")
+pp_exe_name = os.path.join(bin_path, "pestpp-glm")
 ies_exe_name = os.path.join(bin_path, "pestpp-ies")
 swp_exe_name = os.path.join(bin_path, "pestpp-swp")
 
@@ -28,7 +28,7 @@ def freyberg_test():
     import pandas as pd
     try:
         import flopy
-    except:
+    except Exception as e:
         return
     import pyemu
 
@@ -105,9 +105,13 @@ def freyberg_test():
     ph.pst.control_data.noptmax = 1
     ph.pst.write(os.path.join(new_model_ws, "test.pst"))
     master_dir = "test_master"
-    pyemu.os_utils.start_slaves(new_model_ws,ies_exe_name,"test.pst",
-                                num_slaves=10,slave_root='.',
-                                master_dir=master_dir,silent_master=True)
+    pyemu.os_utils.start_workers(new_model_ws,ies_exe_name,"test.pst",
+                                num_workers=10,worker_root='.',
+                                master_dir=master_dir,silent_master=False)
+    pyemu.os_utils.start_slaves(new_model_ws, ies_exe_name, "test.pst",
+                                 num_slaves=10,slave_root='.',
+                                 master_dir=master_dir, silent_master=False)
+
     df = pd.read_csv(os.path.join(master_dir,"test.phi.meas.csv"),index_col=0)
     init_phi = df.loc[0,"mean"]
     final_phi = df.loc[1,"mean"]
@@ -116,11 +120,12 @@ def freyberg_test():
 
 def fake_run_test():
     import os
+    import numpy as np
     import pyemu
     new_model_ws = "template1"
     if not os.path.exists(new_model_ws):
         freyberg_test()
-    pst = pyemu.Pst(os.path.join(new_model_ws,"test.pst"))
+    pst = pyemu.Pst(os.path.join(new_model_ws,"freyberg.pst"))
     pst.pestpp_options["ies_num_reals"] = 10
     pst.pestpp_options["ies_par_en"] = "par_en.csv"
     pst.control_data.noptmax = 0
@@ -130,7 +135,16 @@ def fake_run_test():
 
     new_cwd = "fake_test"
     pst = pyemu.helpers.setup_fake_forward_run(pst, "fake.pst", org_cwd=new_model_ws,new_cwd=new_cwd)
-    pyemu.os_utils.run("{0} {1}".format(pp_exe_name, "fake.pst"), cwd=new_cwd)
+    s = pst.process_output_files(new_cwd)
+    if s is not None:
+        assert s.dropna().shape[0] == pst.nobs
+        obs = pst.observation_data
+
+        diff = (100 * (obs.obsval - s.obsval) / obs.obsval).apply(np.abs)
+
+        print(diff)
+        print(obs.loc[diff>0.0,"obsval"],s.loc[diff>0.0,"obsval"])
+        assert diff.sum() < 1.0e-3,diff.sum()
     pyemu.os_utils.run("{0} {1}".format(ies_exe_name, "fake.pst"), cwd=new_cwd)
 
 
@@ -142,7 +156,7 @@ def freyberg_kl_pp_compare():
     import pandas as pd
     try:
         import flopy
-    except:
+    except Exception as e:
         return
     import pyemu
 
@@ -214,7 +228,7 @@ def freyberg_kl_pp_compare():
     ph.pst.parameter_data.loc[ph.pst.parameter_data.pargp == "pp_hk0", "partrans"] = "fixed"
     ph.pst.write(os.path.join(new_model_ws, "pest_kl.pst"))
 
-    pyemu.os_utils.start_slaves(new_model_ws,"pestpp-ies","pest_pp.pst", num_slaves=10,slave_root='.',
+    pyemu.os_utils.start_workers(new_model_ws,"pestpp-ies","pest_pp.pst", num_workers=10,worker_root='.',
                                 master_dir="pest_pp")
 
 
@@ -225,7 +239,7 @@ def run_sweep_test():
     import pandas as pd
     try:
         import flopy
-    except:
+    except Exception as e:
         return
     import pyemu
 
@@ -282,7 +296,7 @@ def run_sweep_test():
     pe = ph.draw(20)
     bd = os.getcwd()
     try:
-        oe = pe.run(slave_dir=new_model_ws)
+        oe = pe.run(worker_dir=new_model_ws)
         print(oe.shape)
     except Exception as e:
         os.chdir(bd)
@@ -291,7 +305,7 @@ def run_sweep_test():
     mc = pyemu.MonteCarlo(pst=ph.pst)
     mc.draw(20)
     try:
-        mc.run(slave_dir=new_model_ws)
+        mc.run(worker_dir=new_model_ws)
 
     except Exception as e:
         os.chdir(bd)
@@ -301,8 +315,8 @@ def run_sweep_test():
 
 
 if __name__ == "__main__":
-    freyberg_test()
+    #freyberg_test()
     #freyberg_kl_pp_compare()
     #import shapefile
     #run_sweep_test()
-    #fake_run_test()
+    fake_run_test()