Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(mf5to6): fix SimModule name clash #2047

Merged
merged 4 commits into from
Dec 17, 2024
Merged

fix(mf5to6): fix SimModule name clash #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab6067c
fix(mf5to6): fix SimModule name clash
jdhughes-usgs Nov 5, 2024
3dc3390
Update mf5to6 makefile
jdhughes-usgs Nov 6, 2024
b8055ec
Update
jdhughes-usgs Nov 12, 2024
ebc2199
update mf5to6 msvs, makefile, and pymake extrafiles
jdhughes-usgs Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions utils/mf5to6/make/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion utils/mf5to6/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
59 changes: 27 additions & 32 deletions utils/mf5to6/msvs/mf5to6.vfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand Down Expand Up @@ -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>
2 changes: 2 additions & 0 deletions utils/mf5to6/pymake/extrafiles.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/ArrayReadersMF5.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/ChdPackageWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/ChdType.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/DisWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, &
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/DrnPackageWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/EvtPackageWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/Exchange.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/ExchangeWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/FhbPackageWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/FileWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/GhbPackageWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/ImsPackageWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/LGR/GwfLgrSubs.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions utils/mf5to6/src/LGR/GwfSfrSubs.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions utils/mf5to6/src/LakPackageWriter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions utils/mf5to6/src/MF2005/GwfBasSubs.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/MF2005/GwfBcfSubs.f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/MF2005/GwfChdSubs.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/MF2005/GwfDrnSubs.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading