fix(mf5to6): fix SimModule name clash (MODFLOW-USGS#2047)

Modification based on conda-forge/modflow6-feedstock#35 (comment)
wpbonelli · Dec 17, 2024 · 8d5b621 · 8d5b621
1 parent 92df2c4
commit 8d5b621
Show file tree

Hide file tree

Showing 77 changed files with 151 additions and 498 deletions.
diff --git 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
@@ -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
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{EE5F8367-9220-45ED-9B0B-5942AF51229C}">
 	<Platforms>
-		<Platform Name="Win32"/>
-	</Platforms>
+		<Platform Name="Win32"/></Platforms>
 	<Configurations>
 		<Configuration Name="Debug|Win32" TargetName="$(ProjectName)d">
-			<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" HeapArrays="0" WarnUnusedVariables="true" WarnUncalled="true" WarnInterfaces="true" Traceback="true" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
-			<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole"/>
-			<Tool Name="VFResourceCompilerTool"/>
-			<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
-			<Tool Name="VFCustomBuildTool"/>
-			<Tool Name="VFPreLinkEventTool"/>
-			<Tool Name="VFPreBuildEventTool"/>
-			<Tool Name="VFPostBuildEventTool" CommandLine="copy $(OutDir)\$(TargetName)$(TargetExt) ..\..\..\bin"/>
-			<Tool Name="VFManifestTool" SuppressStartupBanner="true"/>
-		</Configuration>
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" HeapArrays="0" WarnUnusedVariables="true" WarnUncalled="true" WarnInterfaces="true" Traceback="true" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy $(OutDir)\$(TargetName)$(TargetExt) ..\..\..\bin"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
 		<Configuration Name="Release|Win32">
-			<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" HeapArrays="0" RuntimeLibrary="rtMultiThreadedDebug"/>
-			<Tool Name="VFLinkerTool" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole"/>
-			<Tool Name="VFResourceCompilerTool"/>
-			<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
-			<Tool Name="VFCustomBuildTool"/>
-			<Tool Name="VFPreLinkEventTool"/>
-			<Tool Name="VFPreBuildEventTool"/>
-			<Tool Name="VFPostBuildEventTool" CommandLine="copy $(OutDir)\$(TargetName)$(TargetExt) ..\..\..\bin"/>
-			<Tool Name="VFManifestTool" SuppressStartupBanner="true"/>
-		</Configuration>
-	</Configurations>
+				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" HeapArrays="0" RuntimeLibrary="rtMultiThreadedDebug"/>
+				<Tool Name="VFLinkerTool" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole"/>
+				<Tool Name="VFResourceCompilerTool"/>
+				<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
+				<Tool Name="VFCustomBuildTool"/>
+				<Tool Name="VFPreLinkEventTool"/>
+				<Tool Name="VFPreBuildEventTool"/>
+				<Tool Name="VFPostBuildEventTool" CommandLine="copy $(OutDir)\$(TargetName)$(TargetExt) ..\..\..\bin"/>
+				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
 	<Files>
 		<Filter Name="Header Files" Filter="fi;fd"/>
 		<Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
@@ -89,20 +85,21 @@
 		<File RelativePath="..\..\..\src\Utilities\Memory\Memory.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\Memory\MemoryContainerIterator.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\Memory\MemoryHelper.f90"/>
-		<File RelativePath="..\..\..\src\Utilities\Memory\MemoryManager.f90"/></Filter>
-		<File RelativePath="..\..\..\src\Utilities\Memory\MemoryStore.f90"/>
+		<File RelativePath="..\..\..\src\Utilities\Memory\MemoryManager.f90"/>
+		<File RelativePath="..\..\..\src\Utilities\Memory\MemoryStore.f90"/></Filter>
 		<Filter Name="TimeSeries">
 		<File RelativePath="..\..\..\src\Utilities\TimeSeries\TimeSeries.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\TimeSeries\TimeSeriesRecord.f90"/></Filter>
+		<File RelativePath="..\..\..\src\Utilities\ArrayHandlers.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\BlockParser.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\CharString.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\compilerversion.F90">
 			<FileConfiguration Name="Debug|Win32">
-			<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
+				<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
 		<File RelativePath="..\..\..\src\Utilities\Constants.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\defmacro.F90">
 			<FileConfiguration Name="Debug|Win32">
-			<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
+				<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
 		<File RelativePath="..\..\..\src\Utilities\DevFeature.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\ErrorUtil.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\GeomUtil.f90"/>
@@ -121,6 +118,7 @@
 		<File RelativePath="..\..\..\src\Utilities\OpenSpec.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\PtrHashTable.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\PtrHashTableIterator.f90"/>
+		<File RelativePath="..\..\..\src\Utilities\Sim.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\SimVariables.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\Table.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\TableTerm.f90"/>
@@ -140,7 +138,6 @@
 		<File RelativePath="..\src\NWT\NWT1_xmd.f"/>
 		<File RelativePath="..\src\NWT\NWT1_xmdlib.f"/></Filter>
 		<Filter Name="Preproc">
-		<File RelativePath="..\src\Preproc\ArrayHandlers.f90"/>
 		<File RelativePath="..\src\Preproc\ConstantsPHMF.f90"/>
 		<File RelativePath="..\src\Preproc\Discretization3D.f90"/>
 		<File RelativePath="..\src\Preproc\DiscretizationBasePHMF.f90"/>
@@ -211,7 +208,5 @@
 		<File RelativePath="..\src\TdisVariables.f90"/>
 		<File RelativePath="..\src\TdisWriter.f90"/>
 		<File RelativePath="..\src\UzfPackageWriter.f90"/>
-		<File RelativePath="..\src\WelPackageWriter.f90"/></Filter>
-	</Files>
-	<Globals/>
-</VisualStudioProject>
+		<File RelativePath="..\src\WelPackageWriter.f90"/></Filter></Files>
+	<Globals/></VisualStudioProject>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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