diff --git a/utils/mf5to6/make/makefile b/utils/mf5to6/make/makefile
index f2b4086a002..0d16924fd33 100644
--- a/utils/mf5to6/make/makefile
+++ b/utils/mf5to6/make/makefile
@@ -28,16 +28,16 @@ ${SOURCEDIR8}
OBJECTS = \
$(OBJDIR)/kind.o \
$(OBJDIR)/Constants.o \
-$(OBJDIR)/Global.o \
+$(OBJDIR)/ErrorUtil.o \
+$(OBJDIR)/CharString.o \
$(OBJDIR)/SimVariables.o \
$(OBJDIR)/ArrayHandlers.o \
$(OBJDIR)/Message.o \
$(OBJDIR)/defmacro.o \
$(OBJDIR)/compilerversion.o \
$(OBJDIR)/version.o \
+$(OBJDIR)/Sim.o \
$(OBJDIR)/OpenSpec.o \
-$(OBJDIR)/GlobalVariables.o \
-$(OBJDIR)/SimPHMF.o \
$(OBJDIR)/KeyValueNode.o \
$(OBJDIR)/Iterator.o \
$(OBJDIR)/InputOutput.o \
@@ -46,14 +46,15 @@ $(OBJDIR)/TableTerm.o \
$(OBJDIR)/KeyValueList.o \
$(OBJDIR)/Table.o \
$(OBJDIR)/MemoryHelper.o \
-$(OBJDIR)/CharString.o \
$(OBJDIR)/PtrHashTableIterator.o \
$(OBJDIR)/Memory.o \
+$(OBJDIR)/GlobalVariables.o \
+$(OBJDIR)/Global.o \
$(OBJDIR)/PtrHashTable.o \
$(OBJDIR)/MemoryContainerIterator.o \
+$(OBJDIR)/SimPHMF.o \
$(OBJDIR)/ListNode.o \
$(OBJDIR)/MemoryStore.o \
-$(OBJDIR)/ErrorUtil.o \
$(OBJDIR)/LongLineReader.o \
$(OBJDIR)/DevFeature.o \
$(OBJDIR)/Utilities.o \
diff --git a/utils/mf5to6/meson.build b/utils/mf5to6/meson.build
index 0a937a0271d..a57217a623d 100644
--- a/utils/mf5to6/meson.build
+++ b/utils/mf5to6/meson.build
@@ -62,7 +62,6 @@ mf5to6_sources = files(
'src' / 'NWT' / 'NWT1_solver.f',
'src' / 'NWT' / 'NWT1_xmd.f',
'src' / 'NWT' / 'NWT1_xmdlib.f',
- 'src' / 'Preproc' / 'ArrayHandlers.f90',
'src' / 'Preproc' / 'ConstantsPHMF.f90',
'src' / 'Preproc' / 'Discretization3D.f90',
'src' / 'Preproc' / 'DiscretizationBasePHMF.f90',
diff --git a/utils/mf5to6/msvs/mf5to6.vfproj b/utils/mf5to6/msvs/mf5to6.vfproj
index b6334da5196..1d2c110b6a9 100644
--- a/utils/mf5to6/msvs/mf5to6.vfproj
+++ b/utils/mf5to6/msvs/mf5to6.vfproj
@@ -1,32 +1,28 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -89,20 +85,21 @@
-
-
+
+
+
-
+
-
+
@@ -121,6 +118,7 @@
+
@@ -140,7 +138,6 @@
-
@@ -211,7 +208,5 @@
-
-
-
-
+
+
diff --git a/utils/mf5to6/pymake/extrafiles.txt b/utils/mf5to6/pymake/extrafiles.txt
index dad9782be24..34533a24d27 100644
--- a/utils/mf5to6/pymake/extrafiles.txt
+++ b/utils/mf5to6/pymake/extrafiles.txt
@@ -5,6 +5,7 @@
../../../src/Utilities/Memory/MemoryStore.f90
../../../src/Utilities/TimeSeries/TimeSeries.f90
../../../src/Utilities/TimeSeries/TimeSeriesRecord.f90
+../../../src/Utilities/ArrayHandlers.f90
../../../src/Utilities/BlockParser.f90
../../../src/Utilities/CharString.f90
../../../src/Utilities/Constants.f90
@@ -15,6 +16,7 @@
../../../src/Utilities/GeomUtil.f90
../../../src/Utilities/InputOutput.f90
../../../src/Utilities/Iterator.f90
+../../../src/Utilities/Sim.f90
../../../src/Utilities/KeyValueList.f90
../../../src/Utilities/KeyValueListIterator.f90
../../../src/Utilities/KeyValueNode.f90
diff --git a/utils/mf5to6/src/ArrayReadersMF5.f90 b/utils/mf5to6/src/ArrayReadersMF5.f90
index 96404b9e1d4..35e77dabbdd 100644
--- a/utils/mf5to6/src/ArrayReadersMF5.f90
+++ b/utils/mf5to6/src/ArrayReadersMF5.f90
@@ -5,7 +5,7 @@ module ArrayReadersMF5Module
use InputOutputModule, only: openfile, u9rdcom, urword, ucolno, ulaprw
use KindModule, only: DP, I4B
use OpenSpecModule, only: ACCESS, FORM
- use SimModule, only: store_error, ustop, store_error_unit
+ use SimPHMFModule, only: store_error, ustop, store_error_unit
implicit none
diff --git a/utils/mf5to6/src/ChdPackageWriter.f90 b/utils/mf5to6/src/ChdPackageWriter.f90
index 2385a9b6eb8..9a8d7971585 100644
--- a/utils/mf5to6/src/ChdPackageWriter.f90
+++ b/utils/mf5to6/src/ChdPackageWriter.f90
@@ -20,7 +20,7 @@ module ChdPackageWriterModule
use LineListModule, only: LineListType
use ListModule, only: ListType
use PackageWriterModule, only: PackageWriterType
- use SimModule, only: store_note, store_error, ustop
+ use SimPHMFModule, only: store_note, store_error, ustop
use TdisVariablesModule, only: GlobalTdisWriter
use TimeSeriesRecordModule, only: TimeSeriesRecordType, &
ConstructTimeSeriesRecord
diff --git a/utils/mf5to6/src/ChdType.f90 b/utils/mf5to6/src/ChdType.f90
index 73a5d028d44..324a1db00e8 100644
--- a/utils/mf5to6/src/ChdType.f90
+++ b/utils/mf5to6/src/ChdType.f90
@@ -2,7 +2,7 @@ module ChdModule
use ConstantsModule, only: LENTIMESERIESNAME, MAXCHARLEN
use ListModule, only: ListType
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
use TimeSeriesModule, only: TimeSeriesType
implicit none
diff --git a/utils/mf5to6/src/DisWriter.f90 b/utils/mf5to6/src/DisWriter.f90
index 100a793232c..f70f0ed2d81 100644
--- a/utils/mf5to6/src/DisWriter.f90
+++ b/utils/mf5to6/src/DisWriter.f90
@@ -8,7 +8,7 @@ module DisWriterModule
IBOUND, NCNFBD
use GlobalVariablesModule, only: echo
use GWFBCFMODULE, only: LAYCON
- use SimModule, only: store_error, store_note, store_warning, ustop
+ use SimPHMFModule, only: store_error, store_note, store_warning, ustop
use UtilitiesModule, only: ConstantInt2D, ConstantInt3D, &
ConstantReal1D, ConstantReal2D, &
ConstantReal3D, Write2Dint, Write3Dint, &
diff --git a/utils/mf5to6/src/DrnPackageWriter.f90 b/utils/mf5to6/src/DrnPackageWriter.f90
index 5c3ab9c2c9d..49aa504db89 100644
--- a/utils/mf5to6/src/DrnPackageWriter.f90
+++ b/utils/mf5to6/src/DrnPackageWriter.f90
@@ -8,7 +8,7 @@ module DrnPackageWriterModule
use GwfDrnSubs, only: GWF2DRN7AR, GWF2DRN7RP
use LineListModule, only: same_lines
use PackageWriterModule, only: PackageWriterType
- use SimModule, only: ustop, store_error, store_warning
+ use SimPHMFModule, only: ustop, store_error, store_warning
use utl7module, only: U1DREL, U2DREL, &
urword, URDCOM, &
ULSTRD
diff --git a/utils/mf5to6/src/EvtPackageWriter.f90 b/utils/mf5to6/src/EvtPackageWriter.f90
index cdd4cb38c23..8f51a04a67d 100644
--- a/utils/mf5to6/src/EvtPackageWriter.f90
+++ b/utils/mf5to6/src/EvtPackageWriter.f90
@@ -12,7 +12,7 @@ module EvtPackageWriterModule
use GwfEvtSubs, only: GWF2EVT7AR, GWF2EVT7RP
use LineListModule, only: LineListType, same_lines
use PackageWriterModule, only: PackageWriterType
- use SimModule, only: ustop, store_error, store_warning, store_note
+ use SimPHMFModule, only: ustop, store_error, store_warning, store_note
use UtilitiesModule, only: Write1Drel, Write2Drel, Write3Drel, &
ConstantInt2D, ConstantReal2D, &
BuildArrayFormat
diff --git a/utils/mf5to6/src/Exchange.f90 b/utils/mf5to6/src/Exchange.f90
index 3a5d2f1a7de..d42813a5cb1 100644
--- a/utils/mf5to6/src/Exchange.f90
+++ b/utils/mf5to6/src/Exchange.f90
@@ -9,7 +9,7 @@ module ExchangeModule
use LGRMODULE, only: IBFLG, NPLBEG, NPRBEG, NPCBEG, NPLEND, &
NPREND, NPCEND, NCPP, NCPPL
use ModelModule, only: ModelType
- use SimModule, only: store_note, store_warning
+ use SimPHMFModule, only: store_note, store_warning
type :: ExchangeType
character(len=9) :: ExgType = 'GWF6-GWF6'
diff --git a/utils/mf5to6/src/ExchangeWriter.f90 b/utils/mf5to6/src/ExchangeWriter.f90
index f1863f183aa..db813ec6813 100644
--- a/utils/mf5to6/src/ExchangeWriter.f90
+++ b/utils/mf5to6/src/ExchangeWriter.f90
@@ -19,7 +19,7 @@ module ExchangeWriterModule
use ModelConverterModule, only: ModelConverterType
use ModelModule, only: ModelType
use MvrPackageWriterModule, only: MvrPackageWriterType
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
type, extends(FileWriterType) :: ExchangeWriterType
type(ListType) :: Exchanges
diff --git a/utils/mf5to6/src/FhbPackageWriter.f90 b/utils/mf5to6/src/FhbPackageWriter.f90
index baf2db1ebe3..5e2f488ede6 100644
--- a/utils/mf5to6/src/FhbPackageWriter.f90
+++ b/utils/mf5to6/src/FhbPackageWriter.f90
@@ -19,7 +19,7 @@ module FhbPackageWriterModule
use LineListModule, only: LineListType
use ListModule, only: ListType
use PackageWriterModule, only: PackageWriterType
- use SimModule, only: store_note
+ use SimPHMFModule, only: store_note
use WelPackageWriterModule, only: WelPackageWriterType
implicit none
diff --git a/utils/mf5to6/src/FileWriter.f90 b/utils/mf5to6/src/FileWriter.f90
index c69dc832c50..316f90d450e 100644
--- a/utils/mf5to6/src/FileWriter.f90
+++ b/utils/mf5to6/src/FileWriter.f90
@@ -4,7 +4,7 @@ module FileWriterModule
use FileTypeModule, only: FileType
use GLOBAL, only: iout
use InputOutputModule, only: GetUnit, openfile
- use SimModule, only: store_warning
+ use SimPHMFModule, only: store_warning
use UtilitiesModule, only: close_file
private
diff --git a/utils/mf5to6/src/GhbPackageWriter.f90 b/utils/mf5to6/src/GhbPackageWriter.f90
index e6366414595..f7c524fc1c0 100644
--- a/utils/mf5to6/src/GhbPackageWriter.f90
+++ b/utils/mf5to6/src/GhbPackageWriter.f90
@@ -8,7 +8,7 @@ module GhbPackageWriterModule
use GwfGhbSubs, only: GWF2GHB7AR, GWF2GHB7RP
use LineListModule, only: same_lines
use PackageWriterModule, only: PackageWriterType
- use SimModule, only: ustop, store_error, store_warning
+ use SimPHMFModule, only: ustop, store_error, store_warning
use utl7module, only: U1DREL, U2DREL, &
urword, URDCOM, &
ULSTRD
diff --git a/utils/mf5to6/src/ImsPackageWriter.f90 b/utils/mf5to6/src/ImsPackageWriter.f90
index 213e3584150..c989efc597e 100644
--- a/utils/mf5to6/src/ImsPackageWriter.f90
+++ b/utils/mf5to6/src/ImsPackageWriter.f90
@@ -21,7 +21,7 @@ module ImsPackageWriterModule
use PCGMODULE, only: mxiterpcg, MUTPCG, HCLOSEPCG, IPRPCG, iter1pcg => ITER1, &
RCLOSEPCG, RELAXPCG, DAMPPCG, npcondpcg => NPCOND
use pcgn, only: pcgndat
- use SimModule, only: ustop, store_error, store_note, store_warning
+ use SimPHMFModule, only: ustop, store_error, store_note, store_warning
use SIPMODULE, only: mxitersip, hclosesip => HCLOSE, IPRSIP, acclsip => ACCL
use UtilitiesModule, only: GreaterOf, GreatestOf
!use XMDMODULE, only: LevelXmd => LEVEL, EpsrnXmd => EPSRN, NorthXmd => NORTH
diff --git a/utils/mf5to6/src/LGR/GwfLgrSubs.f b/utils/mf5to6/src/LGR/GwfLgrSubs.f
index f5b6a00cf6f..4912d4a4945 100644
--- a/utils/mf5to6/src/LGR/GwfLgrSubs.f
+++ b/utils/mf5to6/src/LGR/GwfLgrSubs.f
@@ -5,7 +5,7 @@ module GwfLgrSubsModule
use InputOutputModule, only: GetUnit
use LGRMODULE, only: SGWF2LGR2PNT, SGWF2LGR2PSV
use OpenSpecModule, only: ACCESS, ACTION, FORM
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use UtilitiesModule, only: GetArgs
use utl7module, only: URDCOM, URWORD
diff --git a/utils/mf5to6/src/LGR/GwfSfrSubs.f b/utils/mf5to6/src/LGR/GwfSfrSubs.f
index 3be76aaecc3..98a1c3a1c60 100644
--- a/utils/mf5to6/src/LGR/GwfSfrSubs.f
+++ b/utils/mf5to6/src/LGR/GwfSfrSubs.f
@@ -10,7 +10,7 @@ module GwfSfrSubsModule
use SfrSegmentModule, only: CastAsSfrSegmentType,
& ConstructSfrSegment, SfrSegmentType, GetSegmentFromList,
& AddSegmentToList
- use SimModule, only: store_error, store_warning, ustop
+ use SimPHMFModule, only: store_error, store_warning, ustop
private
public :: GWF2SFR7AR, GWF2SFR7RP
@@ -40,7 +40,7 @@ SUBROUTINE GWF2SFR7AR(In, Iunitbcf, Iunitlpf, Iunithuf, Iunitgwt,
USE GWFBCFMODULE, ONLY: SC1, SC2, LAYCON
! USE GWFHUFMODULE, ONLY: SC2HUF
USE GwfSfrCheckModule
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
use utl7module, only: URWORD, UPCASE, URDCOM
IMPLICIT NONE
INTRINSIC ABS, DBLE
@@ -1010,7 +1010,7 @@ SUBROUTINE GWF2SFR7RP(In, Iunitgwt, Iunitlak, Kkper, Kkstp, Nsol,
+ LAYHDT
USE PARAMMODULE, ONLY: MXPAR, PARTYP, IACTIVE, IPLOC
USE GwfSfrCheckModule
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
IMPLICIT NONE
C ------------------------------------------------------------------
C SPECIFICATIONS:
@@ -1882,7 +1882,7 @@ SUBROUTINE SGWF2SFR7RDSEG(Nlst, Lstbeg, In, Iunitgwt, Iunituzf,
+ NeedLakWaterMover, Ilgrgrid, Ilgrseg,
& NSFRAUX, NeedLgrWaterMover
USE GLOBAL, ONLY: IOUT
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
IMPLICIT NONE
C ------------------------------------------------------------------
C SPECIFICATIONS:
@@ -2455,7 +2455,7 @@ SUBROUTINE SGWF2SFR7UHC(Iunitlpf, Iunithuf)
USE GLOBAL, ONLY: IOUT, IBOUND, LAYHDT
USE GWFLPFMODULE, ONLY: LAYVKA, VKA, HK
! USE GWFHUFMODULE, ONLY: HGUVANI, NHUF, HKHUF=>HK, VKAH
- use SimModule, only : ustop
+ use SimPHMFModule, only : ustop
IMPLICIT NONE
C ------------------------------------------------------------------
C SPECIFICATIONS:
@@ -3184,7 +3184,7 @@ SUBROUTINE SGWF2SFR7PARMOV(In, Iunitgwt, Nsol)
USE GLOBAL, ONLY: IOUT
USE PARAMMODULE, ONLY: IACTIVE, IPLOC, PARNAM, INAME, B
use utl7module, only: URWORD, UPCASE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
IMPLICIT NONE
C ------------------------------------------------------------------
C SPECIFICATIONS:
diff --git a/utils/mf5to6/src/LakPackageWriter.f90 b/utils/mf5to6/src/LakPackageWriter.f90
index 24ce90c8e84..cdb97968e78 100644
--- a/utils/mf5to6/src/LakPackageWriter.f90
+++ b/utils/mf5to6/src/LakPackageWriter.f90
@@ -32,8 +32,8 @@ module LakPackageWriterModule
use SfrReachModule, only: SfrReachType, AddReachToList, GetReachFromList
use SfrSegmentModule, only: SfrSegmentType, AddSegmentToList, &
GetSegmentFromList
- use SimModule, only: ustop, store_error, store_note, store_warning, &
- count_errors
+ use SimPHMFModule, only: ustop, store_error, store_note, store_warning, &
+ count_errors
use UtilitiesModule, only: RemoveElement
use utl7module, only: U1DREL, U2DREL, urword, URDCOM, ULSTRD
diff --git a/utils/mf5to6/src/MF2005/GwfBasSubs.f b/utils/mf5to6/src/MF2005/GwfBasSubs.f
index 2e8adcdd710..338476aca35 100644
--- a/utils/mf5to6/src/MF2005/GwfBasSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfBasSubs.f
@@ -16,8 +16,8 @@ module GwfBasSubs
use ObsWriterModule, only: ObsWriterType
use OpenSpecModule, only: ACCESS, ACTION, FORM
use PackageWriterModule, only : PackageWriterType
- use SimModule, only: store_error, store_note, store_warning,
- & ustop
+ use SimPHMFModule, only: store_error, store_note, store_warning,
+ & ustop
use TdisWriterModule, only: TdisWriterType
use UtilitiesModule, only: ConstantReal2D, Write1Drel,
& Write2Drel
diff --git a/utils/mf5to6/src/MF2005/GwfBcfSubs.f b/utils/mf5to6/src/MF2005/GwfBcfSubs.f
index f729cc282b5..3045508c9b8 100644
--- a/utils/mf5to6/src/MF2005/GwfBcfSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfBcfSubs.f
@@ -1,7 +1,7 @@
module GwfBcfSubs
use ConstantsModule, only: DZERO
use ConstantsPHMFModule, only: HDRYDEFAULT
- use SimModule, only: ustop, store_error, store_note,
+ use SimPHMFModule, only: ustop, store_error, store_note,
& store_warning
use utl7module, only: U1DREL, U2DREL
use ModelModule, only: ModelType
diff --git a/utils/mf5to6/src/MF2005/GwfChdSubs.f b/utils/mf5to6/src/MF2005/GwfChdSubs.f
index 7d0e4ee06d6..be0617a2519 100644
--- a/utils/mf5to6/src/MF2005/GwfChdSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfChdSubs.f
@@ -130,7 +130,7 @@ SUBROUTINE GWF2CHD7RP(IN,IGRID)
use utl7module, only: U1DREL, U2DREL, ! UBDSV1, UBDSV2, UBDSVA,
& urword, URDCOM, ! UBDSV4, UBDSVB,
& ULSTRD
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
! dummy
!type(ListType), intent(inout) :: ChdList
! local
diff --git a/utils/mf5to6/src/MF2005/GwfDrnSubs.f b/utils/mf5to6/src/MF2005/GwfDrnSubs.f
index d0cde5b9ad3..5ad641fca0d 100644
--- a/utils/mf5to6/src/MF2005/GwfDrnSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfDrnSubs.f
@@ -128,7 +128,7 @@ SUBROUTINE GWF2DRN7RP(IN,IGRID)
use utl7module, only: U1DREL, U2DREL, ! UBDSV1, UBDSV2, UBDSVA,
& urword, URDCOM, ! UBDSV4, UBDSVB,
& ULSTRD
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C ------------------------------------------------------------------
CALL SGWF2DRN7PNT(IGRID)
C
diff --git a/utils/mf5to6/src/MF2005/GwfEtsSubs.f b/utils/mf5to6/src/MF2005/GwfEtsSubs.f
index 6f0b5a90062..942e716bcb4 100644
--- a/utils/mf5to6/src/MF2005/GwfEtsSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfEtsSubs.f
@@ -20,7 +20,7 @@ SUBROUTINE GWF2ETS7AR(IN,IGRID)
use utl7module, only: U1DREL, U2DREL, ! UBDSV1, UBDSV2, UBDSVA,
& urword, URDCOM, ! UBDSV4, UBDSVB,
& ULSTRD
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C
CHARACTER*4 PTYP
CHARACTER*200 LINE
@@ -148,7 +148,7 @@ SUBROUTINE GWF2ETS7RP(IN,IGRID)
use utl7module, only: U1DREL, U2DREL, !UBDSV1, UBDSV2, UBDSVA,
& urword, URDCOM, !UBDSV4, UBDSVB,
& ULSTRD, u2dint
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C
CHARACTER*24 ANAME(6)
DATA ANAME(1) /' ET LAYER INDEX (IETS)'/
diff --git a/utils/mf5to6/src/MF2005/GwfEvtSubs.f b/utils/mf5to6/src/MF2005/GwfEvtSubs.f
index 5579b541e22..217d6e8f67f 100644
--- a/utils/mf5to6/src/MF2005/GwfEvtSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfEvtSubs.f
@@ -17,7 +17,7 @@ SUBROUTINE GWF2EVT7AR(IN,IGRID)
use utl7module, only: U1DREL, U2DREL, !UBDSV1, UBDSV2, UBDSVA,
& urword, URDCOM, !UBDSV4, UBDSVB,
& ULSTRD
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C
CHARACTER*200 LINE
CHARACTER*4 PTYP
@@ -108,7 +108,7 @@ SUBROUTINE GWF2EVT7RP(IN,IGRID)
use utl7module, only: U1DREL, U2DREL, !UBDSV1, UBDSV2, UBDSVA,
& urword, URDCOM, !UBDSV4, UBDSVB,
& ULSTRD, u2dint
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C
CHARACTER*24 ANAME(4)
C
diff --git a/utils/mf5to6/src/MF2005/GwfFhbSubs.f90 b/utils/mf5to6/src/MF2005/GwfFhbSubs.f90
index e0a8db2bec9..1b0e10aa716 100644
--- a/utils/mf5to6/src/MF2005/GwfFhbSubs.f90
+++ b/utils/mf5to6/src/MF2005/GwfFhbSubs.f90
@@ -1,5 +1,5 @@
module GwfFhbSubs
- use SimModule, only: ustop, store_error, store_note, &
+ use SimPHMFModule, only: ustop, store_error, store_note, &
store_warning
use GWFFHBMODULE, only: SGWF2FHB7PNT, SGWF2FHB7PSV
use InputOutputModule, only: URWORD, UBDSVB, UBDSVB !, ubudsv
diff --git a/utils/mf5to6/src/MF2005/GwfGhbSubs.f b/utils/mf5to6/src/MF2005/GwfGhbSubs.f
index 005e8c1d729..29989e5443c 100644
--- a/utils/mf5to6/src/MF2005/GwfGhbSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfGhbSubs.f
@@ -132,7 +132,7 @@ SUBROUTINE GWF2GHB7RP(IN,IGRID)
use utl7module, only: U1DREL, U2DREL, ! UBDSV1, UBDSV2, UBDSVA,
& urword, URDCOM, !UBDSV4, UBDSVB,
& ULSTRD
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C ------------------------------------------------------------------
CALL SGWF2GHB7PNT(IGRID)
C
diff --git a/utils/mf5to6/src/MF2005/GwfLakSubs.f b/utils/mf5to6/src/MF2005/GwfLakSubs.f
index 15214b5978d..35eb379d7a5 100644
--- a/utils/mf5to6/src/MF2005/GwfLakSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfLakSubs.f
@@ -1,7 +1,7 @@
module GwfLakSubs
use GWFLAKMODULE, only: SGWF2LAK7PNT
- use SimModule, only: store_warning, store_error
+ use SimPHMFModule, only: store_warning, store_error
private
public :: GWF2LAK7AR, GWF2LAK7RP
@@ -388,7 +388,7 @@ SUBROUTINE GWF2LAK7RP(IN,IUNITBCF,IUNITGWT,IUNITLPF,IUNITHUF,
USE GWFLAKMODULE
USE GLOBAL, ONLY: IOUT, NCOL, NROW, NLAY, IFREFM, IBOUND,
+ LBOTM, BOTM, DELR, DELC, ISSFLG
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use utl7module, only: U2DINT, U2DREL
C USE GWFSFRMODULE, ONLY: NSS
C ------------------------------------------------------------------
@@ -1074,7 +1074,7 @@ END SUBROUTINE GWF2LAK7RP
! + BOTTMS, IDIV, STGOLD2, NDV
! USE GWFSFRMODULE, ONLY: DLKSTAGE
! USE GLOBAL, ONLY: IOUT
-! use SimModule, only: ustop
+! use SimPHMFModule, only: ustop
!C ------------------------------------------------------------------
!C FUNCTIONS
!C ------------------------------------------------------------------
@@ -1214,7 +1214,7 @@ SUBROUTINE SGWF2LAK7SFR7RPS()
USE GWFLAKMODULE, ONLY: NLAKES, NTRB, NDV, ITRB, IDIV, IRK
USE GLOBAL, ONLY: IOUT, NODES
USE GWFSFRMODULE, ONLY: NSS, IDIVAR, IOTSG, SEG, ISEG
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C
C-- DOUBLE CHECK SIZE OF IRK (STORED IN BUFF) vs. NLAKES
C
diff --git a/utils/mf5to6/src/MF2005/GwfLpfSubs.f b/utils/mf5to6/src/MF2005/GwfLpfSubs.f
index f5c8589e55f..276c5bef9b0 100644
--- a/utils/mf5to6/src/MF2005/GwfLpfSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfLpfSubs.f
@@ -3,7 +3,7 @@ module GwfLpfSubs
use ConstantsPHMFModule, only: HDRYDEFAULT
use GWFLPFMODULE, only: GWF2LPF7PSV
use ModelModule, only: ModelType
- use SimModule, only: ustop, store_error, store_note,
+ use SimPHMFModule, only: ustop, store_error, store_note,
& store_warning
use utl7module, only: U1DREL, U2DREL,
& urword, URDCOM
diff --git a/utils/mf5to6/src/MF2005/GwfRchSubs.f b/utils/mf5to6/src/MF2005/GwfRchSubs.f
index d799529287f..e6849c4f2eb 100644
--- a/utils/mf5to6/src/MF2005/GwfRchSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfRchSubs.f
@@ -19,7 +19,7 @@ SUBROUTINE GWF2RCH7AR(IN,IGRID)
use utl7module, only: U1DREL, U2DREL, !UBDSV1, UBDSV2, UBDSVA,
& urword, URDCOM, !UBDSV4, UBDSVB,
& ULSTRD
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C
CHARACTER*200 LINE
CHARACTER*4 PTYP
@@ -107,7 +107,7 @@ SUBROUTINE GWF2RCH7RP(IN,IGRID)
use utl7module, only: U1DREL, U2DREL, !UBDSV1, UBDSV2, UBDSVA,
& urword, URDCOM, !UBDSV4, UBDSVB,
& ULSTRD, u2dint
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C
CHARACTER*24 ANAME(2)
C
diff --git a/utils/mf5to6/src/MF2005/GwfResSubs.f b/utils/mf5to6/src/MF2005/GwfResSubs.f
index fb9dcf80bc6..a7c780a29c7 100644
--- a/utils/mf5to6/src/MF2005/GwfResSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfResSubs.f
@@ -20,7 +20,7 @@ SUBROUTINE GWF2RES7AR(IN,IGRID)
USE GWFBASMODULE, ONLY:DELT
USE GWFRESMODULE, ONLY:NRES,IRESCB,NRESOP,IRESPT,NPTS,
1 IRES,IRESL,BRES,CRES,BBRES,HRES,HRESSE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
! use InputOutputModule, only: U2DINT, U2DREL
use ArrayReadersMF5Module, only: ReadArray
C
diff --git a/utils/mf5to6/src/MF2005/GwfRivSubs.f b/utils/mf5to6/src/MF2005/GwfRivSubs.f
index cbd21e42530..c026ac2c72b 100644
--- a/utils/mf5to6/src/MF2005/GwfRivSubs.f
+++ b/utils/mf5to6/src/MF2005/GwfRivSubs.f
@@ -136,7 +136,7 @@ SUBROUTINE GWF2RIV7RP(IN,IGRID)
use utl7module, only: U1DREL, U2DREL, !UBDSV1, UBDSV2, UBDSVA,
& urword, URDCOM, !UBDSV4, UBDSVB,
& ULSTRD
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C ------------------------------------------------------------------
CALL SGWF2RIV7PNT(IGRID)
C
diff --git a/utils/mf5to6/src/MF2005/GwfSfrCheck.f b/utils/mf5to6/src/MF2005/GwfSfrCheck.f
index 82d9e945d3b..caf6d9b3c1a 100644
--- a/utils/mf5to6/src/MF2005/GwfSfrCheck.f
+++ b/utils/mf5to6/src/MF2005/GwfSfrCheck.f
@@ -7,7 +7,7 @@ MODULE GwfSfrCheckModule
USE GWFSFRMODULE,ONLY:ISTRM,STRM,NSTRM
USE GLOBAL,ONLY:BOTM,IBOUND,LBOTM
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
implicit none
type check_bot
integer ltype,irchnum,iflag,iunit
diff --git a/utils/mf5to6/src/MF2005/de47.f b/utils/mf5to6/src/MF2005/de47.f
index 9be4cb92927..212a0136c2a 100644
--- a/utils/mf5to6/src/MF2005/de47.f
+++ b/utils/mf5to6/src/MF2005/de47.f
@@ -38,7 +38,7 @@ SUBROUTINE DE47AR(INDE4,MXITER,IGRID)
USE GLOBAL, ONLY:IOUT,NCOL,NROW,NLAY
USE DE4MODULE
use utl7module, only: URDCOM, URWORD
- use SimModule, only: USTOP
+ use SimPHMFModule, only: USTOP
CHARACTER*200 LINE
double precision :: r
C ------------------------------------------------------------------
diff --git a/utils/mf5to6/src/MF2005/gmg7.f b/utils/mf5to6/src/MF2005/gmg7.f
index ada4ce3ca49..2ddba6e59db 100644
--- a/utils/mf5to6/src/MF2005/gmg7.f
+++ b/utils/mf5to6/src/MF2005/gmg7.f
@@ -39,7 +39,7 @@ SUBROUTINE GMG7AR(IN,MXITER,IGRID)
3 IUNITMHC,DUP,DLOW,CHGLIMIT,HNEWLAST,
4 BIGHEADCHG, mxitergmg
use utl7module, only: URDCOM, URWORD
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
IMPLICIT NONE
CHARACTER*200 LINE
INTEGER IN,MXITER,IGRID,ICOL,NDUM,ISTOP,ISTART
diff --git a/utils/mf5to6/src/MF2005/gwf2mnw17.f b/utils/mf5to6/src/MF2005/gwf2mnw17.f
index 4d9b0e4bdde..6a8d4c64963 100644
--- a/utils/mf5to6/src/MF2005/gwf2mnw17.f
+++ b/utils/mf5to6/src/MF2005/gwf2mnw17.f
@@ -54,7 +54,7 @@ SUBROUTINE GWF2MNW17AR(In, Iusip, Iude4, Iusor, Iupcg,
USE GMGMODULE,ONLY:HCLOSEGMG
USE PCGN,ONLY:HCLOSEPCGN
use InputOutputModule, only: UPCASE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
IMPLICIT NONE
c ------------------------------------------------------------------
INTRINSIC ABS
@@ -284,7 +284,7 @@ SUBROUTINE GWF2MNW17RP(In, Iubcf, Iulpf, Iuhuf, Kper, Igrid)
use GWFBCFMODULE, only: SGWF2BCF7PNT
use GWFLPFMODULE, only: SGWF2LPF7PNT
use InputOutputModule, only: UPCASE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
IMPLICIT NONE
INTRINSIC ABS, MAX, MOD, INT
INTEGER, EXTERNAL :: IFRL, IDIRECT
@@ -1946,7 +1946,7 @@ END FUNCTION IFRL
c ******************************************************************
SUBROUTINE NCREAD(Io, Txt, Ierr)
use InputOutputModule, only: UPCASE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
IMPLICIT NONE
!EXTERNAL UPCASE, USTOP
c Arguments
diff --git a/utils/mf5to6/src/MF2005/gwf2mnw2i7.f b/utils/mf5to6/src/MF2005/gwf2mnw2i7.f
index e84f905a4ed..b6d24591238 100644
--- a/utils/mf5to6/src/MF2005/gwf2mnw2i7.f
+++ b/utils/mf5to6/src/MF2005/gwf2mnw2i7.f
@@ -214,7 +214,7 @@ SUBROUTINE GWF2MNW2I7OT(nstp,kkstp,kkper,IGRID)
USE GWFMNW2IMODULE, ONLY:Wel1flag,QSUMflag,BYNDflag,MNWOBS,
1 MNWILST,MNWIID
use GwfMnwSubs, only: GWF2MNW27BH
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
ALLOCATABLE QBH(:)
INTEGER firstnode,lastnode,QNDflag,QBHflag,QCONCflag,
& iaux,naux
diff --git a/utils/mf5to6/src/MF2005/obs2bas7.f b/utils/mf5to6/src/MF2005/obs2bas7.f
index 170ed0865f4..3d05a997c8d 100644
--- a/utils/mf5to6/src/MF2005/obs2bas7.f
+++ b/utils/mf5to6/src/MF2005/obs2bas7.f
@@ -70,7 +70,7 @@ SUBROUTINE OBS2BAS7AR(IUHDOB,IGRID,needPreproc)
USE GLOBAL, ONLY: NCOL,NROW,NLAY,DELR,DELC,
1 NPER,NSTP,PERLEN,TSMULT,ISSFLG,IOUT,ITRSS
USE OBSBASMODULE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use utl7module, only: URDCOM, URWORD
C
logical, intent(inout) :: needPreproc
@@ -568,7 +568,7 @@ END SUBROUTINE SOBS2BAS7HBF
SUBROUTINE UOBSTI(ID,IOUT,ISSFLG,ITRSS,NPER,NSTP,IREFSP,NUMTS,
& PERLEN,TOFF1,TOFFSET,TOMULT,TSMULT,ITR1ST,
& OBSTIME)
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
C ******************************************************************
C ASSIGN OBSERVATION TIME STEP (NUMTS) AND TOFF GIVEN REFERENCE
C STRESS PERIOD (IREFSP), OBSERVATION-TIME OFFSET (TOFFSET), AND
diff --git a/utils/mf5to6/src/MF2005/obs2chd7.f b/utils/mf5to6/src/MF2005/obs2chd7.f
index 975a1fb5b54..41c19d84f77 100644
--- a/utils/mf5to6/src/MF2005/obs2chd7.f
+++ b/utils/mf5to6/src/MF2005/obs2chd7.f
@@ -34,7 +34,7 @@ SUBROUTINE OBS2CHD7AR(IUCHOB,IGRID)
USE GLOBAL, ONLY: NCOL,NROW,NLAY,NPER,NSTP,PERLEN,TSMULT,ISSFLG,
1 IOUT,ITRSS
USE OBSCHDMODULE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use utl7module, only: URDCOM, URWORD
C
CHARACTER*200 LINE
diff --git a/utils/mf5to6/src/MF2005/obs2drn7.f b/utils/mf5to6/src/MF2005/obs2drn7.f
index 1510006c88f..986b92ba99d 100644
--- a/utils/mf5to6/src/MF2005/obs2drn7.f
+++ b/utils/mf5to6/src/MF2005/obs2drn7.f
@@ -44,7 +44,7 @@ SUBROUTINE OBS2DRN7AR(IUDROB,IUDRN,IGRID)
USE GLOBAL, ONLY:IOUT,NPER,NSTP,PERLEN,TSMULT,ISSFLG,
1 NCOL,NROW,NLAY,ITRSS
USE OBSDRNMODULE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use utl7module, only: URDCOM, URWORD
CHARACTER*200 LINE
double precision :: dum
diff --git a/utils/mf5to6/src/MF2005/obs2ghb7.f b/utils/mf5to6/src/MF2005/obs2ghb7.f
index 4bde8135cca..61011666838 100644
--- a/utils/mf5to6/src/MF2005/obs2ghb7.f
+++ b/utils/mf5to6/src/MF2005/obs2ghb7.f
@@ -44,7 +44,7 @@ SUBROUTINE OBS2GHB7AR(IUGBOB,IUGB,IGRID)
USE GLOBAL, ONLY:IOUT,NPER,NSTP,PERLEN,TSMULT,ISSFLG,
1 NCOL,NROW,NLAY,ITRSS
USE OBSGHBMODULE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use utl7module, only: URDCOM, URWORD
CHARACTER*200 LINE
double precision :: dum
diff --git a/utils/mf5to6/src/MF2005/obs2riv7.f b/utils/mf5to6/src/MF2005/obs2riv7.f
index 2625f83c49b..65cd70775d7 100644
--- a/utils/mf5to6/src/MF2005/obs2riv7.f
+++ b/utils/mf5to6/src/MF2005/obs2riv7.f
@@ -44,7 +44,7 @@ SUBROUTINE OBS2RIV7AR(IURVOB,IURV,IGRID)
USE GLOBAL, ONLY:IOUT,NPER,NSTP,PERLEN,TSMULT,ISSFLG,
1 NCOL,NROW,NLAY,ITRSS
USE OBSRIVMODULE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use utl7module, only: URDCOM, URWORD
CHARACTER*200 LINE
double precision :: dum
diff --git a/utils/mf5to6/src/MF2005/parutl7.f b/utils/mf5to6/src/MF2005/parutl7.f
index b1338015e01..d4f6fca1ce0 100644
--- a/utils/mf5to6/src/MF2005/parutl7.f
+++ b/utils/mf5to6/src/MF2005/parutl7.f
@@ -44,7 +44,7 @@ SUBROUTINE UPARARRRP(IN,IOUT,NP,ILFLG,PTYP,ITERP,ITVP,IACT)
C ------------------------------------------------------------------
USE PARAMMODULE
use utl7module
- use SimModule
+ use SimPHMFModule
CHARACTER*(*) PTYP
CHARACTER*200 LINE
CHARACTER*10 PN,CTMP1,CTMP2
@@ -282,7 +282,7 @@ SUBROUTINE UPARARRSUB1(ZZ,NCOL,NROW,ILAY,PTYP,IOUT,ANAME,IPF)
C ------------------------------------------------------------------
USE PARAMMODULE
use utl7module
- use SimModule
+ use SimPHMFModule
DIMENSION ZZ(NCOL,NROW)
CHARACTER*(*) PTYP
CHARACTER*24 ANAME
@@ -331,7 +331,7 @@ SUBROUTINE UPARARRSUB2(ZZ,NCOL,NROW,ILAY,NP,IN,IOUT,PTYP,ANAME,
C ------------------------------------------------------------------
USE PARAMMODULE
use utl7module
- use SimModule
+ use SimPHMFModule
double precision :: ZZ(NCOL,NROW)
CHARACTER*(*) PTYP,PACK
CHARACTER*24 ANAME
@@ -540,7 +540,7 @@ SUBROUTINE UPARLSTAL(IN,IOUT,LINE,NP,MXL)
C ------------------------------------------------------------------
USE PARAMMODULE
use utl7module
- use SimModule
+ use SimPHMFModule
CHARACTER*(*) LINE
double precision :: r
C ------------------------------------------------------------------
@@ -579,7 +579,7 @@ SUBROUTINE UPARLSTRP(LSTSUM,MXLST,IN,IOUT,NP,PACK,PTYPX,ITERP,
C ------------------------------------------------------------------
USE PARAMMODULE
use utl7module
- use SimModule
+ use SimPHMFModule
logical :: storepar
CHARACTER*(*) PACK,PTYPX
CHARACTER*4 PTYP
@@ -749,7 +749,7 @@ SUBROUTINE UINSRP(I,IN,IOUT,IP,ITERP)
C ------------------------------------------------------------------
USE PARAMMODULE
use utl7module
- use SimModule
+ use SimPHMFModule
CHARACTER*10 CTMP1,CTMP2
CHARACTER*200 LINE
double precision :: r
@@ -804,7 +804,7 @@ SUBROUTINE UPARLSTSUB(IN,PACK,IOUTU,PTYP,RLIST,LSTVL,LSTDIM,NREAD,
C ------------------------------------------------------------------
USE PARAMMODULE
use utl7module
- use SimModule
+ use SimPHMFModule
CHARACTER*(*) PACK,PTYP
double precision :: RLIST(LSTVL,LSTDIM)
CHARACTER*(*) LABEL
@@ -966,7 +966,7 @@ SUBROUTINE UPARLSTLOC(IN,PACK,IOUT,PTYP,IBEG,IEND,PV)
C ------------------------------------------------------------------
USE PARAMMODULE
use utl7module
- use SimModule
+ use SimPHMFModule
CHARACTER*(*) PACK,PTYP
CHARACTER*200 LINE
CHARACTER*10 CTMP1,CTMP2,CTMP3,CTMP4
@@ -1075,7 +1075,7 @@ SUBROUTINE UPARARRCK(BUFF,IBOUND,IOUT,LAY,NCOL,NLAY,NROW,PTYP)
C ------------------------------------------------------------------
USE PARAMMODULE
use utl7module
- use SimModule
+ use SimPHMFModule
INTEGER IBOUND(NCOL,NROW,NLAY)
double precision :: BUFF(NCOL,NROW)
CHARACTER*4 PTYP
@@ -1167,7 +1167,7 @@ SUBROUTINE UPARFIND(PNAME,PTYP,CPACK,IFOUND,IOUT)
C ------------------------------------------------------------------
USE PARAMMODULE
use utl7module
- use SimModule
+ use SimPHMFModule
CHARACTER*(*) PNAME,PTYP,CPACK
CHARACTER*10 CTMP1,CTMP2
C ------------------------------------------------------------------
diff --git a/utils/mf5to6/src/MF2005/precutls.f90 b/utils/mf5to6/src/MF2005/precutls.f90
index 19880fccba2..0b12fa1895c 100644
--- a/utils/mf5to6/src/MF2005/precutls.f90
+++ b/utils/mf5to6/src/MF2005/precutls.f90
@@ -6,7 +6,7 @@
MODULE PRECUTLSMOD
use InputOutputModule, only: same_word
- use SimModule, only: store_error, store_note, store_warning, ustop
+ use SimPHMFModule, only: store_error, store_note, store_warning, ustop
use UtilitiesModule, only: findcell
PRIVATE
diff --git a/utils/mf5to6/src/MF2005/utl7.f b/utils/mf5to6/src/MF2005/utl7.f
index 79f7acc72f0..b03a49732be 100644
--- a/utils/mf5to6/src/MF2005/utl7.f
+++ b/utils/mf5to6/src/MF2005/utl7.f
@@ -9,7 +9,7 @@ module utl7module
use OpenSpecModule, only: ACCESS, ACTION, FORM
use PRECUTLSMOD, only: GET_BINARY_HEAD_DATASET, HEADPRECISION,
& GET_BINARY_FILE_LENGTH
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
private
public :: URWORD, UPCASE, U1DREL, U2DINT, U2DREL, USTOPx
diff --git a/utils/mf5to6/src/MawPackageWriter.f90 b/utils/mf5to6/src/MawPackageWriter.f90
index dc782ce1a05..6a363727db1 100644
--- a/utils/mf5to6/src/MawPackageWriter.f90
+++ b/utils/mf5to6/src/MawPackageWriter.f90
@@ -11,7 +11,7 @@ module MawPackageWriterModule
use GwfMnwSubs, only: GWF2MNW27AR, GWF2MNW27RP
use LineListModule, only: same_lines, LineListType
use PackageWriterModule, only: PackageWriterType
- use SimModule, only: count_errors, store_error, store_warning, ustop
+ use SimPHMFModule, only: count_errors, store_error, store_warning, ustop
use utl7module, only: U1DREL, U2DREL, &
urword, URDCOM, &
ULSTRD
diff --git a/utils/mf5to6/src/Model.f90 b/utils/mf5to6/src/Model.f90
index 7b04b80d83f..8634461bcda 100644
--- a/utils/mf5to6/src/Model.f90
+++ b/utils/mf5to6/src/Model.f90
@@ -51,7 +51,7 @@ module ModelModule
use RivPackageWriterModule, only: RivPackageWriterType
use SfrPackageWriterModule, only: SfrPackageWriterType, &
AddSfrPackageWriter
- use SimModule, only: store_error, store_note, ustop
+ use SimPHMFModule, only: store_error, store_note, ustop
use ImsPackageWriterModule, only: ImsPackageWriterType
use StoWriterModule, only: StoWriterType
use TdisVariablesModule, only: GlobalTdisWriter
diff --git a/utils/mf5to6/src/ModelConverter.f90 b/utils/mf5to6/src/ModelConverter.f90
index bea004b0de6..6270eaf317c 100644
--- a/utils/mf5to6/src/ModelConverter.f90
+++ b/utils/mf5to6/src/ModelConverter.f90
@@ -34,7 +34,7 @@ module ModelConverterModule
use RivObsWriterModule, only: createRivObsWriter, RivObsWriterType
use GhbObsWriterModule, only: createGhbObsWriter, GhbObsWriterType
use GlobalVariablesModule, only: echo
- use SimModule, only: store_error, store_note, store_warning, ustop
+ use SimPHMFModule, only: store_error, store_note, store_warning, ustop
use SimListVariablesModule, only: SimMovers
use UpwSubsModule, only: GWF2UPW1AR
use UtilitiesModule, only: GetArgs
diff --git a/utils/mf5to6/src/Mover.f90 b/utils/mf5to6/src/Mover.f90
index 2cd53f28fed..a019f4f005b 100644
--- a/utils/mf5to6/src/Mover.f90
+++ b/utils/mf5to6/src/Mover.f90
@@ -3,7 +3,7 @@ module MoverModule
use ConstantsModule, only: DONE, DZERO, LENMODELNAME, LENPACKAGENAME, &
MAXCHARLEN
use ListModule, only: ListType
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
use utl7module, only: UPCASE
private
diff --git a/utils/mf5to6/src/MultiLayerObsModule.f90 b/utils/mf5to6/src/MultiLayerObsModule.f90
index e2c87430a8e..4e19f87b751 100644
--- a/utils/mf5to6/src/MultiLayerObsModule.f90
+++ b/utils/mf5to6/src/MultiLayerObsModule.f90
@@ -4,7 +4,7 @@ module MultiLayerObs
use ConstantsPHMFModule, only: LENOBSNAMENEW
use MathUtilModule, only: is_close
use ListModule, only: ListType
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
implicit none
private
diff --git a/utils/mf5to6/src/NWT/GwfHfbSubs_NWT.f90 b/utils/mf5to6/src/NWT/GwfHfbSubs_NWT.f90
index 343328b38e3..cad85b1bea3 100644
--- a/utils/mf5to6/src/NWT/GwfHfbSubs_NWT.f90
+++ b/utils/mf5to6/src/NWT/GwfHfbSubs_NWT.f90
@@ -1,6 +1,6 @@
module HfBSubsNwt
use OpenSpecModule, only: ACCESS, ACTION, FORM
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use utl7module, only: URDCOM, URWORD, UPCASE
private
public :: GWF2HFB7AR, GWF2HFB7UPW, SGWF2HFB7PNT, SGWF2HFB7PSV
diff --git a/utils/mf5to6/src/NWT/GwfUpwSubs.f90 b/utils/mf5to6/src/NWT/GwfUpwSubs.f90
index 809bddd41f8..a9de1a49260 100644
--- a/utils/mf5to6/src/NWT/GwfUpwSubs.f90
+++ b/utils/mf5to6/src/NWT/GwfUpwSubs.f90
@@ -1,7 +1,7 @@
module UpwSubsModule
use ConstantsPHMFModule, only: HDRYDEFAULT
use ModelModule, only: ModelType
- use SimModule, only: store_error, store_note, store_warning
+ use SimPHMFModule, only: store_error, store_note, store_warning
private
public :: GWF2UPW1AR
@@ -16,7 +16,7 @@ SUBROUTINE GWF2UPW1AR(In, model)
USE GWFBASMODULE,ONLY:HDRY
USE GWFNWTMODULE, ONLY: Numcell
USE GWFUPWMODULE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use utl7module, only: URDCOM, URWORD, U2DREL
IMPLICIT NONE
! ------------------------------------------------------------------
@@ -823,7 +823,7 @@ SUBROUTINE SGWF2UPWCK(IOUT,NP,PTYP)
!C ------------------------------------------------------------------
USE GWFUPWMODULE, ONLY:CHANI,LAYVKAUPW
USE PARAMMODULE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
!C
CHARACTER*4 PTYP
!C ------------------------------------------------------------------
@@ -1382,7 +1382,7 @@ SUBROUTINE SGWF2UPW1VCOND(K)
USE GLOBAL, ONLY:NCOL,NROW,NLAY,IBOUND,HNEW,DELR,DELC, &
BOTM,LBOTM,LAYCBD,IOUT,STRT,CV
USE GWFUPWMODULE
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
!C
DOUBLE PRECISION BBOT,TTOP,HHD
!C ------------------------------------------------------------------
diff --git a/utils/mf5to6/src/NWT/GwfUzfSubs_NWT.f b/utils/mf5to6/src/NWT/GwfUzfSubs_NWT.f
index a8f7776c302..de2311b5746 100644
--- a/utils/mf5to6/src/NWT/GwfUzfSubs_NWT.f
+++ b/utils/mf5to6/src/NWT/GwfUzfSubs_NWT.f
@@ -2,7 +2,7 @@ module GwfUzfSubs
use InputOutputModule, only: URWORD
use ArrayReadersMF5Module, only: ReadArray
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use utl7module, only: URDCOM !, UBUDSV, UBDSVB, UBDSV3
contains
diff --git a/utils/mf5to6/src/NWT/NWT1_solver.f b/utils/mf5to6/src/NWT/NWT1_solver.f
index 9403860ffa5..804607c2548 100644
--- a/utils/mf5to6/src/NWT/NWT1_solver.f
+++ b/utils/mf5to6/src/NWT/NWT1_solver.f
@@ -12,7 +12,7 @@ SUBROUTINE GWF2NWT1AR(In, Mxiter, Iunitlak, Igrid, ibotavg)
USE GWFBASMODULE,ONLY:HDRY
USE GWFNWTMODULE
use utl7module, only: urdcom, urword
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
IMPLICIT NONE
! ------------------------------------------------------------------
! SPECIFICATIONS:
@@ -891,7 +891,7 @@ module unusedcode
*! USE SAMGMODULE
* USE ilupc_mod
* USE machine_constants
-* use SimModule, only: ustop
+* use SimPHMFModule, only: ustop
* IMPLICIT NONE
*! ------------------------------------------------------------------
*! SPECIFICATIONS:
diff --git a/utils/mf5to6/src/NWT/gwf2wel7_NWT.f b/utils/mf5to6/src/NWT/gwf2wel7_NWT.f
index 688a4dcc1d2..c2a2c2c9af8 100644
--- a/utils/mf5to6/src/NWT/gwf2wel7_NWT.f
+++ b/utils/mf5to6/src/NWT/gwf2wel7_NWT.f
@@ -155,7 +155,7 @@ SUBROUTINE GWF2WEL7RP(IN,IGRID)
USE GLOBAL, ONLY:IOUT,NCOL,NROW,NLAY,IFREFM
USE GWFWELMODULE, ONLY:NWELLS,MXWELL,NWELVL,IPRWEL,NPWEL,
1 IWELPB,NNPWEL,WELAUX,WELL
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use utl7module, only: ULSTRD
C
CHARACTER*6 CWELL
diff --git a/utils/mf5to6/src/NpfWriter.f90 b/utils/mf5to6/src/NpfWriter.f90
index 2c7854ba6e4..e33faedf0d0 100644
--- a/utils/mf5to6/src/NpfWriter.f90
+++ b/utils/mf5to6/src/NpfWriter.f90
@@ -13,8 +13,8 @@ module NpfWriterModule
use GWFUPWMODULE, only: LaytypUpw, LaywetUpw => LAYWET, VkcbUpw => VKCB, &
WetdryUpw => WETDRY, HaniUpw => HANI
use InputOutputModule, only: GetUnit, openfile
- use SimModule, only: count_errors, store_error, store_note, store_warning, &
- ustop
+ use SimPHMFModule, only: count_errors, store_error, store_note, &
+ store_warning, ustop
use UtilitiesModule, only: Write2dValues
type, extends(FileWriterType) :: NpfWriterType
diff --git a/utils/mf5to6/src/ObsWriter.f90 b/utils/mf5to6/src/ObsWriter.f90
index 4b4cb90c8a9..84971b3a24a 100644
--- a/utils/mf5to6/src/ObsWriter.f90
+++ b/utils/mf5to6/src/ObsWriter.f90
@@ -31,7 +31,7 @@ module ObsWriterModule
use OBSRIVMODULE, only: NQRV, NQCRV, NQTRV, NQOBRV, NQCLRV, &
otimerv=>OTIME, qcellrv=>QCELL, IURVOBSV
use PreprocModule, only: PreprocType
- use SimModule, only: store_error, store_note, store_warning, ustop
+ use SimPHMFModule, only: store_error, store_note, store_warning, ustop
use StressPeriodModule, only: StressPeriodType
use UtilitiesModule, only: get_extension
use utl7module, only: assign_ncharsizes_flow, build_obsname
diff --git a/utils/mf5to6/src/OutputControlWriter.f90 b/utils/mf5to6/src/OutputControlWriter.f90
index 03fee6d21e5..704c3ab9585 100644
--- a/utils/mf5to6/src/OutputControlWriter.f90
+++ b/utils/mf5to6/src/OutputControlWriter.f90
@@ -9,7 +9,7 @@ module OutputControlWriterModule
use GwfBasOcSubsModule, only: GWF2BAS7OC
use LineListModule, only: LineListType
use PackageWriterModule, only: PackageWriterType
- use SimModule, only: store_error, store_note, ustop
+ use SimPHMFModule, only: store_error, store_note, ustop
integer, parameter :: UNASSIGNED = -99
integer, parameter :: BUDGET = 1
diff --git a/utils/mf5to6/src/PackageWriter.f90 b/utils/mf5to6/src/PackageWriter.f90
index 2a89be96dcb..611481752b5 100644
--- a/utils/mf5to6/src/PackageWriter.f90
+++ b/utils/mf5to6/src/PackageWriter.f90
@@ -13,7 +13,7 @@ module PackageWriterModule
use ModelPackageModule, only: ModelPackageType, ConstructModelPackageType
use MoverModule, only: MoverType, AddMoverToList
use ObsWriterModule, only: ObsWriterType
- use SimModule, only: store_error, store_note, ustop
+ use SimPHMFModule, only: store_error, store_note, ustop
use SimListVariablesModule, only: SimMovers
use UtilitiesModule, only: ConstantReal2D
diff --git a/utils/mf5to6/src/Preproc/ArrayHandlers.f90 b/utils/mf5to6/src/Preproc/ArrayHandlers.f90
deleted file mode 100644
index d3a3c3d9fe9..00000000000
--- a/utils/mf5to6/src/Preproc/ArrayHandlers.f90
+++ /dev/null
@@ -1,344 +0,0 @@
-module ArrayHandlersModule
-
- use ConstantsModule, only: MAXCHARLEN
- use GLOBAL, only: iout
- private
- public :: ExpandArray, ExtendPtrArray
- public :: ifind
-
- interface ExpandArray
- ! This interface is for use with ALLOCATABLE arrays.
- ! IMPORTANT: Do not use pointers to elements of arrays when using
- ! ExpandArray to increase the array size! The locations of array
- ! elements in memory are changed when ExpandArray is invoked.
- module procedure expand_integer, expand_double, &
- expand_character, expand_real
- end interface ExpandArray
-
- interface ExtendPtrArray
- ! This interface is for use with POINTERS to arrays.
- module procedure extend_double, extend_integer
- end interface
-
- interface ifind
- module procedure ifind_character
- end interface ifind
-
-contains
-
- ! -- Specific procedures that implement ExpandArray for allocatable arrays
-
- subroutine expand_integer(array, increment)
- implicit none
- ! -- dummy arguments
- integer, allocatable, intent(inout) :: array(:)
- integer, optional, intent(in) :: increment
- ! -- local variables
- integer :: inclocal, isize, newsize
- integer, allocatable, dimension(:) :: array_temp
- !
- ! -- initialize
- if (present(increment)) then
- inclocal = increment
- else
- inclocal = 1
- endif
- !
- ! -- increase size of array by inclocal, retaining
- ! contained data
- if (allocated(array)) then
- isize = size(array)
- newsize = isize + inclocal
- allocate(array_temp(newsize))
- array_temp(1:isize) = array
- deallocate(array)
- call move_alloc(array_temp, array)
- else
- allocate(array(inclocal))
- endif
- !
- return
- end subroutine expand_integer
-
- subroutine expand_double(array, increment)
- implicit none
- ! -- dummy arguments
- double precision, allocatable, intent(inout) :: array(:)
- integer, optional, intent(in) :: increment
- ! -- local variables
- integer :: inclocal, isize, newsize
- double precision, allocatable, dimension(:) :: array_temp
- !
- ! -- initialize
- if (present(increment)) then
- inclocal = increment
- else
- inclocal = 1
- endif
- !
- ! -- increase size of array by inclocal, retaining
- ! contained data
- if (allocated(array)) then
- isize = size(array)
- newsize = isize + inclocal
- allocate(array_temp(newsize))
- array_temp(1:isize) = array
- deallocate(array)
- call move_alloc(array_temp, array)
- else
- allocate(array(inclocal))
- endif
- !
- return
- end subroutine expand_double
-
- subroutine expand_real(array, increment)
- implicit none
- ! -- dummy arguments
- real, allocatable, intent(inout) :: array(:)
- integer, optional, intent(in) :: increment
- ! -- local variables
- integer :: inclocal, isize, newsize
- real, allocatable, dimension(:) :: array_temp
- !
- ! -- initialize
- if (present(increment)) then
- inclocal = increment
- else
- inclocal = 1
- endif
- !
- ! -- increase size of array by inclocal, retaining
- ! contained data
- if (allocated(array)) then
- isize = size(array)
- newsize = isize + inclocal
- allocate(array_temp(newsize))
- array_temp(1:isize) = array
- deallocate(array)
- call move_alloc(array_temp, array)
- else
- allocate(array(inclocal))
- endif
- !
- return
- end subroutine expand_real
-
- subroutine expand_character(array, increment)
- implicit none
- ! -- dummy arguments
- character(len=*), allocatable, intent(inout) :: array(:)
- integer, optional, intent(in) :: increment
- ! -- local variables
- integer :: i, inclocal, isize, lenc, newsize
- character(len=MAXCHARLEN), allocatable, dimension(:) :: array_temp
- !
- ! -- check character length
- lenc = len(array)
- if (lenc>MAXCHARLEN) then
- ! Can't use store_error or ustop here because SimModule
- ! is dependent on ArrayHandlersModule.
- write(iout,*)'Error in ArrayHandlersModule: Need to increase MAXCHARLEN'
- write(*,*)'Error in ArrayHandlersModule: Need to increase MAXCHARLEN'
- write(iout,*)'Stopping...'
- write(*,*)'Stopping...'
- stop
- endif
- !
- ! -- initialize
- if (present(increment)) then
- inclocal = increment
- else
- inclocal = 1
- endif
- !
- ! -- increase size of array by inclocal, retaining
- ! contained data
- ! [Ned TODO: may be able to use mold here, e.g.:
- ! allocate(values(num), mold=proto)]
- if (allocated(array)) then
- isize = size(array)
- newsize = isize + inclocal
- allocate(array_temp(isize))
- do i=1,isize
- array_temp(i) = array(i)
- enddo
- deallocate(array)
- allocate(array(newsize))
- do i=1,isize
- array(i) = array_temp(i)
- enddo
- do i=isize+1,newsize
- array(i) = ''
- enddo
- deallocate(array_temp)
- else
- allocate(array(inclocal))
- endif
- !
- return
- end subroutine expand_character
-
- ! -- Specific procedures that implement ExtendPtrArray for pointer arrays
-
- subroutine extend_double(array, increment)
- implicit none
- ! -- dummy arguments
- double precision, pointer, dimension(:), intent(inout) :: array
- integer, optional, intent(in) :: increment
- ! -- local variables
- integer :: i, inclocal, isize, istat, newsize
- double precision, pointer, dimension(:) :: array_temp
- character(len=100) :: ermsg
- !
- ! -- initialize
- if (present(increment)) then
- inclocal = increment
- else
- inclocal = 1
- endif
- !
- ! -- increase size of array by inclocal, retaining
- ! contained data
- if (associated(array)) then
- isize = size(array)
- newsize = isize + inclocal
- allocate(array_temp(newsize), stat=istat, errmsg=ermsg)
- if (istat /= 0) goto 99
- do i=1,isize
- array_temp(i) = array(i)
- enddo
- deallocate(array)
- array => array_temp
- else
- allocate(array(inclocal))
- endif
- !
- return ! normal return
- !
- ! -- Error reporting
- 99 continue
- ! Can't use store_error or ustop here because SimModule
- ! is dependent on ArrayHandlersModule.
- write(iout,*)'Error encountered while trying to increase array size:'
- write(iout,'(a)')trim(ermsg)
- write(iout,*)'Stopping...'
- write(*,*)'Error encountered while trying to increase array size:'
- write(iout,'(a)')trim(ermsg)
- write(*,*)'Stopping...'
- stop
- end subroutine extend_double
-
- subroutine extend_integer(array, increment)
- implicit none
- ! -- dummy arguments
- integer, pointer, dimension(:), intent(inout) :: array
- integer, optional, intent(in) :: increment
- ! -- local variables
- integer :: i, inclocal, isize, istat, newsize
- integer, pointer, dimension(:) :: array_temp
- character(len=100) :: ermsg
- !
- ! -- initialize
- if (present(increment)) then
- inclocal = increment
- else
- inclocal = 1
- endif
- !
- ! -- increase size of array by inclocal, retaining
- ! contained data
- if (associated(array)) then
- isize = size(array)
- newsize = isize + inclocal
- allocate(array_temp(newsize), stat=istat, errmsg=ermsg)
- if (istat /= 0) goto 99
- do i=1,isize
- array_temp(i) = array(i)
- enddo
- deallocate(array)
- array => array_temp
- else
- allocate(array(inclocal))
- endif
- !
- return
- !
- ! -- Error reporting
- 99 continue
- ! Can't use store_error or ustop here because SimModule
- ! is dependent on ArrayHandlersModule.
- write(iout,*)'Error encountered while trying to increase array size:'
- write(iout,'(a)')trim(ermsg)
- write(iout,*)'Stopping...'
- write(*,*)'Error encountered while trying to increase array size:'
- write(iout,'(a)')trim(ermsg)
- write(*,*)'Stopping...'
- stop
- end subroutine extend_integer
-
- integer function ifind_character(array, str)
- ! -- Find the first array element containing str
- ! -- Return -1 if not found.
- implicit none
- character(len=*), dimension(:) :: array
- character(len=*) :: str
- !local
- integer :: i
- ifind_character = -1
- findloop: do i=1,size(array)
- if(array(i) == str) then
- ifind_character = i
- exit findloop
- endif
- enddo findloop
- return
- end function ifind_character
-
- subroutine remove_character(array, ipos)
- !remove the ipos position from array
- implicit none
- ! -- dummy arguments
- character(len=*), allocatable, intent(inout) :: array(:)
- integer, intent(in) :: ipos
- ! -- local variables
- integer :: i, isize, lenc, newsize, inew
- character(len=MAXCHARLEN), allocatable, dimension(:) :: array_temp
- !
- ! -- check character length
- lenc = len(array)
- if (lenc>MAXCHARLEN) then
- ! Can't use store_error or ustop here because SimModule
- ! is dependent on ArrayHandlersModule.
- write(iout,*)'Error in ArrayHandlersModule: Need to increase MAXCHARLEN'
- write(*,*)'Error in ArrayHandlersModule: Need to increase MAXCHARLEN'
- write(iout,*)'Stopping...'
- write(*,*)'Stopping...'
- stop
- endif
- !
- ! -- calculate sizes
- isize = size(array)
- newsize = isize - 1
- !
- ! -- copy array to array_temp
- allocate(array_temp(isize))
- do i = 1, isize
- array_temp(i) = array(i)
- enddo
- !
- deallocate(array)
- allocate(array(newsize))
- inew = 1
- do i = 1, isize
- if(i /= ipos) then
- array(inew) = array_temp(i)
- inew = inew + 1
- endif
- enddo
- deallocate(array_temp)
- !
- return
- end subroutine remove_character
-
-end module ArrayHandlersModule
diff --git a/utils/mf5to6/src/Preproc/Discretization3D.f90 b/utils/mf5to6/src/Preproc/Discretization3D.f90
index 0d373c8ebae..078ef2ea263 100644
--- a/utils/mf5to6/src/Preproc/Discretization3D.f90
+++ b/utils/mf5to6/src/Preproc/Discretization3D.f90
@@ -7,7 +7,7 @@ module DnmDis3dModule
use GlobalVariablesPHMFModule, only: verbose
use GeomUtilModule, only: get_ijk, get_node
use InputOutputModule, only: URWORD
- use SimModule, only: count_errors, store_error, &
+ use SimPHMFModule, only: count_errors, store_error, &
store_error_unit, ustop
implicit none
private
@@ -285,7 +285,7 @@ subroutine read_data(this)
! SPECIFICATIONS:
! ------------------------------------------------------------------------------
! -- modules
- use SimModule, only: ustop, count_errors, store_error
+ use SimPHMFModule, only: ustop, count_errors, store_error
use ConstantsModule, only: LINELENGTH, DZERO
! -- dummy
class(Dis3dType) :: this
diff --git a/utils/mf5to6/src/Preproc/DiscretizationBasePHMF.f90 b/utils/mf5to6/src/Preproc/DiscretizationBasePHMF.f90
index 3158b4a3c7e..ac02ec2771e 100644
--- a/utils/mf5to6/src/Preproc/DiscretizationBasePHMF.f90
+++ b/utils/mf5to6/src/Preproc/DiscretizationBasePHMF.f90
@@ -3,7 +3,7 @@ module DnmDisBaseModule
use BlockParserModule, only: BlockParserType
use ConstantsModule, only: LENMODELNAME, LENMEMPATH, LINELENGTH, DONE, DZERO
use InputOutputModule, only: URWORD
- use SimModule, only: count_errors, store_error, store_error_unit, &
+ use SimPHMFModule, only: count_errors, store_error, store_error_unit, &
ustop
use GeomUtilModule, only: get_node
implicit none
@@ -222,7 +222,7 @@ subroutine read_options(this)
use ConstantsModule, only: LINELENGTH
use InputOutputModule, only: urword
use ArrayReadersMF5Module, only: ReadArray
- use SimModule, only: ustop, count_errors, store_error
+ use SimPHMFModule, only: ustop, count_errors, store_error
implicit none
class(DisBaseType) :: this
character(len=LINELENGTH) :: errmsg, keyword
@@ -293,7 +293,7 @@ subroutine read_dimensions(this)
use MemoryManagerModule, only: mem_allocate
use ConstantsModule, only: LINELENGTH
use InputOutputModule, only: urword
- use SimModule, only: ustop, count_errors, store_error
+ use SimPHMFModule, only: ustop, count_errors, store_error
implicit none
class(DisBaseType) :: this
character(len=LINELENGTH) :: errmsg, keyword
@@ -368,7 +368,7 @@ subroutine read_data(this)
! -- modules
use MemoryManagerModule, only: mem_allocate
use ConstantsModule, only: LINELENGTH, DZERO
- use SimModule, only: ustop, count_errors, store_error
+ use SimPHMFModule, only: ustop, count_errors, store_error
! -- dummy
class(DisBaseType) :: this
! -- local
@@ -471,7 +471,7 @@ function get_nodenumber_idx1(this, nodeu, icheck) result(nodenumber)
! SPECIFICATIONS:
! ------------------------------------------------------------------------------
use ConstantsModule, only: LINELENGTH
- use SimModule, only: store_error
+ use SimPHMFModule, only: store_error
implicit none
class(DisBaseType), intent(in) :: this
integer, intent(in) :: nodeu
@@ -504,7 +504,7 @@ function get_nodenumber_idx2(this, k, j, icheck) result(nodenumber)
!
! SPECIFICATIONS:
! ------------------------------------------------------------------------------
- use SimModule, only: ustop, store_error
+ use SimPHMFModule, only: ustop, store_error
implicit none
! Dummy arguments
class(DisBaseType), intent(in) :: this
@@ -529,7 +529,7 @@ function get_nodenumber_idx3(this, k, i, j, icheck) result(nodenumber)
!
! SPECIFICATIONS:
! ------------------------------------------------------------------------------
- use SimModule, only: ustop, store_error
+ use SimPHMFModule, only: ustop, store_error
implicit none
! Dummy arguments
class(DisBaseType), intent(in) :: this
@@ -556,7 +556,7 @@ subroutine connection_normal(this, noden, nodem, ihc, xcomp, ycomp, zcomp)
! SPECIFICATIONS:
! ------------------------------------------------------------------------------
! -- modules
- use SimModule, only: ustop, store_error
+ use SimPHMFModule, only: ustop, store_error
! -- dummy
class(DisBaseType) :: this
integer, intent(in) :: noden
@@ -587,7 +587,7 @@ subroutine connection_vector(this, noden, nodem, nozee, satn, satm, ihc, &
! SPECIFICATIONS:
! ------------------------------------------------------------------------------
! -- modules
- use SimModule, only: ustop, store_error
+ use SimPHMFModule, only: ustop, store_error
! -- dummy
class(DisBaseType) :: this
integer, intent(in) :: noden
diff --git a/utils/mf5to6/src/Preproc/FileList.f90 b/utils/mf5to6/src/Preproc/FileList.f90
index 9a944a921cf..dbc21a172ad 100644
--- a/utils/mf5to6/src/Preproc/FileList.f90
+++ b/utils/mf5to6/src/Preproc/FileList.f90
@@ -7,7 +7,7 @@ module FileListModule
use InputOutputModule, only: same_word
use ListModule, only: ListType
use ListNodeModule, only: ListNodeType
- use SimModule, only: store_warning, store_error, ustop
+ use SimPHMFModule, only: store_warning, store_error, ustop
use UtilitiesModule, only: close_file
private
diff --git a/utils/mf5to6/src/Preproc/ObsBlock.f90 b/utils/mf5to6/src/Preproc/ObsBlock.f90
index c4e51a3562e..39e6b64c984 100644
--- a/utils/mf5to6/src/Preproc/ObsBlock.f90
+++ b/utils/mf5to6/src/Preproc/ObsBlock.f90
@@ -3,7 +3,7 @@ module ObsBlockModule
use BlockParserModule, only: BlockParserType
use ConstantsModule, only: DONE, DZERO, &
LINELENGTH, MAXCHARLEN, LENOBSNAME
- use MathUtilModule, only: is_close
+ use MathUtilModule, only: is_close
use ConstantsPHMFModule, only: CONTINUOUS, SINGLE, LENOBSNAMENEW
use DnmDis3dModule, only: Dis3dType
use GlobalVariablesPHMFModule, only: verbose
@@ -11,7 +11,7 @@ module ObsBlockModule
use ListModule, only: ListType
use ObserveModule, only: ObserveType, AddObserveToList, &
GetObserveFromList, ConstructObservation
- use SimModule, only: store_error, store_error_unit, ustop
+ use SimPHMFModule, only: store_error, store_error_unit, ustop
use UtilitiesModule, only: CalcContribFactors
implicit none
diff --git a/utils/mf5to6/src/Preproc/ObservePHMF.f90 b/utils/mf5to6/src/Preproc/ObservePHMF.f90
index c50c7ad5f8d..49e190c5328 100644
--- a/utils/mf5to6/src/Preproc/ObservePHMF.f90
+++ b/utils/mf5to6/src/Preproc/ObservePHMF.f90
@@ -17,7 +17,7 @@ module ObserveModule
use ConstantsPHMFModule, only: LENOBSNAMENEW, HUGEDBL, HDRYDEFAULT
use MathUtilModule, only: is_close
use ListModule, only: ListType
- use SimModule, only: store_warning, store_error, &
+ use SimPHMFModule, only: store_warning, store_error, &
store_error_unit, ustop
implicit none
@@ -263,7 +263,7 @@ subroutine ConstructObservationFromLine(newObservation, isorc, defLine, &
! SPECIFICATIONS:
! --------------------------------------------------------------------------
use InputOutputModule, only: urword
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
implicit none
! -- dummy variables
type(ObserveType), pointer :: newObservation
@@ -329,7 +329,7 @@ subroutine ConstructObservationSimple(newObservation, isorc, &
! SPECIFICATIONS:
! --------------------------------------------------------------------------
use InputOutputModule, only: urword
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
implicit none
! -- dummy variables
type(ObserveType), pointer :: newObservation
diff --git a/utils/mf5to6/src/Preproc/Preproc.f90 b/utils/mf5to6/src/Preproc/Preproc.f90
index d840b84beb6..82d3e550356 100644
--- a/utils/mf5to6/src/Preproc/Preproc.f90
+++ b/utils/mf5to6/src/Preproc/Preproc.f90
@@ -19,7 +19,7 @@ module PreprocModule
use ObsBlockModule, only: ObsBlockType, ConstructObsBlockType, &
AddObsBlockToList, GetObsBlockFromList
use OpenSpecModule, only: ACCESS, ACTION, FORM
- use SimModule, only: count_errors, print_notes, store_error, &
+ use SimPHMFModule, only: count_errors, print_notes, store_error, &
store_error_unit, ustop
use UtilitiesModule, only: get_extension, CalcContribFactors
diff --git a/utils/mf5to6/src/Preproc/SimPHMF.f90 b/utils/mf5to6/src/Preproc/SimPHMF.f90
index 483f6d87578..d1a7ca86a3d 100644
--- a/utils/mf5to6/src/Preproc/SimPHMF.f90
+++ b/utils/mf5to6/src/Preproc/SimPHMF.f90
@@ -1,4 +1,4 @@
-module SimModule
+module SimPHMFModule
use ArrayHandlersModule, only: ExpandArray
use ConstantsModule, only: MAXCHARLEN,LINELENGTH
use global, only: iout
@@ -648,4 +648,4 @@ subroutine ustop(stopmess,ioutlocal)
stop
end subroutine ustop
-end module SimModule
+end module SimPHMFModule
diff --git a/utils/mf5to6/src/Preproc/SimVariablesPHMF.f90 b/utils/mf5to6/src/Preproc/SimVariablesPHMF.f90
index 1e450bbb79c..77180cf1933 100644
--- a/utils/mf5to6/src/Preproc/SimVariablesPHMF.f90
+++ b/utils/mf5to6/src/Preproc/SimVariablesPHMF.f90
@@ -1,6 +1,6 @@
module SimVariablesPHMFModule
use ConstantsModule, only: MAXCHARLEN
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
implicit none
private
diff --git a/utils/mf5to6/src/Preproc/Utilities.f90 b/utils/mf5to6/src/Preproc/Utilities.f90
index 13e7ec9c3f4..2084fa9f087 100644
--- a/utils/mf5to6/src/Preproc/Utilities.f90
+++ b/utils/mf5to6/src/Preproc/Utilities.f90
@@ -4,7 +4,7 @@ module UtilitiesModule
use GlobalVariablesModule, only: optfile, PathToPostObsMf, ScriptType, &
verbose, echo
use InputOutputModule, only: GetUnit, openfile, UPCASE, URWORD
- use SimModule, onlY: store_error, store_note, store_warning, ustop
+ use SimPHMFModule, only: store_error, store_note, store_warning, ustop
private
public :: GetArgs, Write1Drel, Write2Drel, Write3Drel, &
diff --git a/utils/mf5to6/src/RchPackageWriter.f90 b/utils/mf5to6/src/RchPackageWriter.f90
index 71a22a23433..eb68d056b93 100644
--- a/utils/mf5to6/src/RchPackageWriter.f90
+++ b/utils/mf5to6/src/RchPackageWriter.f90
@@ -8,7 +8,7 @@ module RchPackageWriterModule
use GwfRchSubs, only: GWF2RCH7AR, GWF2RCH7RP
use LineListModule, only: LineListType, same_lines
use PackageWriterModule, only: PackageWriterType
- use SimModule, only: ustop, store_error, store_warning
+ use SimPHMFModule, only: ustop, store_error, store_warning
use UtilitiesModule, only: Write1Drel, Write2Drel, Write3Drel, &
ConstantInt2D, ConstantReal2D, &
BuildArrayFormat
diff --git a/utils/mf5to6/src/RivPackageWriter.f90 b/utils/mf5to6/src/RivPackageWriter.f90
index 158a0b79c4a..0499e5b55e5 100644
--- a/utils/mf5to6/src/RivPackageWriter.f90
+++ b/utils/mf5to6/src/RivPackageWriter.f90
@@ -8,7 +8,7 @@ module RivPackageWriterModule
use GwfRivSubs, only: GWF2RIV7AR, GWF2RIV7RP
use LineListModule, only: same_lines
use PackageWriterModule, only: PackageWriterType
- use SimModule, only: ustop, store_error, store_warning
+ use SimPHMFModule, only: ustop, store_error, store_warning
use utl7module, only: U1DREL, U2DREL, &
urword, URDCOM, &
ULSTRD
diff --git a/utils/mf5to6/src/SfrPackageWriter.f90 b/utils/mf5to6/src/SfrPackageWriter.f90
index fdcf755cdde..03e4a451800 100644
--- a/utils/mf5to6/src/SfrPackageWriter.f90
+++ b/utils/mf5to6/src/SfrPackageWriter.f90
@@ -22,8 +22,8 @@ module SfrPackageWriterModule
use SfrReachModule, only: SfrReachType, AddReachToList, GetReachFromList
use SfrSegmentModule, only: SfrSegmentType, AddSegmentToList, &
GetSegmentFromList
- use SimModule, only: ustop, store_error, store_note, store_warning, &
- count_errors
+ use SimPHMFModule, only: ustop, store_error, store_note, store_warning, &
+ count_errors
use UtilitiesModule, only: RemoveElement
use utl7module, only: U1DREL, U2DREL, urword, URDCOM, ULSTRD
diff --git a/utils/mf5to6/src/StoWriter.f90 b/utils/mf5to6/src/StoWriter.f90
index bad97ffef2d..d885d5256f9 100644
--- a/utils/mf5to6/src/StoWriter.f90
+++ b/utils/mf5to6/src/StoWriter.f90
@@ -5,7 +5,7 @@ module StoWriterModule
use FileWriterModule, only: FileWriterType
use GLOBAL, only: ncol, nrow, nlay, nper, LAYCBD, LENUNI
use GlobalVariablesModule, only: echo
- use SimModule, only: count_errors, store_error, store_note, ustop
+ use SimPHMFModule, only: count_errors, store_error, store_note, ustop
use UtilitiesModule, only: Write2Drel
type, extends(FileWriterType) :: StoWriterType
diff --git a/utils/mf5to6/src/TdisWriter.f90 b/utils/mf5to6/src/TdisWriter.f90
index bffde367457..1d1dd4d9d06 100644
--- a/utils/mf5to6/src/TdisWriter.f90
+++ b/utils/mf5to6/src/TdisWriter.f90
@@ -2,7 +2,7 @@ module TdisWriterModule
use ConstantsModule, only: DZERO
use FileWriterModule, only: FileWriterType
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
use StressPeriodModule, only: StressPeriodType
implicit none
diff --git a/utils/mf5to6/src/UzfPackageWriter.f90 b/utils/mf5to6/src/UzfPackageWriter.f90
index 9af8443f883..b7dba5c377a 100644
--- a/utils/mf5to6/src/UzfPackageWriter.f90
+++ b/utils/mf5to6/src/UzfPackageWriter.f90
@@ -24,7 +24,7 @@ module UzfPackageWriterModule
GetSfrPackageWriterByIgrid
use SfrReachModule, only: SfrReachType
use SfrSegmentModule, only: SfrSegmentType
- use SimModule, only: store_error, ustop
+ use SimPHMFModule, only: store_error, ustop
implicit none
diff --git a/utils/mf5to6/src/WelPackageWriter.f90 b/utils/mf5to6/src/WelPackageWriter.f90
index 934a4e722b1..15a8169c620 100644
--- a/utils/mf5to6/src/WelPackageWriter.f90
+++ b/utils/mf5to6/src/WelPackageWriter.f90
@@ -9,7 +9,7 @@ module WelPackageWriterModule
use GwfWelNwt, only: GWF2WEL7AR, GWF2WEL7RP
use LineListModule, only: same_lines
use PackageWriterModule, only: PackageWriterType
- use SimModule, only: ustop, store_error, store_warning
+ use SimPHMFModule, only: ustop, store_error, store_warning
use utl7module, only: U1DREL, U2DREL, &
urword, URDCOM, &
ULSTRD
diff --git a/utils/mf5to6/src/mf5to6.f90 b/utils/mf5to6/src/mf5to6.f90
index ecf2131c8de..e4ebb63c3a0 100644
--- a/utils/mf5to6/src/mf5to6.f90
+++ b/utils/mf5to6/src/mf5to6.f90
@@ -17,7 +17,7 @@ program mf5to6
GetSfrPackageWriter, &
AllSfrPkgWriters
use SimFileWriterModule, only: SimFileWriterType
- use SimModule, only: ustop
+ use SimPHMFModule, only: ustop
use SimListVariablesModule, only: SimMovers
use UtilitiesModule, only: GetArgs, PhmfOption
!