diff --git a/flopy/mf6/data/dfn/exg-gwfgwf.dfn b/flopy/mf6/data/dfn/exg-gwfgwf.dfn index 2381359d85..84bb4d1f5c 100644 --- a/flopy/mf6/data/dfn/exg-gwfgwf.dfn +++ b/flopy/mf6/data/dfn/exg-gwfgwf.dfn @@ -1,4 +1,5 @@ # --------------------- exg gwfgwf options --------------------- +# flopy multi-package block options name auxiliary diff --git a/flopy/mf6/data/dfn/gwf-chd.dfn b/flopy/mf6/data/dfn/gwf-chd.dfn index 1a432ee399..543433c1b3 100644 --- a/flopy/mf6/data/dfn/gwf-chd.dfn +++ b/flopy/mf6/data/dfn/gwf-chd.dfn @@ -1,4 +1,5 @@ # --------------------- gwf chd options --------------------- +# flopy multi-package block options name auxiliary diff --git a/flopy/mf6/data/dfn/gwf-drn.dfn b/flopy/mf6/data/dfn/gwf-drn.dfn index 481dea86e9..6116ff13cf 100644 --- a/flopy/mf6/data/dfn/gwf-drn.dfn +++ b/flopy/mf6/data/dfn/gwf-drn.dfn @@ -1,4 +1,5 @@ # --------------------- gwf drn options --------------------- +# flopy multi-package block options name auxiliary diff --git a/flopy/mf6/data/dfn/gwf-evt.dfn b/flopy/mf6/data/dfn/gwf-evt.dfn index 720dd8ed0a..874114955c 100644 --- a/flopy/mf6/data/dfn/gwf-evt.dfn +++ b/flopy/mf6/data/dfn/gwf-evt.dfn @@ -1,4 +1,5 @@ # --------------------- gwf evt options --------------------- +# flopy multi-package block options name fixed_cell diff --git a/flopy/mf6/data/dfn/gwf-evta.dfn b/flopy/mf6/data/dfn/gwf-evta.dfn index 5f3cd214d9..19ca3cec45 100644 --- a/flopy/mf6/data/dfn/gwf-evta.dfn +++ b/flopy/mf6/data/dfn/gwf-evta.dfn @@ -1,4 +1,5 @@ # --------------------- gwf evta options --------------------- +# flopy multi-package block options name readasarrays diff --git a/flopy/mf6/data/dfn/gwf-ghb.dfn b/flopy/mf6/data/dfn/gwf-ghb.dfn index 9a79701895..f84a370869 100644 --- a/flopy/mf6/data/dfn/gwf-ghb.dfn +++ b/flopy/mf6/data/dfn/gwf-ghb.dfn @@ -1,4 +1,5 @@ # --------------------- gwf ghb options --------------------- +# flopy multi-package block options name auxiliary diff --git a/flopy/mf6/data/dfn/gwf-lak.dfn b/flopy/mf6/data/dfn/gwf-lak.dfn index 96615271da..9785819bbb 100644 --- a/flopy/mf6/data/dfn/gwf-lak.dfn +++ b/flopy/mf6/data/dfn/gwf-lak.dfn @@ -1,4 +1,5 @@ # --------------------- gwf lak options --------------------- +# flopy multi-package block options name auxiliary diff --git a/flopy/mf6/data/dfn/gwf-maw.dfn b/flopy/mf6/data/dfn/gwf-maw.dfn index bd43129ca0..e504daf9e6 100644 --- a/flopy/mf6/data/dfn/gwf-maw.dfn +++ b/flopy/mf6/data/dfn/gwf-maw.dfn @@ -1,4 +1,5 @@ # --------------------- gwf maw options --------------------- +# flopy multi-package block options name auxiliary diff --git a/flopy/mf6/data/dfn/gwf-rch.dfn b/flopy/mf6/data/dfn/gwf-rch.dfn index 19fd93e2a5..0a36ae078b 100644 --- a/flopy/mf6/data/dfn/gwf-rch.dfn +++ b/flopy/mf6/data/dfn/gwf-rch.dfn @@ -1,4 +1,5 @@ # --------------------- gwf rch options --------------------- +# flopy multi-package block options name fixed_cell diff --git a/flopy/mf6/data/dfn/gwf-rcha.dfn b/flopy/mf6/data/dfn/gwf-rcha.dfn index 11b2e2a4e2..bc5874ef59 100644 --- a/flopy/mf6/data/dfn/gwf-rcha.dfn +++ b/flopy/mf6/data/dfn/gwf-rcha.dfn @@ -1,4 +1,5 @@ # --------------------- gwf rcha options --------------------- +# flopy multi-package block options name readasarrays diff --git a/flopy/mf6/data/dfn/gwf-riv.dfn b/flopy/mf6/data/dfn/gwf-riv.dfn index 1b48087c58..a57b653cc0 100644 --- a/flopy/mf6/data/dfn/gwf-riv.dfn +++ b/flopy/mf6/data/dfn/gwf-riv.dfn @@ -1,4 +1,5 @@ # --------------------- gwf riv options --------------------- +# flopy multi-package block options name auxiliary diff --git a/flopy/mf6/data/dfn/gwf-sfr.dfn b/flopy/mf6/data/dfn/gwf-sfr.dfn index a95e188436..4c5c3a8611 100644 --- a/flopy/mf6/data/dfn/gwf-sfr.dfn +++ b/flopy/mf6/data/dfn/gwf-sfr.dfn @@ -1,4 +1,5 @@ # --------------------- gwf sfr options --------------------- +# flopy multi-package block options name auxiliary diff --git a/flopy/mf6/data/dfn/gwf-uzf.dfn b/flopy/mf6/data/dfn/gwf-uzf.dfn index b41e6c34ae..a199cf880e 100644 --- a/flopy/mf6/data/dfn/gwf-uzf.dfn +++ b/flopy/mf6/data/dfn/gwf-uzf.dfn @@ -1,4 +1,5 @@ # --------------------- gwf uzf options --------------------- +# flopy multi-package block options name auxiliary diff --git a/flopy/mf6/data/dfn/gwf-wel.dfn b/flopy/mf6/data/dfn/gwf-wel.dfn index bc041315c0..a061267d83 100644 --- a/flopy/mf6/data/dfn/gwf-wel.dfn +++ b/flopy/mf6/data/dfn/gwf-wel.dfn @@ -1,4 +1,5 @@ # --------------------- gwf wel options --------------------- +# flopy multi-package block options name auxiliary diff --git a/flopy/mf6/data/dfn/utl-obs.dfn b/flopy/mf6/data/dfn/utl-obs.dfn index d9bf05640a..e54b0ff5cc 100644 --- a/flopy/mf6/data/dfn/utl-obs.dfn +++ b/flopy/mf6/data/dfn/utl-obs.dfn @@ -1,4 +1,5 @@ # --------------------- gwf obs options --------------------- +# flopy multi-package block options name digits diff --git a/flopy/mf6/data/dfn/utl-spc.dfn b/flopy/mf6/data/dfn/utl-spc.dfn index a005b16c54..5ca5bd0ae0 100644 --- a/flopy/mf6/data/dfn/utl-spc.dfn +++ b/flopy/mf6/data/dfn/utl-spc.dfn @@ -1,4 +1,5 @@ # --------------------- ssm spc options --------------------- +# flopy multi-package block options name print_input diff --git a/flopy/mf6/data/dfn/utl-spca.dfn b/flopy/mf6/data/dfn/utl-spca.dfn index eaad9207d5..eb98c8aab3 100644 --- a/flopy/mf6/data/dfn/utl-spca.dfn +++ b/flopy/mf6/data/dfn/utl-spca.dfn @@ -1,4 +1,5 @@ # --------------------- ssm spca options --------------------- +# flopy multi-package block options name readasarrays diff --git a/flopy/mf6/data/dfn/utl-tas.dfn b/flopy/mf6/data/dfn/utl-tas.dfn index b3c734c638..6414639cc3 100644 --- a/flopy/mf6/data/dfn/utl-tas.dfn +++ b/flopy/mf6/data/dfn/utl-tas.dfn @@ -1,4 +1,5 @@ # --------------------- gwf ts attributes --------------------- +# flopy multi-package block attributes name time_series_namerecord diff --git a/flopy/mf6/data/dfn/utl-ts.dfn b/flopy/mf6/data/dfn/utl-ts.dfn index 5f584c59b3..9e430507ad 100644 --- a/flopy/mf6/data/dfn/utl-ts.dfn +++ b/flopy/mf6/data/dfn/utl-ts.dfn @@ -1,4 +1,5 @@ # --------------------- gwf ts attributes --------------------- +# flopy multi-package block attributes name time_series_namerecord diff --git a/flopy/mf6/data/mfstructure.py b/flopy/mf6/data/mfstructure.py index 648d2d4656..ac6f2e9764 100644 --- a/flopy/mf6/data/mfstructure.py +++ b/flopy/mf6/data/mfstructure.py @@ -46,9 +46,6 @@ class Dfn: folder containing package definition files (dfn) common : path file containing common information - multi_package : dict - contains the names of all packages that are allowed to have multiple - instances in a model/simulation Methods ------- @@ -70,31 +67,6 @@ def __init__(self): # directories self.dfndir = os.path.join(".", "dfn") self.common = os.path.join(self.dfndir, "common.dfn") - # FIX: Transport - multi packages are hard coded - self.multi_package = { - "exggwfgwf": 0, - "gwfchd": 0, - "gwfwel": 0, - "gwfdrn": 0, - "gwfriv": 0, - "gwfghb": 0, - "gwfrch": 0, - "gwfrcha": 0, - "gwfevt": 0, - "gwfevta": 0, - "gwfmaw": 0, - "gwfsfr": 0, - "gwflak": 0, - "gwfuzf": 0, - "lnfcgeo": 0, - "lnfrgeo": 0, - "lnfngeo": 0, - "utlobs": 0, - "utlts": 0, - "utltas": 0, - "utlspc": 0, - "utlspca": 0, - } def get_file_list(self): file_order = [ @@ -192,8 +164,6 @@ class DfnPackage(Dfn): Methods ------- - multi_package_support : () : bool - returns flag for multi-package support get_block_structure_dict : (path : tuple, common : bool, model_file : bool) : dict returns a dictionary of block structure information for the package @@ -225,9 +195,6 @@ def __init__(self, package): ) self.dfn_list = package.dfn - def multi_package_support(self): - return self.package.package_abbr in self.multi_package - def get_block_structure_dict(self, path, common, model_file): block_dict = {} dataset_items_in_block = {} @@ -235,7 +202,13 @@ def get_block_structure_dict(self, path, common, model_file): keystring_items_needed_dict = {} current_block = None - for dfn_entry in self.dfn_list: + # get header dict + header_dict = {} + for item in self.dfn_list[0]: + if item == "multi-package": + header_dict["multi-package"] = True + + for dfn_entry in self.dfn_list[1:]: # load next data item new_data_item_struct = MFDataItemStructure() for next_line in dfn_entry: @@ -389,7 +362,7 @@ def get_block_structure_dict(self, path, common, model_file): ) block_dataset_struct.add_item(block_data_item_struct) current_block.add_dataset(block_dataset_struct) - return block_dict + return block_dict, header_dict def _new_dataset( self, @@ -451,8 +424,6 @@ class DfnFile(Dfn): Methods ------- - multi_package_support : () : bool - returns flag for multi-package support dict_by_name : {} : dict returns a dictionary of data item descriptions from the dfn file with the data item name as the dictionary key @@ -492,11 +463,6 @@ def __init__(self, file): self.dataset_items_needed_dict = {} self.dfn_list = [] - def multi_package_support(self): - base_file = os.path.splitext(self.file)[0] - base_file = base_file.replace("-", "") - return base_file in self.multi_package - def dict_by_name(self): name_dict = {} name = None @@ -520,6 +486,19 @@ def get_block_structure_dict(self, path, common, model_file): current_block = None dfn_fp = open(self._file_path, "r") + # load header + header_dict = {} + while True: + line = dfn_fp.readline() + if len(line) < 1 or line[0] != "#": + break + line_lst = line.strip().split() + if len(line_lst) > 2 and line_lst[1] == "flopy": + # load flopy data + if line_lst[2] == "multi-package": + header_dict["multi-package"] = True + + # load file definitions for line in dfn_fp: if self._valid_line(line): # load next data item @@ -697,7 +676,7 @@ def get_block_structure_dict(self, path, common, model_file): ) current_block.add_dataset(block_dataset_struct) dfn_fp.close() - return block_dict + return block_dict, header_dict def _new_dataset( self, @@ -2097,10 +2076,10 @@ def __init__(self, dfn_file, path, common, model_file): self.model_file = model_file # file belongs to a specific model self.read_as_arrays = False - self.multi_package_support = dfn_file.multi_package_support() - self.blocks = dfn_file.get_block_structure_dict( + self.blocks, self.header = dfn_file.get_block_structure_dict( self.path, common, model_file ) + self.multi_package_support = "multi-package" in self.header self.dfn_list = dfn_file.dfn_list def is_valid(self): diff --git a/flopy/mf6/modflow/mfgnc.py b/flopy/mf6/modflow/mfgnc.py index 027f163d87..021fd85046 100644 --- a/flopy/mf6/modflow/mfgnc.py +++ b/flopy/mf6/modflow/mfgnc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -104,6 +104,9 @@ class ModflowGnc(mfpackage.MFPackage): dfn_file_name = "gwf-gnc.dfn" dfn = [ + [ + "header", + ], [ "block options", "name print_input", diff --git a/flopy/mf6/modflow/mfgwf.py b/flopy/mf6/modflow/mfgwf.py index d439514642..a57e64a082 100644 --- a/flopy/mf6/modflow/mfgwf.py +++ b/flopy/mf6/modflow/mfgwf.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfmodel from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwfapi.py b/flopy/mf6/modflow/mfgwfapi.py index 308ae58674..5e6ce167f7 100644 --- a/flopy/mf6/modflow/mfgwfapi.py +++ b/flopy/mf6/modflow/mfgwfapi.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -68,6 +68,9 @@ class ModflowGwfapi(mfpackage.MFPackage): dfn_file_name = "gwf-api.dfn" dfn = [ + [ + "header", + ], [ "block options", "name boundnames", diff --git a/flopy/mf6/modflow/mfgwfbuy.py b/flopy/mf6/modflow/mfgwfbuy.py index 10758d0285..61ee75e897 100644 --- a/flopy/mf6/modflow/mfgwfbuy.py +++ b/flopy/mf6/modflow/mfgwfbuy.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -96,6 +96,9 @@ class ModflowGwfbuy(mfpackage.MFPackage): dfn_file_name = "gwf-buy.dfn" dfn = [ + [ + "header", + ], [ "block options", "name hhformulation_rhs", diff --git a/flopy/mf6/modflow/mfgwfchd.py b/flopy/mf6/modflow/mfgwfchd.py index 61d25876ea..c3dac9daef 100644 --- a/flopy/mf6/modflow/mfgwfchd.py +++ b/flopy/mf6/modflow/mfgwfchd.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -117,6 +117,10 @@ class ModflowGwfchd(mfpackage.MFPackage): dfn_file_name = "gwf-chd.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwfcsub.py b/flopy/mf6/modflow/mfgwfcsub.py index b237975ec6..bd3cecb7f6 100644 --- a/flopy/mf6/modflow/mfgwfcsub.py +++ b/flopy/mf6/modflow/mfgwfcsub.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator @@ -322,6 +322,9 @@ class ModflowGwfcsub(mfpackage.MFPackage): dfn_file_name = "gwf-csub.dfn" dfn = [ + [ + "header", + ], [ "block options", "name boundnames", diff --git a/flopy/mf6/modflow/mfgwfdis.py b/flopy/mf6/modflow/mfgwfdis.py index b9c3515ffe..6b06365469 100644 --- a/flopy/mf6/modflow/mfgwfdis.py +++ b/flopy/mf6/modflow/mfgwfdis.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator @@ -90,6 +90,9 @@ class ModflowGwfdis(mfpackage.MFPackage): dfn_file_name = "gwf-dis.dfn" dfn = [ + [ + "header", + ], [ "block options", "name length_units", diff --git a/flopy/mf6/modflow/mfgwfdisu.py b/flopy/mf6/modflow/mfgwfdisu.py index 43f8f0fa59..caa8cd4a75 100644 --- a/flopy/mf6/modflow/mfgwfdisu.py +++ b/flopy/mf6/modflow/mfgwfdisu.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator @@ -205,6 +205,9 @@ class ModflowGwfdisu(mfpackage.MFPackage): dfn_file_name = "gwf-disu.dfn" dfn = [ + [ + "header", + ], [ "block options", "name length_units", diff --git a/flopy/mf6/modflow/mfgwfdisv.py b/flopy/mf6/modflow/mfgwfdisv.py index 65ddc20050..11fee1dde6 100644 --- a/flopy/mf6/modflow/mfgwfdisv.py +++ b/flopy/mf6/modflow/mfgwfdisv.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator @@ -118,6 +118,9 @@ class ModflowGwfdisv(mfpackage.MFPackage): dfn_file_name = "gwf-disv.dfn" dfn = [ + [ + "header", + ], [ "block options", "name length_units", diff --git a/flopy/mf6/modflow/mfgwfdrn.py b/flopy/mf6/modflow/mfgwfdrn.py index fa66bac808..e26bddc635 100644 --- a/flopy/mf6/modflow/mfgwfdrn.py +++ b/flopy/mf6/modflow/mfgwfdrn.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -139,6 +139,10 @@ class ModflowGwfdrn(mfpackage.MFPackage): dfn_file_name = "gwf-drn.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwfevt.py b/flopy/mf6/modflow/mfgwfevt.py index df3f33f28e..c097c57b22 100644 --- a/flopy/mf6/modflow/mfgwfevt.py +++ b/flopy/mf6/modflow/mfgwfevt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -157,6 +157,10 @@ class ModflowGwfevt(mfpackage.MFPackage): dfn_file_name = "gwf-evt.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name fixed_cell", diff --git a/flopy/mf6/modflow/mfgwfevta.py b/flopy/mf6/modflow/mfgwfevta.py index 8ffc3b3b10..eba5430064 100644 --- a/flopy/mf6/modflow/mfgwfevta.py +++ b/flopy/mf6/modflow/mfgwfevta.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator @@ -118,6 +118,10 @@ class ModflowGwfevta(mfpackage.MFPackage): dfn_file_name = "gwf-evta.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name readasarrays", diff --git a/flopy/mf6/modflow/mfgwfghb.py b/flopy/mf6/modflow/mfgwfghb.py index 7d591c6a36..273a9843fd 100644 --- a/flopy/mf6/modflow/mfgwfghb.py +++ b/flopy/mf6/modflow/mfgwfghb.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -128,6 +128,10 @@ class ModflowGwfghb(mfpackage.MFPackage): dfn_file_name = "gwf-ghb.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwfgnc.py b/flopy/mf6/modflow/mfgwfgnc.py index a8bbd14599..95cc69ed3b 100644 --- a/flopy/mf6/modflow/mfgwfgnc.py +++ b/flopy/mf6/modflow/mfgwfgnc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -104,6 +104,9 @@ class ModflowGwfgnc(mfpackage.MFPackage): dfn_file_name = "gwf-gnc.dfn" dfn = [ + [ + "header", + ], [ "block options", "name print_input", diff --git a/flopy/mf6/modflow/mfgwfgwf.py b/flopy/mf6/modflow/mfgwfgwf.py index 096ac3fd0c..af01a1d1d6 100644 --- a/flopy/mf6/modflow/mfgwfgwf.py +++ b/flopy/mf6/modflow/mfgwfgwf.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -170,6 +170,10 @@ class ModflowGwfgwf(mfpackage.MFPackage): dfn_file_name = "exg-gwfgwf.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwfgwt.py b/flopy/mf6/modflow/mfgwfgwt.py index 4502cc760a..3e27974d84 100644 --- a/flopy/mf6/modflow/mfgwfgwt.py +++ b/flopy/mf6/modflow/mfgwfgwt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage @@ -37,7 +37,11 @@ class ModflowGwfgwt(mfpackage.MFPackage): _package_type = "gwfgwt" dfn_file_name = "exg-gwfgwt.dfn" - dfn = [] + dfn = [ + [ + "header", + ], + ] def __init__( self, diff --git a/flopy/mf6/modflow/mfgwfhfb.py b/flopy/mf6/modflow/mfgwfhfb.py index 4128ba34cd..1afc956bbe 100644 --- a/flopy/mf6/modflow/mfgwfhfb.py +++ b/flopy/mf6/modflow/mfgwfhfb.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -74,6 +74,9 @@ class ModflowGwfhfb(mfpackage.MFPackage): dfn_file_name = "gwf-hfb.dfn" dfn = [ + [ + "header", + ], [ "block options", "name print_input", diff --git a/flopy/mf6/modflow/mfgwfic.py b/flopy/mf6/modflow/mfgwfic.py index 211d5e3e57..07cd02f1ee 100644 --- a/flopy/mf6/modflow/mfgwfic.py +++ b/flopy/mf6/modflow/mfgwfic.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator @@ -45,6 +45,9 @@ class ModflowGwfic(mfpackage.MFPackage): dfn_file_name = "gwf-ic.dfn" dfn = [ + [ + "header", + ], [ "block griddata", "name strt", @@ -53,7 +56,7 @@ class ModflowGwfic(mfpackage.MFPackage): "reader readarray", "layered true", "default_value 1.0", - ] + ], ] def __init__( diff --git a/flopy/mf6/modflow/mfgwflak.py b/flopy/mf6/modflow/mfgwflak.py index 06a12db27d..4884320e52 100644 --- a/flopy/mf6/modflow/mfgwflak.py +++ b/flopy/mf6/modflow/mfgwflak.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -451,6 +451,10 @@ class ModflowGwflak(mfpackage.MFPackage): dfn_file_name = "gwf-lak.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwfmaw.py b/flopy/mf6/modflow/mfgwfmaw.py index 01d9725ff8..04a5e0966e 100644 --- a/flopy/mf6/modflow/mfgwfmaw.py +++ b/flopy/mf6/modflow/mfgwfmaw.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -387,6 +387,10 @@ class ModflowGwfmaw(mfpackage.MFPackage): dfn_file_name = "gwf-maw.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwfmvr.py b/flopy/mf6/modflow/mfgwfmvr.py index e54ed1bfea..6baba7f60f 100644 --- a/flopy/mf6/modflow/mfgwfmvr.py +++ b/flopy/mf6/modflow/mfgwfmvr.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -125,6 +125,9 @@ class ModflowGwfmvr(mfpackage.MFPackage): dfn_file_name = "gwf-mvr.dfn" dfn = [ + [ + "header", + ], [ "block options", "name print_input", diff --git a/flopy/mf6/modflow/mfgwfnam.py b/flopy/mf6/modflow/mfgwfnam.py index dcc7cf8723..499ad74daa 100644 --- a/flopy/mf6/modflow/mfgwfnam.py +++ b/flopy/mf6/modflow/mfgwfnam.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -76,6 +76,9 @@ class ModflowGwfnam(mfpackage.MFPackage): dfn_file_name = "gwf-nam.dfn" dfn = [ + [ + "header", + ], [ "block options", "name list", diff --git a/flopy/mf6/modflow/mfgwfnpf.py b/flopy/mf6/modflow/mfgwfnpf.py index 9df3e6477e..f5c1925c03 100644 --- a/flopy/mf6/modflow/mfgwfnpf.py +++ b/flopy/mf6/modflow/mfgwfnpf.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator @@ -219,6 +219,9 @@ class ModflowGwfnpf(mfpackage.MFPackage): dfn_file_name = "gwf-npf.dfn" dfn = [ + [ + "header", + ], [ "block options", "name save_flows", diff --git a/flopy/mf6/modflow/mfgwfoc.py b/flopy/mf6/modflow/mfgwfoc.py index 524b6fe964..dc860226b3 100644 --- a/flopy/mf6/modflow/mfgwfoc.py +++ b/flopy/mf6/modflow/mfgwfoc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -112,6 +112,9 @@ class ModflowGwfoc(mfpackage.MFPackage): dfn_file_name = "gwf-oc.dfn" dfn = [ + [ + "header", + ], [ "block options", "name budget_filerecord", diff --git a/flopy/mf6/modflow/mfgwfrch.py b/flopy/mf6/modflow/mfgwfrch.py index 2a4a3ba541..756fa79f04 100644 --- a/flopy/mf6/modflow/mfgwfrch.py +++ b/flopy/mf6/modflow/mfgwfrch.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -123,6 +123,10 @@ class ModflowGwfrch(mfpackage.MFPackage): dfn_file_name = "gwf-rch.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name fixed_cell", diff --git a/flopy/mf6/modflow/mfgwfrcha.py b/flopy/mf6/modflow/mfgwfrcha.py index 83845f27a6..c061072535 100644 --- a/flopy/mf6/modflow/mfgwfrcha.py +++ b/flopy/mf6/modflow/mfgwfrcha.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator @@ -116,6 +116,10 @@ class ModflowGwfrcha(mfpackage.MFPackage): dfn_file_name = "gwf-rcha.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name readasarrays", diff --git a/flopy/mf6/modflow/mfgwfriv.py b/flopy/mf6/modflow/mfgwfriv.py index e85b8a8c43..72bb6deb6d 100644 --- a/flopy/mf6/modflow/mfgwfriv.py +++ b/flopy/mf6/modflow/mfgwfriv.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -129,6 +129,10 @@ class ModflowGwfriv(mfpackage.MFPackage): dfn_file_name = "gwf-riv.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwfsfr.py b/flopy/mf6/modflow/mfgwfsfr.py index f7df715ebd..5b4b8024f3 100644 --- a/flopy/mf6/modflow/mfgwfsfr.py +++ b/flopy/mf6/modflow/mfgwfsfr.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -442,6 +442,10 @@ class ModflowGwfsfr(mfpackage.MFPackage): dfn_file_name = "gwf-sfr.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwfsto.py b/flopy/mf6/modflow/mfgwfsto.py index e1a9b08818..9b0f23cd55 100644 --- a/flopy/mf6/modflow/mfgwfsto.py +++ b/flopy/mf6/modflow/mfgwfsto.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator @@ -82,6 +82,9 @@ class ModflowGwfsto(mfpackage.MFPackage): dfn_file_name = "gwf-sto.dfn" dfn = [ + [ + "header", + ], [ "block options", "name save_flows", diff --git a/flopy/mf6/modflow/mfgwfuzf.py b/flopy/mf6/modflow/mfgwfuzf.py index c92cd835a9..740f246de5 100644 --- a/flopy/mf6/modflow/mfgwfuzf.py +++ b/flopy/mf6/modflow/mfgwfuzf.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -294,6 +294,10 @@ class ModflowGwfuzf(mfpackage.MFPackage): dfn_file_name = "gwf-uzf.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwfwel.py b/flopy/mf6/modflow/mfgwfwel.py index d788975b31..55bb629bbc 100644 --- a/flopy/mf6/modflow/mfgwfwel.py +++ b/flopy/mf6/modflow/mfgwfwel.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -133,6 +133,10 @@ class ModflowGwfwel(mfpackage.MFPackage): dfn_file_name = "gwf-wel.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwt.py b/flopy/mf6/modflow/mfgwt.py index 5cfd3ce777..edf735cbbf 100644 --- a/flopy/mf6/modflow/mfgwt.py +++ b/flopy/mf6/modflow/mfgwt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfmodel from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator diff --git a/flopy/mf6/modflow/mfgwtadv.py b/flopy/mf6/modflow/mfgwtadv.py index cdedfbbcc4..5e7d24f853 100644 --- a/flopy/mf6/modflow/mfgwtadv.py +++ b/flopy/mf6/modflow/mfgwtadv.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage @@ -36,6 +36,9 @@ class ModflowGwtadv(mfpackage.MFPackage): dfn_file_name = "gwt-adv.dfn" dfn = [ + [ + "header", + ], [ "block options", "name scheme", @@ -43,7 +46,7 @@ class ModflowGwtadv(mfpackage.MFPackage): "valid central upstream tvd", "reader urword", "optional true", - ] + ], ] def __init__( diff --git a/flopy/mf6/modflow/mfgwtapi.py b/flopy/mf6/modflow/mfgwtapi.py index 500c16a381..174f17ed16 100644 --- a/flopy/mf6/modflow/mfgwtapi.py +++ b/flopy/mf6/modflow/mfgwtapi.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -68,6 +68,9 @@ class ModflowGwtapi(mfpackage.MFPackage): dfn_file_name = "gwt-api.dfn" dfn = [ + [ + "header", + ], [ "block options", "name boundnames", diff --git a/flopy/mf6/modflow/mfgwtcnc.py b/flopy/mf6/modflow/mfgwtcnc.py index e1dd42f04e..777bb89c0a 100644 --- a/flopy/mf6/modflow/mfgwtcnc.py +++ b/flopy/mf6/modflow/mfgwtcnc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -117,6 +117,9 @@ class ModflowGwtcnc(mfpackage.MFPackage): dfn_file_name = "gwt-cnc.dfn" dfn = [ + [ + "header", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwtdis.py b/flopy/mf6/modflow/mfgwtdis.py index e02550c95a..351d1fc6c4 100644 --- a/flopy/mf6/modflow/mfgwtdis.py +++ b/flopy/mf6/modflow/mfgwtdis.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator @@ -90,6 +90,9 @@ class ModflowGwtdis(mfpackage.MFPackage): dfn_file_name = "gwt-dis.dfn" dfn = [ + [ + "header", + ], [ "block options", "name length_units", diff --git a/flopy/mf6/modflow/mfgwtdisu.py b/flopy/mf6/modflow/mfgwtdisu.py index d005a173b3..6dedeaf8bb 100644 --- a/flopy/mf6/modflow/mfgwtdisu.py +++ b/flopy/mf6/modflow/mfgwtdisu.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator @@ -205,6 +205,9 @@ class ModflowGwtdisu(mfpackage.MFPackage): dfn_file_name = "gwt-disu.dfn" dfn = [ + [ + "header", + ], [ "block options", "name length_units", diff --git a/flopy/mf6/modflow/mfgwtdisv.py b/flopy/mf6/modflow/mfgwtdisv.py index 7e309611e5..1a65132644 100644 --- a/flopy/mf6/modflow/mfgwtdisv.py +++ b/flopy/mf6/modflow/mfgwtdisv.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator @@ -118,6 +118,9 @@ class ModflowGwtdisv(mfpackage.MFPackage): dfn_file_name = "gwt-disv.dfn" dfn = [ + [ + "header", + ], [ "block options", "name length_units", diff --git a/flopy/mf6/modflow/mfgwtdsp.py b/flopy/mf6/modflow/mfgwtdsp.py index 982c8dd2e0..0dae4798fc 100644 --- a/flopy/mf6/modflow/mfgwtdsp.py +++ b/flopy/mf6/modflow/mfgwtdsp.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator @@ -86,6 +86,9 @@ class ModflowGwtdsp(mfpackage.MFPackage): dfn_file_name = "gwt-dsp.dfn" dfn = [ + [ + "header", + ], [ "block options", "name xt3d_off", diff --git a/flopy/mf6/modflow/mfgwtfmi.py b/flopy/mf6/modflow/mfgwtfmi.py index 12d42ff517..e617f49331 100644 --- a/flopy/mf6/modflow/mfgwtfmi.py +++ b/flopy/mf6/modflow/mfgwtfmi.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -60,6 +60,9 @@ class ModflowGwtfmi(mfpackage.MFPackage): dfn_file_name = "gwt-fmi.dfn" dfn = [ + [ + "header", + ], [ "block options", "name save_flows", diff --git a/flopy/mf6/modflow/mfgwtic.py b/flopy/mf6/modflow/mfgwtic.py index e89a51116a..89a1a7a246 100644 --- a/flopy/mf6/modflow/mfgwtic.py +++ b/flopy/mf6/modflow/mfgwtic.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator @@ -39,6 +39,9 @@ class ModflowGwtic(mfpackage.MFPackage): dfn_file_name = "gwt-ic.dfn" dfn = [ + [ + "header", + ], [ "block griddata", "name strt", @@ -47,7 +50,7 @@ class ModflowGwtic(mfpackage.MFPackage): "reader readarray", "layered true", "default_value 0.0", - ] + ], ] def __init__( diff --git a/flopy/mf6/modflow/mfgwtist.py b/flopy/mf6/modflow/mfgwtist.py index 6eca4efa27..2fdf33134e 100644 --- a/flopy/mf6/modflow/mfgwtist.py +++ b/flopy/mf6/modflow/mfgwtist.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator @@ -137,6 +137,9 @@ class ModflowGwtist(mfpackage.MFPackage): dfn_file_name = "gwt-ist.dfn" dfn = [ + [ + "header", + ], [ "block options", "name save_flows", diff --git a/flopy/mf6/modflow/mfgwtlkt.py b/flopy/mf6/modflow/mfgwtlkt.py index 0e64e8fc6f..83aa16cb61 100644 --- a/flopy/mf6/modflow/mfgwtlkt.py +++ b/flopy/mf6/modflow/mfgwtlkt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -228,6 +228,9 @@ class ModflowGwtlkt(mfpackage.MFPackage): dfn_file_name = "gwt-lkt.dfn" dfn = [ + [ + "header", + ], [ "block options", "name flow_package_name", diff --git a/flopy/mf6/modflow/mfgwtmst.py b/flopy/mf6/modflow/mfgwtmst.py index cd82c2e405..8bd63a0576 100644 --- a/flopy/mf6/modflow/mfgwtmst.py +++ b/flopy/mf6/modflow/mfgwtmst.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ArrayTemplateGenerator @@ -97,6 +97,9 @@ class ModflowGwtmst(mfpackage.MFPackage): dfn_file_name = "gwt-mst.dfn" dfn = [ + [ + "header", + ], [ "block options", "name save_flows", diff --git a/flopy/mf6/modflow/mfgwtmvt.py b/flopy/mf6/modflow/mfgwtmvt.py index 333537eff1..b4a9457cbf 100644 --- a/flopy/mf6/modflow/mfgwtmvt.py +++ b/flopy/mf6/modflow/mfgwtmvt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -61,6 +61,9 @@ class ModflowGwtmvt(mfpackage.MFPackage): dfn_file_name = "gwt-mvt.dfn" dfn = [ + [ + "header", + ], [ "block options", "name print_input", diff --git a/flopy/mf6/modflow/mfgwtmwt.py b/flopy/mf6/modflow/mfgwtmwt.py index e1d03f98b8..4965f3a556 100644 --- a/flopy/mf6/modflow/mfgwtmwt.py +++ b/flopy/mf6/modflow/mfgwtmwt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -203,6 +203,9 @@ class ModflowGwtmwt(mfpackage.MFPackage): dfn_file_name = "gwt-mwt.dfn" dfn = [ + [ + "header", + ], [ "block options", "name flow_package_name", diff --git a/flopy/mf6/modflow/mfgwtnam.py b/flopy/mf6/modflow/mfgwtnam.py index 8b8a6bc3cd..07643ce30c 100644 --- a/flopy/mf6/modflow/mfgwtnam.py +++ b/flopy/mf6/modflow/mfgwtnam.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -71,6 +71,9 @@ class ModflowGwtnam(mfpackage.MFPackage): dfn_file_name = "gwt-nam.dfn" dfn = [ + [ + "header", + ], [ "block options", "name list", diff --git a/flopy/mf6/modflow/mfgwtoc.py b/flopy/mf6/modflow/mfgwtoc.py index 492f088f1d..330b52c80d 100644 --- a/flopy/mf6/modflow/mfgwtoc.py +++ b/flopy/mf6/modflow/mfgwtoc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -113,6 +113,9 @@ class ModflowGwtoc(mfpackage.MFPackage): dfn_file_name = "gwt-oc.dfn" dfn = [ + [ + "header", + ], [ "block options", "name budget_filerecord", diff --git a/flopy/mf6/modflow/mfgwtsft.py b/flopy/mf6/modflow/mfgwtsft.py index ad2ca4c6ab..3e56ec8473 100644 --- a/flopy/mf6/modflow/mfgwtsft.py +++ b/flopy/mf6/modflow/mfgwtsft.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -225,6 +225,9 @@ class ModflowGwtsft(mfpackage.MFPackage): dfn_file_name = "gwt-sft.dfn" dfn = [ + [ + "header", + ], [ "block options", "name flow_package_name", diff --git a/flopy/mf6/modflow/mfgwtsrc.py b/flopy/mf6/modflow/mfgwtsrc.py index 37590e2b07..f2b80f8f95 100644 --- a/flopy/mf6/modflow/mfgwtsrc.py +++ b/flopy/mf6/modflow/mfgwtsrc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -119,6 +119,9 @@ class ModflowGwtsrc(mfpackage.MFPackage): dfn_file_name = "gwt-src.dfn" dfn = [ + [ + "header", + ], [ "block options", "name auxiliary", diff --git a/flopy/mf6/modflow/mfgwtssm.py b/flopy/mf6/modflow/mfgwtssm.py index adf15ea4db..706ebb61ed 100644 --- a/flopy/mf6/modflow/mfgwtssm.py +++ b/flopy/mf6/modflow/mfgwtssm.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -91,6 +91,9 @@ class ModflowGwtssm(mfpackage.MFPackage): dfn_file_name = "gwt-ssm.dfn" dfn = [ + [ + "header", + ], [ "block options", "name print_flows", diff --git a/flopy/mf6/modflow/mfgwtuzt.py b/flopy/mf6/modflow/mfgwtuzt.py index 69764c5a62..3318407f07 100644 --- a/flopy/mf6/modflow/mfgwtuzt.py +++ b/flopy/mf6/modflow/mfgwtuzt.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -212,6 +212,9 @@ class ModflowGwtuzt(mfpackage.MFPackage): dfn_file_name = "gwt-uzt.dfn" dfn = [ + [ + "header", + ], [ "block options", "name flow_package_name", diff --git a/flopy/mf6/modflow/mfims.py b/flopy/mf6/modflow/mfims.py index 56fa4c1651..6e7db9d6ef 100644 --- a/flopy/mf6/modflow/mfims.py +++ b/flopy/mf6/modflow/mfims.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -379,6 +379,9 @@ class ModflowIms(mfpackage.MFPackage): dfn_file_name = "sln-ims.dfn" dfn = [ + [ + "header", + ], [ "block options", "name print_option", diff --git a/flopy/mf6/modflow/mfmvr.py b/flopy/mf6/modflow/mfmvr.py index 2a989208f0..a9c2e2d911 100644 --- a/flopy/mf6/modflow/mfmvr.py +++ b/flopy/mf6/modflow/mfmvr.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -125,6 +125,9 @@ class ModflowMvr(mfpackage.MFPackage): dfn_file_name = "gwf-mvr.dfn" dfn = [ + [ + "header", + ], [ "block options", "name print_input", diff --git a/flopy/mf6/modflow/mfnam.py b/flopy/mf6/modflow/mfnam.py index 7f6238fabc..c44ca99ea6 100644 --- a/flopy/mf6/modflow/mfnam.py +++ b/flopy/mf6/modflow/mfnam.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -83,6 +83,9 @@ class ModflowNam(mfpackage.MFPackage): dfn_file_name = "sim-nam.dfn" dfn = [ + [ + "header", + ], [ "block options", "name continue", diff --git a/flopy/mf6/modflow/mftdis.py b/flopy/mf6/modflow/mftdis.py index 0d80251889..9b251c9c6e 100644 --- a/flopy/mf6/modflow/mftdis.py +++ b/flopy/mf6/modflow/mftdis.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -63,6 +63,9 @@ class ModflowTdis(mfpackage.MFPackage): dfn_file_name = "sim-tdis.dfn" dfn = [ + [ + "header", + ], [ "block options", "name time_units", diff --git a/flopy/mf6/modflow/mfutlats.py b/flopy/mf6/modflow/mfutlats.py index 4c8c940411..2cb943d888 100644 --- a/flopy/mf6/modflow/mfutlats.py +++ b/flopy/mf6/modflow/mfutlats.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -77,6 +77,9 @@ class ModflowUtlats(mfpackage.MFPackage): dfn_file_name = "utl-ats.dfn" dfn = [ + [ + "header", + ], [ "block dimensions", "name maxats", diff --git a/flopy/mf6/modflow/mfutllaktab.py b/flopy/mf6/modflow/mfutllaktab.py index 8c14b4cd8d..077d846976 100644 --- a/flopy/mf6/modflow/mfutllaktab.py +++ b/flopy/mf6/modflow/mfutllaktab.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -53,6 +53,9 @@ class ModflowUtllaktab(mfpackage.MFPackage): dfn_file_name = "utl-laktab.dfn" dfn = [ + [ + "header", + ], [ "block dimensions", "name nrow", diff --git a/flopy/mf6/modflow/mfutlobs.py b/flopy/mf6/modflow/mfutlobs.py index 5df4095502..dd36e5d671 100644 --- a/flopy/mf6/modflow/mfutlobs.py +++ b/flopy/mf6/modflow/mfutlobs.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -78,6 +78,10 @@ class ModflowUtlobs(mfpackage.MFPackage): dfn_file_name = "utl-obs.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name digits", diff --git a/flopy/mf6/modflow/mfutlsfrtab.py b/flopy/mf6/modflow/mfutlsfrtab.py index 96ced1ce14..09491867ca 100644 --- a/flopy/mf6/modflow/mfutlsfrtab.py +++ b/flopy/mf6/modflow/mfutlsfrtab.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -48,6 +48,9 @@ class ModflowUtlsfrtab(mfpackage.MFPackage): dfn_file_name = "utl-sfrtab.dfn" dfn = [ + [ + "header", + ], [ "block dimensions", "name nrow", diff --git a/flopy/mf6/modflow/mfutlspc.py b/flopy/mf6/modflow/mfutlspc.py index 6d9ce0d508..4012e4311e 100644 --- a/flopy/mf6/modflow/mfutlspc.py +++ b/flopy/mf6/modflow/mfutlspc.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -65,6 +65,10 @@ class ModflowUtlspc(mfpackage.MFPackage): dfn_file_name = "utl-spc.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name print_input", diff --git a/flopy/mf6/modflow/mfutlspca.py b/flopy/mf6/modflow/mfutlspca.py index 08bbe5adb3..c8799cc385 100644 --- a/flopy/mf6/modflow/mfutlspca.py +++ b/flopy/mf6/modflow/mfutlspca.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator @@ -55,6 +55,10 @@ class ModflowUtlspca(mfpackage.MFPackage): dfn_file_name = "utl-spca.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block options", "name readasarrays", diff --git a/flopy/mf6/modflow/mfutltas.py b/flopy/mf6/modflow/mfutltas.py index e3af9cf566..8d606c1807 100644 --- a/flopy/mf6/modflow/mfutltas.py +++ b/flopy/mf6/modflow/mfutltas.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator @@ -55,6 +55,10 @@ class ModflowUtltas(mfpackage.MFPackage): dfn_file_name = "utl-tas.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block attributes", "name time_series_namerecord", diff --git a/flopy/mf6/modflow/mfutlts.py b/flopy/mf6/modflow/mfutlts.py index 6fb471f69e..9291edf023 100644 --- a/flopy/mf6/modflow/mfutlts.py +++ b/flopy/mf6/modflow/mfutlts.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -71,6 +71,10 @@ class ModflowUtlts(mfpackage.MFPackage): dfn_file_name = "utl-ts.dfn" dfn = [ + [ + "header", + "multi-package", + ], [ "block attributes", "name time_series_namerecord", diff --git a/flopy/mf6/modflow/mfutltvk.py b/flopy/mf6/modflow/mfutltvk.py index b1a38e3e84..9673ef5506 100644 --- a/flopy/mf6/modflow/mfutltvk.py +++ b/flopy/mf6/modflow/mfutltvk.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -81,6 +81,9 @@ class ModflowUtltvk(mfpackage.MFPackage): dfn_file_name = "utl-tvk.dfn" dfn = [ + [ + "header", + ], [ "block options", "name ts_filerecord", diff --git a/flopy/mf6/modflow/mfutltvs.py b/flopy/mf6/modflow/mfutltvs.py index ec8e6f8702..29488e0302 100644 --- a/flopy/mf6/modflow/mfutltvs.py +++ b/flopy/mf6/modflow/mfutltvs.py @@ -1,6 +1,6 @@ # DO NOT MODIFY THIS FILE DIRECTLY. THIS FILE MUST BE CREATED BY # mf6/utils/createpackages.py -# FILE created on October 29, 2021 21:09:57 UTC +# FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage from ..data.mfdatautil import ListTemplateGenerator @@ -79,6 +79,9 @@ class ModflowUtltvs(mfpackage.MFPackage): dfn_file_name = "utl-tvs.dfn" dfn = [ + [ + "header", + ], [ "block options", "name disable_storage_change_integration", diff --git a/flopy/mf6/utils/createpackages.py b/flopy/mf6/utils/createpackages.py index 45c4e02fd1..45b688c121 100644 --- a/flopy/mf6/utils/createpackages.py +++ b/flopy/mf6/utils/createpackages.py @@ -64,11 +64,19 @@ def clean_class_string(name): return name -def build_dfn_string(dfn_list): +def build_dfn_string(dfn_list, header): dfn_string = " dfn = [" line_length = len(dfn_string) leading_spaces = " " * line_length first_di = True + + # process header + dfn_string = f'{dfn_string}\n{leading_spaces}["header", ' + for key, value in header.items(): + if key == "multi-package": + dfn_string = f'{dfn_string}\n{leading_spaces} "multi-package", ' + dfn_string = f"{dfn_string}],\n{leading_spaces}" + # process all data items for data_item in dfn_list: line_length += 1 @@ -343,6 +351,7 @@ def create_packages(): "", sim_struct.name_file_struct_obj.dfn_list, sim_struct.name_file_struct_obj.file_type, + sim_struct.name_file_struct_obj.header, ) ) for package in sim_struct.package_struct_objs.values(): @@ -354,6 +363,7 @@ def create_packages(): "", package.dfn_list, package.file_type, + package.header, ) ) for package in sim_struct.utl_struct_objs.values(): @@ -365,6 +375,7 @@ def create_packages(): "utl", package.dfn_list, package.file_type, + package.header, ) ) for model_key, model in sim_struct.model_struct_objs.items(): @@ -375,6 +386,7 @@ def create_packages(): model_key, model.name_file_struct_obj.dfn_list, model.name_file_struct_obj.file_type, + model.name_file_struct_obj.header, ) ) for package in model.package_struct_objs.values(): @@ -385,6 +397,7 @@ def create_packages(): model_key, package.dfn_list, package.file_type, + package.header, ) ) @@ -411,7 +424,7 @@ def create_packages(): set_param_list = [] class_vars = [] template_gens = [] - dfn_string = build_dfn_string(package[3]) + dfn_string = build_dfn_string(package[3], package[5]) package_abbr = clean_class_string( f"{clean_class_string(package[2])}{package[0].file_type}" ).lower() @@ -768,7 +781,7 @@ def create_packages(): model_param_list.insert(0, "version='mf6'") model_param_list.insert(0, "model_nam_file=None") model_param_list.insert(0, "modelname='model'") - model_param_list.append("**kwargs") + model_param_list.append("**kwargs,") init_string_model = build_init_string( init_string_model, model_param_list ) @@ -798,7 +811,7 @@ def create_packages(): "model_nam_file=model_nam_file,\n{}" "version=version, exe_name=exe_name,\n{}" "model_rel_path=model_rel_path,\n{}" - "**kwargs" + "**kwargs," ")\n".format( mparent_init_string, model_name,