From 680fbd1d0fcd46519eeaaa6767c8cca9647d629f Mon Sep 17 00:00:00 2001 From: jdhughes-usgs Date: Mon, 31 Aug 2020 10:57:03 -0400 Subject: [PATCH] refactor(load): refactor load methods to use @classmethod Closes #984 --- flopy/modflow/mf.py | 3 ++- flopy/modflow/mfag.py | 4 ++-- flopy/modflow/mfbas.py | 4 ++-- flopy/modflow/mfbcf.py | 4 ++-- flopy/modflow/mfchd.py | 4 ++-- flopy/modflow/mfde4.py | 4 ++-- flopy/modflow/mfdis.py | 4 ++-- flopy/modflow/mfdisu.py | 4 ++-- flopy/modflow/mfdrn.py | 4 ++-- flopy/modflow/mfdrt.py | 4 ++-- flopy/modflow/mfevt.py | 4 ++-- flopy/modflow/mffhb.py | 4 ++-- flopy/modflow/mfflwob.py | 4 ++-- flopy/modflow/mfgage.py | 4 ++-- flopy/modflow/mfghb.py | 4 ++-- flopy/modflow/mfgmg.py | 4 ++-- flopy/modflow/mfhfb.py | 4 ++-- flopy/modflow/mfhob.py | 4 ++-- flopy/modflow/mfhyd.py | 4 ++-- flopy/modflow/mflak.py | 4 ++-- flopy/modflow/mflmt.py | 4 ++-- flopy/modflow/mflpf.py | 4 ++-- flopy/modflow/mfmlt.py | 4 ++-- flopy/modflow/mfmnw1.py | 4 ++-- flopy/modflow/mfmnw2.py | 4 ++-- flopy/modflow/mfmnwi.py | 4 ++-- flopy/modflow/mfnwt.py | 4 ++-- flopy/modflow/mfoc.py | 6 ++++-- flopy/modflow/mfpar.py | 4 ++-- flopy/modflow/mfparbc.py | 4 ++-- flopy/modflow/mfpcg.py | 4 ++-- flopy/modflow/mfpcgn.py | 4 ++-- flopy/modflow/mfpks.py | 4 ++-- flopy/modflow/mfpval.py | 4 ++-- flopy/modflow/mfrch.py | 4 ++-- flopy/modflow/mfriv.py | 4 ++-- flopy/modflow/mfsfr2.py | 4 ++-- flopy/modflow/mfsip.py | 4 ++-- flopy/modflow/mfsms.py | 4 ++-- flopy/modflow/mfsor.py | 4 ++-- flopy/modflow/mfstr.py | 4 ++-- flopy/modflow/mfsub.py | 4 ++-- flopy/modflow/mfswi2.py | 4 ++-- flopy/modflow/mfswr1.py | 4 ++-- flopy/modflow/mfswt.py | 4 ++-- flopy/modflow/mfupw.py | 4 ++-- flopy/modflow/mfuzf1.py | 4 ++-- flopy/modflow/mfwel.py | 4 ++-- flopy/modflow/mfzon.py | 4 ++-- flopy/modflowlgr/mflgr.py | 3 ++- flopy/modpath/mp7.py | 3 ++- flopy/mt3d/mt.py | 3 ++- flopy/mt3d/mtadv.py | 4 ++-- flopy/mt3d/mtbtn.py | 4 ++-- flopy/mt3d/mtcts.py | 3 ++- flopy/mt3d/mtdsp.py | 6 ++++-- flopy/mt3d/mtgcg.py | 4 ++-- flopy/mt3d/mtlkt.py | 6 ++++-- flopy/mt3d/mtrct.py | 3 ++- flopy/mt3d/mtsft.py | 4 ++-- flopy/mt3d/mtssm.py | 3 ++- flopy/mt3d/mtuzt.py | 3 ++- flopy/pakbase.py | 4 ++-- flopy/seawat/swt.py | 3 ++- flopy/seawat/swtvdf.py | 4 ++-- flopy/seawat/swtvsc.py | 4 ++-- flopy/utils/optionblock.py | 4 ++-- flopy/utils/rasters.py | 4 ++-- flopy/utils/reference.py | 4 ++-- flopy/utils/util_array.py | 6 ++++-- 70 files changed, 148 insertions(+), 131 deletions(-) diff --git a/flopy/modflow/mf.py b/flopy/modflow/mf.py index f8dea2e496..d7254151c8 100644 --- a/flopy/modflow/mf.py +++ b/flopy/modflow/mf.py @@ -670,8 +670,9 @@ def load_results(self, **kwargs): else: return hdObj, ddObj, bdObj - @staticmethod + @classmethod def load( + cls, f, version="mf2005", exe_name="mf2005.exe", diff --git a/flopy/modflow/mfag.py b/flopy/modflow/mfag.py index e99f59bf16..ffe8e9ce17 100644 --- a/flopy/modflow/mfag.py +++ b/flopy/modflow/mfag.py @@ -685,8 +685,8 @@ def get_default_dtype(maxells=0, block="well"): return np.dtype(dtype) - @staticmethod - def load(f, model, nper=0, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=0, ext_unit_dict=None): """ Method to load the AG package from file diff --git a/flopy/modflow/mfbas.py b/flopy/modflow/mfbas.py index e22a1f95e7..d82e5a1d4e 100644 --- a/flopy/modflow/mfbas.py +++ b/flopy/modflow/mfbas.py @@ -286,8 +286,8 @@ def write_file(self, check=True): # Close file f_bas.close() - @staticmethod - def load(f, model, ext_unit_dict=None, check=True, **kwargs): + @classmethod + def load(cls, f, model, ext_unit_dict=None, check=True, **kwargs): """ Load an existing package. diff --git a/flopy/modflow/mfbcf.py b/flopy/modflow/mfbcf.py index a05dd1ece2..0bc6d6ff99 100644 --- a/flopy/modflow/mfbcf.py +++ b/flopy/modflow/mfbcf.py @@ -320,8 +320,8 @@ def write_file(self, f=None): f_bcf.write(self.wetdry[k].get_file_entry()) f_bcf.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfchd.py b/flopy/modflow/mfchd.py index 6c8d084696..23e7e7e31c 100644 --- a/flopy/modflow/mfchd.py +++ b/flopy/modflow/mfchd.py @@ -225,8 +225,8 @@ def get_default_dtype(structured=True): def get_sfac_columns(): return ["shead", "ehead"] - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfde4.py b/flopy/modflow/mfde4.py index 95cce31b57..53658abf2c 100644 --- a/flopy/modflow/mfde4.py +++ b/flopy/modflow/mfde4.py @@ -227,8 +227,8 @@ def write_file(self): f.write("\n") f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfdis.py b/flopy/modflow/mfdis.py index 210be95a23..231d1596d3 100644 --- a/flopy/modflow/mfdis.py +++ b/flopy/modflow/mfdis.py @@ -848,8 +848,8 @@ def check(self, f=None, verbose=True, level=1, checktype=None): # if verbose: # print(txt) - @staticmethod - def load(f, model, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfdisu.py b/flopy/modflow/mfdisu.py index 917fa70b07..6e9bc4e31d 100644 --- a/flopy/modflow/mfdisu.py +++ b/flopy/modflow/mfdisu.py @@ -529,8 +529,8 @@ def zcentroids(self): def ncpl(self): return self.nodes / self.nlay - @staticmethod - def load(f, model, ext_unit_dict=None, check=False): + @classmethod + def load(cls, f, model, ext_unit_dict=None, check=False): """ Load an existing package. diff --git a/flopy/modflow/mfdrn.py b/flopy/modflow/mfdrn.py index cad5ca40e5..a3481e8d2d 100644 --- a/flopy/modflow/mfdrn.py +++ b/flopy/modflow/mfdrn.py @@ -287,8 +287,8 @@ def get_empty(ncells=0, aux_names=None, structured=True, is_drt=False): def get_sfac_columns(): return ["cond"] - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfdrt.py b/flopy/modflow/mfdrt.py index 814d634a99..97e2a75aee 100644 --- a/flopy/modflow/mfdrt.py +++ b/flopy/modflow/mfdrt.py @@ -273,8 +273,8 @@ def get_empty(ncells=0, aux_names=None, structured=True, is_drt=False): dtype = Package.add_to_dtype(dtype, aux_names, np.float32) return create_empty_recarray(ncells, dtype, default_value=-1.0e10) - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfevt.py b/flopy/modflow/mfevt.py index baee297ec5..1e8f273cb0 100644 --- a/flopy/modflow/mfevt.py +++ b/flopy/modflow/mfevt.py @@ -215,8 +215,8 @@ def write_file(self, f=None): f_evt.write(ievt) f_evt.close() - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mffhb.py b/flopy/modflow/mffhb.py index adb7b5e5c8..5e77062d3e 100644 --- a/flopy/modflow/mffhb.py +++ b/flopy/modflow/mffhb.py @@ -420,8 +420,8 @@ def write_file(self): f.close() - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfflwob.py b/flopy/modflow/mfflwob.py index afb791df75..96cc3945f9 100755 --- a/flopy/modflow/mfflwob.py +++ b/flopy/modflow/mfflwob.py @@ -380,8 +380,8 @@ def write_file(self): return - @staticmethod - def load(f, model, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfgage.py b/flopy/modflow/mfgage.py index 3afd728ff4..826d0e11af 100644 --- a/flopy/modflow/mfgage.py +++ b/flopy/modflow/mfgage.py @@ -286,8 +286,8 @@ def write_file(self): # close the gage file f.close() - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfghb.py b/flopy/modflow/mfghb.py index 1e5237314e..65bc83ca69 100644 --- a/flopy/modflow/mfghb.py +++ b/flopy/modflow/mfghb.py @@ -263,8 +263,8 @@ def get_default_dtype(structured=True): def get_sfac_columns(): return ["cond"] - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfgmg.py b/flopy/modflow/mfgmg.py index 187c8f635b..d02e21243d 100644 --- a/flopy/modflow/mfgmg.py +++ b/flopy/modflow/mfgmg.py @@ -318,8 +318,8 @@ def write_file(self): f_gmg.write("{}\n".format(self.relax)) f_gmg.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfhfb.py b/flopy/modflow/mfhfb.py index 0b88a384a5..35d6358dbe 100644 --- a/flopy/modflow/mfhfb.py +++ b/flopy/modflow/mfhfb.py @@ -253,8 +253,8 @@ def get_default_dtype(structured=True): def get_sfac_columns(): return ["hydchr"] - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfhob.py b/flopy/modflow/mfhob.py index 89722b41cc..e2518e9ed9 100755 --- a/flopy/modflow/mfhob.py +++ b/flopy/modflow/mfhob.py @@ -308,8 +308,8 @@ def write_file(self): return - @staticmethod - def load(f, model, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfhyd.py b/flopy/modflow/mfhyd.py index 29c2a48273..34d928724b 100644 --- a/flopy/modflow/mfhyd.py +++ b/flopy/modflow/mfhyd.py @@ -286,8 +286,8 @@ def get_default_dtype(): ) return dtype - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mflak.py b/flopy/modflow/mflak.py index 114d3a1494..8f8e02a3bb 100644 --- a/flopy/modflow/mflak.py +++ b/flopy/modflow/mflak.py @@ -639,8 +639,8 @@ def write_file(self): # close the lak file f.close() - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mflmt.py b/flopy/modflow/mflmt.py index ed905a6891..4096b6506b 100644 --- a/flopy/modflow/mflmt.py +++ b/flopy/modflow/mflmt.py @@ -170,8 +170,8 @@ def write_file(self): f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mflpf.py b/flopy/modflow/mflpf.py index cd03e7507e..e24c8184c7 100644 --- a/flopy/modflow/mflpf.py +++ b/flopy/modflow/mflpf.py @@ -437,8 +437,8 @@ def write_file(self, check=True, f=None): f.close() return - @staticmethod - def load(f, model, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfmlt.py b/flopy/modflow/mfmlt.py index 60392397fc..ea1603f6db 100644 --- a/flopy/modflow/mfmlt.py +++ b/flopy/modflow/mfmlt.py @@ -128,8 +128,8 @@ def write_file(self): """ pass - @staticmethod - def load(f, model, nrow=None, ncol=None, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nrow=None, ncol=None, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfmnw1.py b/flopy/modflow/mfmnw1.py index 56bb27f0f5..32a1e7c985 100644 --- a/flopy/modflow/mfmnw1.py +++ b/flopy/modflow/mfmnw1.py @@ -209,8 +209,8 @@ def get_default_dtype(structured=True): else: pass - @staticmethod - def load(f, model, nper=None, gwt=False, nsol=1, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, gwt=False, nsol=1, ext_unit_dict=None): if model.verbose: sys.stdout.write("loading mnw1 package file...\n") diff --git a/flopy/modflow/mfmnw2.py b/flopy/modflow/mfmnw2.py index 1d18207a55..08eea66b55 100644 --- a/flopy/modflow/mfmnw2.py +++ b/flopy/modflow/mfmnw2.py @@ -1324,8 +1324,8 @@ def get_default_spd_dtype(structured=True): msg = "get_default_spd_dtype: unstructured model not supported" raise NotImplementedError(msg) - @staticmethod - def load(f, model, nper=None, gwt=False, nsol=1, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, gwt=False, nsol=1, ext_unit_dict=None): """ Parameters diff --git a/flopy/modflow/mfmnwi.py b/flopy/modflow/mfmnwi.py index 016f054951..6b77fbb430 100644 --- a/flopy/modflow/mfmnwi.py +++ b/flopy/modflow/mfmnwi.py @@ -202,8 +202,8 @@ def __init__( self.parent.add_package(self) - @staticmethod - def load(f, model, nper=None, gwt=False, nsol=1, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, gwt=False, nsol=1, ext_unit_dict=None): if model.verbose: sys.stdout.write("loading mnw2 package file...\n") diff --git a/flopy/modflow/mfnwt.py b/flopy/modflow/mfnwt.py index c798a95599..fbb1543b08 100644 --- a/flopy/modflow/mfnwt.py +++ b/flopy/modflow/mfnwt.py @@ -377,8 +377,8 @@ def write_file(self): f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfoc.py b/flopy/modflow/mfoc.py index db7e6a7e42..adfea5467a 100644 --- a/flopy/modflow/mfoc.py +++ b/flopy/modflow/mfoc.py @@ -733,8 +733,10 @@ def get_ocoutput_units(f, ext_unit_dict=None): # return return ihedun, fhead, iddnun, fddn - @staticmethod - def load(f, model, nper=None, nstp=None, nlay=None, ext_unit_dict=None): + @classmethod + def load( + cls, f, model, nper=None, nstp=None, nlay=None, ext_unit_dict=None + ): """ Load an existing package. diff --git a/flopy/modflow/mfpar.py b/flopy/modflow/mfpar.py index cc5a1ce58d..de0b7abaea 100644 --- a/flopy/modflow/mfpar.py +++ b/flopy/modflow/mfpar.py @@ -193,8 +193,8 @@ def set_pval(self, model, ext_unit_dict): return - @staticmethod - def load(f, npar, verbose=False): + @classmethod + def load(cls, f, npar, verbose=False): """ Load property parameters from an existing package. diff --git a/flopy/modflow/mfparbc.py b/flopy/modflow/mfparbc.py index 4dd87f726a..2793fef2e8 100644 --- a/flopy/modflow/mfparbc.py +++ b/flopy/modflow/mfparbc.py @@ -41,8 +41,8 @@ def get(self, fkey): return self.bc_parms[key] return None - @staticmethod - def load(f, npar, dt, model, ext_unit_dict=None, verbose=False): + @classmethod + def load(cls, f, npar, dt, model, ext_unit_dict=None, verbose=False): """ Load bc property parameters from an existing bc package that uses list data (e.g. WEL, RIV, etc.). diff --git a/flopy/modflow/mfpcg.py b/flopy/modflow/mfpcg.py index 19ebc76ebe..37ae54cad8 100644 --- a/flopy/modflow/mfpcg.py +++ b/flopy/modflow/mfpcg.py @@ -219,8 +219,8 @@ def write_file(self): f.write("\n") f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfpcgn.py b/flopy/modflow/mfpcgn.py index c8289a372d..0a19b484cc 100644 --- a/flopy/modflow/mfpcgn.py +++ b/flopy/modflow/mfpcgn.py @@ -393,8 +393,8 @@ def write_file(self): f.write(line) f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfpks.py b/flopy/modflow/mfpks.py index 38ce08fdae..b1fd29e444 100644 --- a/flopy/modflow/mfpks.py +++ b/flopy/modflow/mfpks.py @@ -228,8 +228,8 @@ def write_file(self): f.write("END\n") f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfpval.py b/flopy/modflow/mfpval.py index 6a7c516b21..514c8555af 100644 --- a/flopy/modflow/mfpval.py +++ b/flopy/modflow/mfpval.py @@ -139,8 +139,8 @@ def __getitem__(self, item): else: return None - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfrch.py b/flopy/modflow/mfrch.py index 242b54bdf4..022aaf64a8 100644 --- a/flopy/modflow/mfrch.py +++ b/flopy/modflow/mfrch.py @@ -366,8 +366,8 @@ def write_file(self, check=True, f=None): f_rch.write(file_entry_irch) f_rch.close() - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfriv.py b/flopy/modflow/mfriv.py index d2550f2667..a238f94d23 100644 --- a/flopy/modflow/mfriv.py +++ b/flopy/modflow/mfriv.py @@ -345,8 +345,8 @@ def add_record(self, kper, index, values): except Exception as e: raise Exception("mfriv error adding record to list: " + str(e)) - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfsfr2.py b/flopy/modflow/mfsfr2.py index 7bd24930d7..02aa59736a 100644 --- a/flopy/modflow/mfsfr2.py +++ b/flopy/modflow/mfsfr2.py @@ -834,8 +834,8 @@ def get_default_segment_dtype(): ] ) - @staticmethod - def load(f, model, nper=None, gwt=False, nsol=1, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, gwt=False, nsol=1, ext_unit_dict=None): if model.verbose: sys.stdout.write("loading sfr2 package file...\n") diff --git a/flopy/modflow/mfsip.py b/flopy/modflow/mfsip.py index e851a72b69..6d8a4dc3ac 100644 --- a/flopy/modflow/mfsip.py +++ b/flopy/modflow/mfsip.py @@ -190,8 +190,8 @@ def write_file(self): ) f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfsms.py b/flopy/modflow/mfsms.py index f411e01914..5ec5cda8d8 100644 --- a/flopy/modflow/mfsms.py +++ b/flopy/modflow/mfsms.py @@ -412,8 +412,8 @@ def write_file(self): f.write("\n") f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfsor.py b/flopy/modflow/mfsor.py index 7330d66bff..7c0e389679 100644 --- a/flopy/modflow/mfsor.py +++ b/flopy/modflow/mfsor.py @@ -152,8 +152,8 @@ def write_file(self): f.write(line) f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfstr.py b/flopy/modflow/mfstr.py index 152f50dcb2..b288445ef6 100644 --- a/flopy/modflow/mfstr.py +++ b/flopy/modflow/mfstr.py @@ -681,8 +681,8 @@ def write_file(self): # close the str file f_str.close() - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfsub.py b/flopy/modflow/mfsub.py index 9f386ad793..12a8cdb1ed 100644 --- a/flopy/modflow/mfsub.py +++ b/flopy/modflow/mfsub.py @@ -586,8 +586,8 @@ def write_file(self, check=False, f=None): # close sub file f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfswi2.py b/flopy/modflow/mfswi2.py index bc2e87b728..44beea98e8 100644 --- a/flopy/modflow/mfswi2.py +++ b/flopy/modflow/mfswi2.py @@ -531,8 +531,8 @@ def write_file(self, check=True, f=None): # close swi2 file f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """Load an existing package. Parameters diff --git a/flopy/modflow/mfswr1.py b/flopy/modflow/mfswr1.py index d8f3288cfe..8c1f2379d9 100644 --- a/flopy/modflow/mfswr1.py +++ b/flopy/modflow/mfswr1.py @@ -122,8 +122,8 @@ def write_file(self): # f.write('{0}\n'.format(self.heading)) # f.close() - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfswt.py b/flopy/modflow/mfswt.py index e943591bb4..e104aa55df 100644 --- a/flopy/modflow/mfswt.py +++ b/flopy/modflow/mfswt.py @@ -599,8 +599,8 @@ def __init__( # add package to model self.parent.add_package(self) - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflow/mfupw.py b/flopy/modflow/mfupw.py index 639395f2be..2fe710e58f 100644 --- a/flopy/modflow/mfupw.py +++ b/flopy/modflow/mfupw.py @@ -355,8 +355,8 @@ def write_file(self, check=True, f=None): f_upw.write(self.laywet[k].get_file_entry()) f_upw.close() - @staticmethod - def load(f, model, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfuzf1.py b/flopy/modflow/mfuzf1.py index 48695ac0f3..fae888810b 100644 --- a/flopy/modflow/mfuzf1.py +++ b/flopy/modflow/mfuzf1.py @@ -873,8 +873,8 @@ def write_transient(name): f_uzf.close() - @staticmethod - def load(f, model, ext_unit_dict=None, check=False): + @classmethod + def load(cls, f, model, ext_unit_dict=None, check=False): """ Load an existing package. diff --git a/flopy/modflow/mfwel.py b/flopy/modflow/mfwel.py index 8e515688f3..c60b1d1cba 100644 --- a/flopy/modflow/mfwel.py +++ b/flopy/modflow/mfwel.py @@ -385,8 +385,8 @@ def get_empty(ncells=0, aux_names=None, structured=True): def get_sfac_columns(): return ["flux"] - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None, check=True): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None, check=True): """ Load an existing package. diff --git a/flopy/modflow/mfzon.py b/flopy/modflow/mfzon.py index 64147512c4..16db6a8e35 100644 --- a/flopy/modflow/mfzon.py +++ b/flopy/modflow/mfzon.py @@ -131,8 +131,8 @@ def write_file(self): """ return - @staticmethod - def load(f, model, nrow=None, ncol=None, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nrow=None, ncol=None, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/modflowlgr/mflgr.py b/flopy/modflowlgr/mflgr.py index 26d6b5a1d7..a0bc937f0b 100644 --- a/flopy/modflowlgr/mflgr.py +++ b/flopy/modflowlgr/mflgr.py @@ -470,8 +470,9 @@ def change_model_ws(self, new_pth=None, reset_external=False): npth = os.path.join(new_pth, rpth) child.change_model_ws(new_pth=npth, reset_external=reset_external) - @staticmethod + @classmethod def load( + cls, f, version="mflgr", exe_name="mflgr.exe", diff --git a/flopy/modpath/mp7.py b/flopy/modpath/mp7.py index e4df040694..f0508e4960 100644 --- a/flopy/modpath/mp7.py +++ b/flopy/modpath/mp7.py @@ -419,8 +419,9 @@ def write_name_file(self): f.write("{:10s} {}\n".format("BUDGET", self.budgetfilename)) f.close() - @staticmethod + @classmethod def create_mp7( + cls, modelname="modpath7test", trackdir="forward", flowmodel=None, diff --git a/flopy/mt3d/mt.py b/flopy/mt3d/mt.py index c5e2469ae3..5c33a63147 100644 --- a/flopy/mt3d/mt.py +++ b/flopy/mt3d/mt.py @@ -571,8 +571,9 @@ def write_name_file(self): def load_results(self, **kwargs): return - @staticmethod + @classmethod def load( + cls, f, version="mt3dms", exe_name="mt3dms.exe", diff --git a/flopy/mt3d/mtadv.py b/flopy/mt3d/mtadv.py index 2c8c480841..efb61a35db 100644 --- a/flopy/mt3d/mtadv.py +++ b/flopy/mt3d/mtadv.py @@ -274,8 +274,8 @@ def write_file(self): f_adv.close() return - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/mt3d/mtbtn.py b/flopy/mt3d/mtbtn.py index 4ded3a63c6..9b4ebf878f 100644 --- a/flopy/mt3d/mtbtn.py +++ b/flopy/mt3d/mtbtn.py @@ -854,8 +854,8 @@ def write_file(self): f_btn.close() return - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/mt3d/mtcts.py b/flopy/mt3d/mtcts.py index aa49ab8988..82a84bb147 100644 --- a/flopy/mt3d/mtcts.py +++ b/flopy/mt3d/mtcts.py @@ -158,8 +158,9 @@ def __init__( # Set package specific parameters - @staticmethod + @classmethod def load( + cls, f, model, nlay=None, diff --git a/flopy/mt3d/mtdsp.py b/flopy/mt3d/mtdsp.py index 5c55d20a6b..88def2e85d 100644 --- a/flopy/mt3d/mtdsp.py +++ b/flopy/mt3d/mtdsp.py @@ -262,8 +262,10 @@ def write_file(self): f_dsp.close() return - @staticmethod - def load(f, model, nlay=None, nrow=None, ncol=None, ext_unit_dict=None): + @classmethod + def load( + cls, f, model, nlay=None, nrow=None, ncol=None, ext_unit_dict=None + ): """ Load an existing package. diff --git a/flopy/mt3d/mtgcg.py b/flopy/mt3d/mtgcg.py index 1bcca53072..6b0a4fc793 100644 --- a/flopy/mt3d/mtgcg.py +++ b/flopy/mt3d/mtgcg.py @@ -153,8 +153,8 @@ def write_file(self): f_gcg.close() return - @staticmethod - def load(f, model, ext_unit_dict=None): + @classmethod + def load(cls, f, model, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/mt3d/mtlkt.py b/flopy/mt3d/mtlkt.py index 22ad9422ef..489e1d6cd2 100644 --- a/flopy/mt3d/mtlkt.py +++ b/flopy/mt3d/mtlkt.py @@ -297,8 +297,10 @@ def write_file(self): f_lkt.close() return - @staticmethod - def load(f, model, nlak=None, nper=None, ncomp=None, ext_unit_dict=None): + @classmethod + def load( + cls, f, model, nlak=None, nper=None, ncomp=None, ext_unit_dict=None + ): """ Load an existing package. diff --git a/flopy/mt3d/mtrct.py b/flopy/mt3d/mtrct.py index c0564c295a..b603e5ac90 100644 --- a/flopy/mt3d/mtrct.py +++ b/flopy/mt3d/mtrct.py @@ -487,8 +487,9 @@ def write_file(self): f_rct.close() return - @staticmethod + @classmethod def load( + cls, f, model, nlay=None, diff --git a/flopy/mt3d/mtsft.py b/flopy/mt3d/mtsft.py index 04762ef5e2..2c4be25de8 100644 --- a/flopy/mt3d/mtsft.py +++ b/flopy/mt3d/mtsft.py @@ -468,9 +468,9 @@ def write_file(self): f.close() return - @staticmethod + @classmethod def load( - f, model, nsfinit=None, nper=None, ncomp=None, ext_unit_dict=None + cls, f, model, nsfinit=None, nper=None, ncomp=None, ext_unit_dict=None ): """ Load an existing package. diff --git a/flopy/mt3d/mtssm.py b/flopy/mt3d/mtssm.py index cbdba7e8a4..ec856bcf85 100644 --- a/flopy/mt3d/mtssm.py +++ b/flopy/mt3d/mtssm.py @@ -520,8 +520,9 @@ def write_file(self): f_ssm.close() return - @staticmethod + @classmethod def load( + cls, f, model, nlay=None, diff --git a/flopy/mt3d/mtuzt.py b/flopy/mt3d/mtuzt.py index a6661dd9df..4bda87a62d 100644 --- a/flopy/mt3d/mtuzt.py +++ b/flopy/mt3d/mtuzt.py @@ -436,8 +436,9 @@ def write_file(self): f_uzt.close() return - @staticmethod + @classmethod def load( + cls, f, model, nlay=None, diff --git a/flopy/pakbase.py b/flopy/pakbase.py index 519f3935be..b491ccb7f7 100644 --- a/flopy/pakbase.py +++ b/flopy/pakbase.py @@ -849,8 +849,8 @@ def write_file(self, check=False): print("IMPLEMENTATION ERROR: write_file must be overloaded") return - @staticmethod - def load(f, model, pak_type, ext_unit_dict=None, **kwargs): + @classmethod + def load(cls, f, model, pak_type, ext_unit_dict=None, **kwargs): """ Default load method for standard boundary packages. diff --git a/flopy/seawat/swt.py b/flopy/seawat/swt.py index ea0e97fc58..9ab6cd632b 100644 --- a/flopy/seawat/swt.py +++ b/flopy/seawat/swt.py @@ -432,8 +432,9 @@ def write_name_file(self): f_nam.close() return - @staticmethod + @classmethod def load( + cls, f, version="seawat", exe_name="swtv4", diff --git a/flopy/seawat/swtvdf.py b/flopy/seawat/swtvdf.py index 5850845c09..40d714b303 100644 --- a/flopy/seawat/swtvdf.py +++ b/flopy/seawat/swtvdf.py @@ -341,8 +341,8 @@ def write_file(self): f_vdf.close() return - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/seawat/swtvsc.py b/flopy/seawat/swtvsc.py index 41da460f80..40da05c6db 100644 --- a/flopy/seawat/swtvsc.py +++ b/flopy/seawat/swtvsc.py @@ -290,8 +290,8 @@ def write_file(self): f_vsc.close() return - @staticmethod - def load(f, model, nper=None, ext_unit_dict=None): + @classmethod + def load(cls, f, model, nper=None, ext_unit_dict=None): """ Load an existing package. diff --git a/flopy/utils/optionblock.py b/flopy/utils/optionblock.py index 9b9ee4abcb..c0884e9af2 100644 --- a/flopy/utils/optionblock.py +++ b/flopy/utils/optionblock.py @@ -333,8 +333,8 @@ def write_options(self, f): f.write(self.single_line_options) f.write("\n") - @staticmethod - def load_options(options, package): + @classmethod + def load_options(cls, options, package): """ Loader for the options class. Reads in an options block and uses context from option util dictionaries diff --git a/flopy/utils/rasters.py b/flopy/utils/rasters.py index 10e94d9576..f3a1d02f10 100644 --- a/flopy/utils/rasters.py +++ b/flopy/utils/rasters.py @@ -756,8 +756,8 @@ def write(self, name): for band, arr in self.__arr_dict.items(): foo.write(arr, band) - @staticmethod - def load(raster): + @classmethod + def load(cls, raster): """ Static method to load a raster file into the raster object diff --git a/flopy/utils/reference.py b/flopy/utils/reference.py index c530828719..165ad24cfa 100755 --- a/flopy/utils/reference.py +++ b/flopy/utils/reference.py @@ -363,8 +363,8 @@ def bounds(self): xmin, xmax, ymin, ymax = self.get_extent() return xmin, ymin, xmax, ymax - @staticmethod - def load(namefile=None, reffile="usgs.model.reference"): + @classmethod + def load(cls, namefile=None, reffile="usgs.model.reference"): """ Attempts to load spatial reference information from the following files (in order): diff --git a/flopy/utils/util_array.py b/flopy/utils/util_array.py index b73eab22eb..7d76ba7935 100644 --- a/flopy/utils/util_array.py +++ b/flopy/utils/util_array.py @@ -933,8 +933,9 @@ def build_2d_instances(self): ) return u2ds - @staticmethod + @classmethod def load( + cls, f_handle, model, shape, @@ -2980,8 +2981,9 @@ def parse_value(self, value): "Util2d:unsupported type in util_array: " + str(type(value)) ) - @staticmethod + @classmethod def load( + cls, f_handle, model, shape,