From b2468ae9129dae759c0c75119de44b11ae6e0f4d Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Thu, 7 Dec 2023 13:58:13 -0500 Subject: [PATCH] update makefiles and msvs files --- make/makefile | 64 +++++++++++++++--------------- utils/mf5to6/make/makefile | 7 ++-- utils/mf5to6/msvs/mf5to6.vfproj | 1 + utils/mf5to6/pymake/extrafiles.txt | 1 + utils/zonebudget/make/makefile | 8 ++-- 5 files changed, 41 insertions(+), 40 deletions(-) diff --git a/make/makefile b/make/makefile index b64b631395e..a5d35dc045a 100644 --- a/make/makefile +++ b/make/makefile @@ -9,33 +9,32 @@ SOURCEDIR2=../src/Exchange SOURCEDIR3=../src/Distributed SOURCEDIR4=../src/Solution SOURCEDIR5=../src/Solution/LinearMethods -SOURCEDIR6=../src/Solution/ParticleTracker -SOURCEDIR7=../src/Solution/PETSc -SOURCEDIR8=../src/Timing -SOURCEDIR9=../src/Utilities -SOURCEDIR10=../src/Utilities/Idm -SOURCEDIR11=../src/Utilities/Idm/selector -SOURCEDIR12=../src/Utilities/Idm/mf6blockfile -SOURCEDIR13=../src/Utilities/TimeSeries -SOURCEDIR14=../src/Utilities/Memory -SOURCEDIR15=../src/Utilities/OutputControl -SOURCEDIR16=../src/Utilities/ArrayRead -SOURCEDIR17=../src/Utilities/Libraries -SOURCEDIR18=../src/Utilities/Libraries/rcm -SOURCEDIR19=../src/Utilities/Libraries/blas -SOURCEDIR20=../src/Utilities/Libraries/sparskit2 -SOURCEDIR21=../src/Utilities/Libraries/daglib -SOURCEDIR22=../src/Utilities/Libraries/sparsekit -SOURCEDIR23=../src/Utilities/Vector -SOURCEDIR24=../src/Utilities/Matrix -SOURCEDIR25=../src/Utilities/Observation -SOURCEDIR26=../src/Model -SOURCEDIR27=../src/Model/Connection -SOURCEDIR28=../src/Model/GroundWaterTransport -SOURCEDIR29=../src/Model/ModelUtilities -SOURCEDIR30=../src/Model/GroundWaterFlow -SOURCEDIR31=../src/Model/TransportModel -SOURCEDIR32=../src/Model/Geometry +SOURCEDIR6=../src/Solution/PETSc +SOURCEDIR7=../src/Timing +SOURCEDIR8=../src/Utilities +SOURCEDIR9=../src/Utilities/Idm +SOURCEDIR10=../src/Utilities/Idm/selector +SOURCEDIR11=../src/Utilities/Idm/mf6blockfile +SOURCEDIR12=../src/Utilities/TimeSeries +SOURCEDIR13=../src/Utilities/Memory +SOURCEDIR14=../src/Utilities/OutputControl +SOURCEDIR15=../src/Utilities/ArrayRead +SOURCEDIR16=../src/Utilities/Libraries +SOURCEDIR17=../src/Utilities/Libraries/rcm +SOURCEDIR18=../src/Utilities/Libraries/blas +SOURCEDIR19=../src/Utilities/Libraries/sparskit2 +SOURCEDIR20=../src/Utilities/Libraries/daglib +SOURCEDIR21=../src/Utilities/Libraries/sparsekit +SOURCEDIR22=../src/Utilities/Vector +SOURCEDIR23=../src/Utilities/Matrix +SOURCEDIR24=../src/Utilities/Observation +SOURCEDIR25=../src/Model +SOURCEDIR26=../src/Model/Connection +SOURCEDIR27=../src/Model/GroundWaterTransport +SOURCEDIR28=../src/Model/ModelUtilities +SOURCEDIR29=../src/Model/GroundWaterFlow +SOURCEDIR30=../src/Model/TransportModel +SOURCEDIR31=../src/Model/Geometry VPATH = \ ${SOURCEDIR1} \ @@ -68,24 +67,23 @@ ${SOURCEDIR27} \ ${SOURCEDIR28} \ ${SOURCEDIR29} \ ${SOURCEDIR30} \ -${SOURCEDIR31} \ -${SOURCEDIR32} +${SOURCEDIR31} .SUFFIXES: .f90 .F90 .o OBJECTS = \ $(OBJDIR)/kind.o \ $(OBJDIR)/Constants.o \ -$(OBJDIR)/SimVariables.o \ $(OBJDIR)/ErrorUtil.o \ -$(OBJDIR)/genericutils.o \ +$(OBJDIR)/SimVariables.o \ +$(OBJDIR)/ArrayHandlers.o \ +$(OBJDIR)/Message.o \ $(OBJDIR)/defmacro.o \ $(OBJDIR)/compilerversion.o \ -$(OBJDIR)/ArrayHandlers.o \ $(OBJDIR)/version.o \ -$(OBJDIR)/Message.o \ $(OBJDIR)/Sim.o \ $(OBJDIR)/OpenSpec.o \ +$(OBJDIR)/genericutils.o \ $(OBJDIR)/InputOutput.o \ $(OBJDIR)/TableTerm.o \ $(OBJDIR)/Table.o \ diff --git a/utils/mf5to6/make/makefile b/utils/mf5to6/make/makefile index 5fd9b2f1d12..00f87156629 100644 --- a/utils/mf5to6/make/makefile +++ b/utils/mf5to6/make/makefile @@ -28,16 +28,17 @@ ${SOURCEDIR8} OBJECTS = \ $(OBJDIR)/kind.o \ $(OBJDIR)/Constants.o \ +$(OBJDIR)/Global.o \ $(OBJDIR)/SimVariables.o \ -$(OBJDIR)/genericutils.o \ +$(OBJDIR)/ArrayHandlers.o \ +$(OBJDIR)/Message.o \ $(OBJDIR)/defmacro.o \ $(OBJDIR)/compilerversion.o \ $(OBJDIR)/version.o \ $(OBJDIR)/OpenSpec.o \ -$(OBJDIR)/Global.o \ $(OBJDIR)/GlobalVariables.o \ -$(OBJDIR)/ArrayHandlers.o \ $(OBJDIR)/SimPHMF.o \ +$(OBJDIR)/genericutils.o \ $(OBJDIR)/InputOutput.o \ $(OBJDIR)/TableTerm.o \ $(OBJDIR)/Table.o \ diff --git a/utils/mf5to6/msvs/mf5to6.vfproj b/utils/mf5to6/msvs/mf5to6.vfproj index f2f4308ae4f..f206d7d30aa 100644 --- a/utils/mf5to6/msvs/mf5to6.vfproj +++ b/utils/mf5to6/msvs/mf5to6.vfproj @@ -104,6 +104,7 @@ + diff --git a/utils/mf5to6/pymake/extrafiles.txt b/utils/mf5to6/pymake/extrafiles.txt index 0590f14ebf5..6b5a9b976c4 100644 --- a/utils/mf5to6/pymake/extrafiles.txt +++ b/utils/mf5to6/pymake/extrafiles.txt @@ -10,6 +10,7 @@ ../../../src/Utilities/SimVariables.f90 ../../../src/Utilities/compilerversion.F90 ../../../src/Utilities/genericutils.f90 +../../../src/Utilities/Message.f90 ../../../src/Utilities/ErrorUtil.f90 ../../../src/Utilities/GeomUtil.f90 ../../../src/Utilities/InputOutput.f90 diff --git a/utils/zonebudget/make/makefile b/utils/zonebudget/make/makefile index 09354769be3..db96d3c3471 100644 --- a/utils/zonebudget/make/makefile +++ b/utils/zonebudget/make/makefile @@ -16,16 +16,16 @@ ${SOURCEDIR2} OBJECTS = \ $(OBJDIR)/kind.o \ $(OBJDIR)/Constants.o \ -$(OBJDIR)/SimVariables.o \ $(OBJDIR)/ErrorUtil.o \ -$(OBJDIR)/genericutils.o \ +$(OBJDIR)/SimVariables.o \ +$(OBJDIR)/ArrayHandlers.o \ +$(OBJDIR)/Message.o \ $(OBJDIR)/defmacro.o \ $(OBJDIR)/compilerversion.o \ -$(OBJDIR)/ArrayHandlers.o \ $(OBJDIR)/version.o \ -$(OBJDIR)/Message.o \ $(OBJDIR)/Sim.o \ $(OBJDIR)/OpenSpec.o \ +$(OBJDIR)/genericutils.o \ $(OBJDIR)/InputOutput.o \ $(OBJDIR)/LongLineReader.o \ $(OBJDIR)/DevFeature.o \