refactor(arrayreader): working on object-based array reader (#1067)

MODFLOW-USGS · Oct 28, 2022 · 682972b · 682972b
1 parent 5869d4a
commit 682972b
Show file tree

Hide file tree

Showing 18 changed files with 1,366 additions and 360 deletions.
diff --git a/doc/mf6io/mf6ivar/dfn/gwf-disv.dfn b/doc/mf6io/mf6ivar/dfn/gwf-disv.dfn
@@ -71,15 +71,15 @@ description is the total number of (x, y) vertex pairs used to characterize the
 block griddata
 name top
 type double precision
-shape (ncpl, 1)
+shape (ncpl)
 reader readarray
 longname model top elevation
 description is the top elevation for each cell in the top model layer.
 
 block griddata
 name botm
 type double precision
-shape (ncpl, 1, nlay)
+shape (ncpl, nlay)
 reader readarray
 layered true
 longname model bottom elevation
@@ -88,7 +88,7 @@ description is the bottom elevation for each cell.
 block griddata
 name idomain
 type integer
-shape (ncpl, 1, nlay)
+shape (ncpl, nlay)
 reader readarray
 layered true
 optional true

diff --git a/make/makefile b/make/makefile
@@ -6,27 +6,28 @@ include ./makedefaults
 # Define the source file directories
 SOURCEDIR1=../src
 SOURCEDIR2=../src/Exchange
-SOURCEDIR3=../src/Model
-SOURCEDIR4=../src/Model/Connection
-SOURCEDIR5=../src/Model/Geometry
-SOURCEDIR6=../src/Model/GroundWaterFlow
-SOURCEDIR7=../src/Model/GroundWaterTransport
-SOURCEDIR8=../src/Model/ModelUtilities
-SOURCEDIR9=../src/Solution
-SOURCEDIR10=../src/Solution/LinearMethods
-SOURCEDIR11=../src/Timing
-SOURCEDIR12=../src/Utilities
-SOURCEDIR13=../src/Utilities/Idm
-SOURCEDIR14=../src/Utilities/Libraries
-SOURCEDIR15=../src/Utilities/Libraries/blas
+SOURCEDIR3=../src/Solution
+SOURCEDIR4=../src/Solution/LinearMethods
+SOURCEDIR5=../src/Timing
+SOURCEDIR6=../src/Utilities
+SOURCEDIR7=../src/Utilities/Idm
+SOURCEDIR8=../src/Utilities/TimeSeries
+SOURCEDIR9=../src/Utilities/Memory
+SOURCEDIR10=../src/Utilities/OutputControl
+SOURCEDIR11=../src/Utilities/ArrayRead
+SOURCEDIR12=../src/Utilities/Libraries
+SOURCEDIR13=../src/Utilities/Libraries/rcm
+SOURCEDIR14=../src/Utilities/Libraries/blas
+SOURCEDIR15=../src/Utilities/Libraries/sparskit2
 SOURCEDIR16=../src/Utilities/Libraries/daglib
-SOURCEDIR17=../src/Utilities/Libraries/rcm
-SOURCEDIR18=../src/Utilities/Libraries/sparsekit
-SOURCEDIR19=../src/Utilities/Libraries/sparskit2
-SOURCEDIR20=../src/Utilities/Memory
-SOURCEDIR21=../src/Utilities/Observation
-SOURCEDIR22=../src/Utilities/OutputControl
-SOURCEDIR23=../src/Utilities/TimeSeries
+SOURCEDIR17=../src/Utilities/Libraries/sparsekit
+SOURCEDIR18=../src/Utilities/Observation
+SOURCEDIR19=../src/Model
+SOURCEDIR20=../src/Model/Connection
+SOURCEDIR21=../src/Model/GroundWaterTransport
+SOURCEDIR22=../src/Model/ModelUtilities
+SOURCEDIR23=../src/Model/GroundWaterFlow
+SOURCEDIR24=../src/Model/Geometry
 
 VPATH = \
 ${SOURCEDIR1} \
@@ -51,7 +52,8 @@ ${SOURCEDIR19} \
 ${SOURCEDIR20} \
 ${SOURCEDIR21} \
 ${SOURCEDIR22} \
-${SOURCEDIR23} 
+${SOURCEDIR23} \
+${SOURCEDIR24} 
 
 .SUFFIXES: .f90 .F90 .o
 
@@ -98,6 +100,7 @@ $(OBJDIR)/TimeArraySeries.o \
 $(OBJDIR)/ObsOutputList.o \
 $(OBJDIR)/Observe.o \
 $(OBJDIR)/InputDefinition.o \
+$(OBJDIR)/ArrayReaderBase.o \
 $(OBJDIR)/TimeArraySeriesLink.o \
 $(OBJDIR)/ObsUtility.o \
 $(OBJDIR)/ObsContainer.o \
@@ -107,6 +110,7 @@ $(OBJDIR)/gwf3npf8idm.o \
 $(OBJDIR)/gwf3disv8idm.o \
 $(OBJDIR)/gwf3disu8idm.o \
 $(OBJDIR)/gwf3dis8idm.o \
+$(OBJDIR)/Integer2dReader.o \
 $(OBJDIR)/TimeArraySeriesManager.o \
 $(OBJDIR)/PackageMover.o \
 $(OBJDIR)/Obs3.o \
@@ -116,11 +120,15 @@ $(OBJDIR)/BudgetFileReader.o \
 $(OBJDIR)/StructVector.o \
 $(OBJDIR)/IdmLogger.o \
 $(OBJDIR)/InputDefinitionSelector.o \
+$(OBJDIR)/Integer1dReader.o \
+$(OBJDIR)/Double2dReader.o \
+$(OBJDIR)/Double1dReader.o \
 $(OBJDIR)/BoundaryPackage.o \
 $(OBJDIR)/BaseModel.o \
 $(OBJDIR)/BudgetTerm.o \
 $(OBJDIR)/StructArray.o \
 $(OBJDIR)/ModflowInput.o \
+$(OBJDIR)/LayeredArrayReader.o \
 $(OBJDIR)/NumericalModel.o \
 $(OBJDIR)/mf6lists.o \
 $(OBJDIR)/PackageBudget.o \

diff --git a/msvs/mf6core.vfproj b/msvs/mf6core.vfproj
@@ -162,6 +162,13 @@
 		<File RelativePath="..\src\Timing\ats.f90"/>
 		<File RelativePath="..\src\Timing\tdis.f90"/></Filter>
 		<Filter Name="Utilities">
+		<Filter Name="ArrayRead">
+		<File RelativePath="..\src\Utilities\ArrayRead\ArrayReaderBase.f90"/>
+		<File RelativePath="..\src\Utilities\ArrayRead\Double1dReader.f90"/>
+		<File RelativePath="..\src\Utilities\ArrayRead\Double2dReader.f90"/>
+		<File RelativePath="..\src\Utilities\ArrayRead\Integer1dReader.f90"/>
+		<File RelativePath="..\src\Utilities\ArrayRead\Integer2dReader.f90"/>
+		<File RelativePath="..\src\Utilities\ArrayRead\LayeredArrayReader.f90"/></Filter>
 		<Filter Name="Idm">
 		<File RelativePath="..\src\Utilities\Idm\IdmLogger.f90"/>
 		<File RelativePath="..\src\Utilities\Idm\IdmMf6FileLoader.f90"/>