Merge pull request #317 from mnfienen/develop

pst_from.add_parameters() for pps assume all cells active if no zone …
pypest · Jan 6, 2022 · f380260 · f380260
2 parents f3722ca + 48af878
commit f380260
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/autotest/pst_from_tests.py b/autotest/pst_from_tests.py
@@ -247,6 +247,10 @@ def freyberg_test():
                       zone_array=m.bas6.ibound[0].array,
                       par_name_base="rch_datetime:1-1-1970", pp_space=1,
                       ult_ubound=100, ult_lbound=0.0)
+    pf.add_parameters(filenames="rech_1.ref", par_type="pilot_point",
+                      par_name_base="rch_datetime:1-1-1970", pp_space=1,
+                      ult_ubound=100, ult_lbound=0.0)
+
 
     # add model run command
     pf.mod_sys_cmds.append("{0} {1}".format(mf_exe_name, m.name + ".nam"))
@@ -3619,7 +3623,7 @@ def mf6_subdir_test():
 if __name__ == "__main__":
     #mf6_freyberg_pp_locs_test()
     # invest()
-    # freyberg_test()
+    freyberg_test()
     #freyberg_prior_build_test()
     # mf6_freyberg_test()
     #$mf6_freyberg_da_test()
@@ -3637,7 +3641,7 @@ def mf6_subdir_test():
     # tpf.test_add_array_parameters_pps_grid()
     # # pstfrom_profile()
     #mf6_freyberg_arr_obs_and_headerless_test()
-    usg_freyberg_test()
+    #usg_freyberg_test()
 
 
 
diff --git a/pyemu/utils/pst_from.py b/pyemu/utils/pst_from.py
@@ -2088,6 +2088,9 @@ def add_parameters(
                     if not use_pp_zones and (isinstance(pp_space, int)):
                         # if not using pp zones will set up pp for just one
                         # zone (all non zero) -- for active domain...
+                        if zone_array is None:
+                            nr, nc = file_dict[list(file_dict.keys())[0]].shape
+                            zone_array = np.ones((nr,nc))                        
                         zone_array[zone_array > 0] = 1  # so can set all
                         # gt-zero to 1
                     if isinstance(pp_space, float):