mod to not use specsim for pilot point draws

jtwhite79 · Sep 5, 2021 · 447b6a1 · 447b6a1
1 parent 73d7c07
commit 447b6a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/autotest/pst_from_tests.py b/autotest/pst_from_tests.py
@@ -718,7 +718,7 @@ def mf6_freyberg_test():
                 pf.add_parameters(filenames=arr_file, par_type="pilotpoints", par_name_base=arr_file.split('.')[1]+"_pp",
                                   pargp=arr_file.split('.')[1]+"_pp", zone_array=ib,upper_bound=ub,lower_bound=lb,
                                   ult_ubound=None if ult_ub is None else ult_ub - 1,
-                                  ult_lbound=None if ult_lb is None else ult_lb - 1)
+                                  ult_lbound=None if ult_lb is None else ult_lb - 1,geostruct=gr_gs)
 
                 # use a slightly lower ult bound here
                 pf.add_parameters(filenames=arr_file, par_type="constant",

diff --git a/pyemu/utils/pst_from.py b/pyemu/utils/pst_from.py
@@ -504,11 +504,9 @@ def draw(self, num_reals=100, sigma_range=6, use_specsim=False, scale_offset=Tru
             # (setup through add_parameters)
             for geostruct, par_df_l in struct_dict.items():
                 par_df = pd.concat(par_df_l)  # force to single df
-                if (
-                    "i" in par_df.columns and par_df.partype[0] == "grid"
-                ):  # need 'i' and 'j' for specsim
-                    # grid par slicer
-                    grd_p = pd.notna(par_df.i)  # & (par_df.partype == 'grid') &
+                par_df = par_df.loc[par_df.partype == "grid", :]
+                if "i" in par_df.columns:  # need 'i' and 'j' for specsim
+                    grd_p = pd.notna(par_df.i)
                 else:
                     grd_p = np.array([0])
                 # if there are grid pars (also grid pars with i,j info)