feat(input_data_model): implement for dis (#1039)

* fix(exg): cellid not correct in error message (#1040)

* If cellid in exchange is in IDOMAIN<1 cell, then the cellid written to the error message was wrong
* Close #1038

* docs(mf6io): fix discrepancy in EVT example (#1041)

* data in the period block contains pxpd1 and pxpd2, implying nseg=3, but nseg not specified which suggests a default value of 1
* cleanup variable names

* idm: incremental commit dis package uses idm

* idm: restore MemoryManager source

* idm: cleanup, remove files not related to idm core and dis idm usage

* idm: fprettify, add layered to param input definition

* idm: add input_data_model to actions branches to run tests

* idm: update makefiles

* idm: udpate dfn2f90.py to generate fprettify compliant dis definition file

* idm: reimplement input memorylist deallocation

Co-authored-by: langevin-usgs <langevin@usgs.gov>
Co-authored-by: Eric Morway <emorway@usgs.gov>
Co-authored-by: mjreno <mreno@IGSAAA071L00066.gs.doi.net>

.github/workflows/ci-check-warnings-gfortran.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - develop
+      - input_data_model
 
 env:
   FC: gfortran

.github/workflows/ci-docs.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master, develop ]
   pull_request:
-    branches: [ develop ]
+    branches: [ develop, input_data_model ]
 
 jobs:
   rtd_build:

.github/workflows/ci-format.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master, develop ]
   pull_request:
-    branches: [ develop ]
+    branches: [ develop, input_data_model ]
 
 jobs:
   fortan-format-check:

.github/workflows/ci-tests-gfortran-latest.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - develop
+      - input_data_model
 
 env:
   FC: gfortran

.github/workflows/ci-tests-gfortran-previous.yml

@@ -7,6 +7,7 @@ on:
   pull_request:
     branches:
       - develop
+      - input_data_model
 
 env:
   FC: gfortran

.github/workflows/ci-tests-ifort.yml

@@ -15,6 +15,7 @@ on:
   pull_request:
     branches:
       - develop
+      - input_data_model
 
 env:
   WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18680/w_HPCKit_p_2022.2.0.173_offline.exe

make/makefile

@@ -7,25 +7,27 @@ include ./makedefaults
 SOURCEDIR1=../src
 SOURCEDIR2=../src/Exchange
 SOURCEDIR3=../src/Model
-SOURCEDIR4=../src/Model/Geometry
-SOURCEDIR5=../src/Model/ModelUtilities
-SOURCEDIR6=../src/Model/Connection
-SOURCEDIR7=../src/Model/GroundWaterTransport
-SOURCEDIR8=../src/Model/GroundWaterFlow
-SOURCEDIR9=../src/Solution
-SOURCEDIR10=../src/Solution/LinearMethods
-SOURCEDIR11=../src/Timing
-SOURCEDIR12=../src/Utilities
-SOURCEDIR13=../src/Utilities/TimeSeries
-SOURCEDIR14=../src/Utilities/Libraries
-SOURCEDIR15=../src/Utilities/Libraries/rcm
-SOURCEDIR16=../src/Utilities/Libraries/sparsekit
-SOURCEDIR17=../src/Utilities/Libraries/sparskit2
-SOURCEDIR18=../src/Utilities/Libraries/blas
-SOURCEDIR19=../src/Utilities/Libraries/daglib
-SOURCEDIR20=../src/Utilities/Observation
-SOURCEDIR21=../src/Utilities/OutputControl
-SOURCEDIR22=../src/Utilities/Memory
+SOURCEDIR4=../src/Model/Connection
+SOURCEDIR5=../src/Model/Definition
+SOURCEDIR6=../src/Model/Geometry
+SOURCEDIR7=../src/Model/GroundWaterFlow
+SOURCEDIR8=../src/Model/GroundWaterTransport
+SOURCEDIR9=../src/Model/ModelUtilities
+SOURCEDIR10=../src/Solution
+SOURCEDIR11=../src/Solution/LinearMethods
+SOURCEDIR12=../src/Timing
+SOURCEDIR13=../src/Utilities
+SOURCEDIR14=../src/Utilities/Idm
+SOURCEDIR15=../src/Utilities/Libraries
+SOURCEDIR16=../src/Utilities/Libraries/blas
+SOURCEDIR17=../src/Utilities/Libraries/daglib
+SOURCEDIR18=../src/Utilities/Libraries/rcm
+SOURCEDIR19=../src/Utilities/Libraries/sparsekit
+SOURCEDIR20=../src/Utilities/Libraries/sparskit2
+SOURCEDIR21=../src/Utilities/Memory
+SOURCEDIR22=../src/Utilities/Observation
+SOURCEDIR23=../src/Utilities/OutputControl
+SOURCEDIR24=../src/Utilities/TimeSeries
 
 VPATH = \
 ${SOURCEDIR1} \
@@ -49,7 +51,9 @@ ${SOURCEDIR18} \
 ${SOURCEDIR19} \
 ${SOURCEDIR20} \
 ${SOURCEDIR21} \
-${SOURCEDIR22} 
+${SOURCEDIR22} \
+${SOURCEDIR23} \
+${SOURCEDIR24} 
 
 .SUFFIXES: .f90 .F90 .o
 
@@ -99,12 +103,14 @@ $(OBJDIR)/TimeArraySeriesLink.o \
 $(OBJDIR)/ObsUtility.o \
 $(OBJDIR)/ObsContainer.o \
 $(OBJDIR)/BudgetFileReader.o \
+$(OBJDIR)/inputdefinition.o \
 $(OBJDIR)/TimeArraySeriesManager.o \
 $(OBJDIR)/PackageMover.o \
 $(OBJDIR)/Obs3.o \
 $(OBJDIR)/NumericalPackage.o \
 $(OBJDIR)/Budget.o \
 $(OBJDIR)/BudgetTerm.o \
+$(OBJDIR)/gwfdis.o \
 $(OBJDIR)/BoundaryPackage.o \
 $(OBJDIR)/BaseModel.o \
 $(OBJDIR)/PackageBudget.o \
@@ -115,6 +121,9 @@ $(OBJDIR)/SfrCrossSectionUtils.o \
 $(OBJDIR)/PrintSaveManager.o \
 $(OBJDIR)/Xt3dAlgorithm.o \
 $(OBJDIR)/gwf3tvbase8.o \
+$(OBJDIR)/structvector.o \
+$(OBJDIR)/idmlogger.o \
+$(OBJDIR)/inputdefinitionselector.o \
 $(OBJDIR)/NumericalModel.o \
 $(OBJDIR)/BaseExchange.o \
 $(OBJDIR)/UzfCellGroup.o \
@@ -127,6 +136,8 @@ $(OBJDIR)/Xt3dInterface.o \
 $(OBJDIR)/gwf3tvk8.o \
 $(OBJDIR)/GwfNpfOptions.o \
 $(OBJDIR)/GwfNpfGridData.o \
+$(OBJDIR)/structarray.o \
+$(OBJDIR)/idmtypes.o \
 $(OBJDIR)/CellWithNbrs.o \
 $(OBJDIR)/NumericalExchange.o \
 $(OBJDIR)/Iunit.o \
@@ -143,6 +154,8 @@ $(OBJDIR)/GwtDspOptions.o \
 $(OBJDIR)/GwtDspGridData.o \
 $(OBJDIR)/gwf3npf8.o \
 $(OBJDIR)/GwtAdvOptions.o \
+$(OBJDIR)/MemoryManagerExt.o \
+$(OBJDIR)/loadmfinputfile.o \
 $(OBJDIR)/gwf3tvs8.o \
 $(OBJDIR)/GwfStorageUtils.o \
 $(OBJDIR)/Mover.o \
@@ -155,7 +168,6 @@ $(OBJDIR)/InterfaceMap.o \
 $(OBJDIR)/gwf3disu8.o \
 $(OBJDIR)/GridSorting.o \
 $(OBJDIR)/DisConnExchange.o \
-$(OBJDIR)/CsrUtils.o \
 $(OBJDIR)/MappedVariable.o \
 $(OBJDIR)/TransportModel.o \
 $(OBJDIR)/NameFile.o \
@@ -193,6 +205,7 @@ $(OBJDIR)/gwf3chd8.o \
 $(OBJDIR)/ims8reordering.o \
 $(OBJDIR)/GridConnection.o \
 $(OBJDIR)/DistributedData.o \
+$(OBJDIR)/CsrUtils.o \
 $(OBJDIR)/gwt1.o \
 $(OBJDIR)/gwf3.o \
 $(OBJDIR)/ims8base.o \

msvs/mf6core.vfproj

@@ -68,6 +68,8 @@
 		<File RelativePath="..\src\Model\Connection\MappedVariable.f90"/>
 		<File RelativePath="..\src\Model\Connection\qsort_inline.inc"/>
 		<File RelativePath="..\src\Model\Connection\SpatialModelConnection.f90"/></Filter>
+		<Filter Name="Definition">
+		<File RelativePath="..\src\Model\Definition\gwfdis.f90"/></Filter>
 		<Filter Name="Geometry">
 		<File RelativePath="..\src\Model\Geometry\BaseGeometry.f90"/>
 		<File RelativePath="..\src\Model\Geometry\CircularGeometry.f90"/>
@@ -158,6 +160,14 @@
 		<File RelativePath="..\src\Timing\ats.f90"/>
 		<File RelativePath="..\src\Timing\tdis.f90"/></Filter>
 		<Filter Name="Utilities">
+		<Filter Name="Idm">
+		<File RelativePath="..\src\Utilities\Idm\idmlogger.f90"/>
+		<File RelativePath="..\src\Utilities\Idm\idmtypes.f90"/>
+		<File RelativePath="..\src\Utilities\Idm\inputdefinition.f90"/>
+		<File RelativePath="..\src\Utilities\Idm\inputdefinitionselector.f90"/>
+		<File RelativePath="..\src\Utilities\Idm\loadmfinputfile.f90"/>
+		<File RelativePath="..\src\Utilities\Idm\structarray.f90"/>
+		<File RelativePath="..\src\Utilities\Idm\structvector.f90"/></Filter>
 		<Filter Name="Libraries">
 		<File RelativePath="..\src\Utilities\Libraries\blas\blas1_d.f90"/>
 		<File RelativePath="..\src\Utilities\Libraries\daglib\dag_module.f90"/>
@@ -169,6 +179,7 @@
 		<File RelativePath="..\src\Utilities\Memory\MemoryHelper.f90"/>
 		<File RelativePath="..\src\Utilities\Memory\MemoryList.f90"/>
 		<File RelativePath="..\src\Utilities\Memory\MemoryManager.f90"/>
+		<File RelativePath="..\src\Utilities\Memory\MemoryManagerExt.f90"/>
 		<File RelativePath="..\src\Utilities\Memory\MemorySetHandler.f90"/></Filter>
 		<Filter Name="Observation">
 		<File RelativePath="..\src\Utilities\Observation\Obs3.f90"/>