From 49368b6e1914dc995b6473470be7c340401d73e8 Mon Sep 17 00:00:00 2001 From: Eric Morway Date: Fri, 21 Jul 2023 05:17:07 -0700 Subject: [PATCH] attempting to resolve gfortran12 issue --- src/meson.build | 1 - utils/zonebudget/make/makefile | 7 +++++-- utils/zonebudget/pymake/extrafiles.txt | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/meson.build b/src/meson.build index 4118f22072f..7372a716a0a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -81,7 +81,6 @@ modflow_sources = files( 'Model' / 'GroundWaterFlow' / 'gwf3vsc8.f90', 'Model' / 'GroundWaterFlow' / 'gwf3wel8.f90', 'Model' / 'GroundWaterTransport' / 'gwt1.f90', - 'Model' / 'GroundWaterTransport' / 'gwt1adv1.f90', 'Model' / 'GroundWaterTransport' / 'gwt1apt1.f90', 'Model' / 'GroundWaterTransport' / 'gwt1cnc1.f90', 'Model' / 'GroundWaterTransport' / 'gwt1dis1idm.f90', diff --git a/utils/zonebudget/make/makefile b/utils/zonebudget/make/makefile index 092dc3b0294..f7feb760bd5 100644 --- a/utils/zonebudget/make/makefile +++ b/utils/zonebudget/make/makefile @@ -5,11 +5,13 @@ include ./makedefaults # Define the source file directories SOURCEDIR1=../src -SOURCEDIR2=../../../src/Utilities +SOURCEDIR2=../../../src/Model/ModelUtilities +SOURCEDIR3=../../../src/Utilities VPATH = \ ${SOURCEDIR1} \ -${SOURCEDIR2} +${SOURCEDIR2} \ +${SOURCEDIR3} .SUFFIXES: .f90 .F90 .o @@ -29,6 +31,7 @@ $(OBJDIR)/InputOutput.o \ $(OBJDIR)/sort.o \ $(OBJDIR)/BlockParser.o \ $(OBJDIR)/ArrayReaders.o \ +$(OBJDIR)/TspLabels.o \ $(OBJDIR)/zone.o \ $(OBJDIR)/Budget.o \ $(OBJDIR)/zoneoutput.o \ diff --git a/utils/zonebudget/pymake/extrafiles.txt b/utils/zonebudget/pymake/extrafiles.txt index c4cfdf23967..63a6508bf5c 100644 --- a/utils/zonebudget/pymake/extrafiles.txt +++ b/utils/zonebudget/pymake/extrafiles.txt @@ -1,3 +1,4 @@ +../../../src/Model/ModelUtilities/TspLabels.f90 ../../../src/Utilities/ArrayHandlers.f90 ../../../src/Utilities/ArrayReaders.f90 ../../../src/Utilities/BlockParser.f90