Skip to content

Commit 8d5b621

Browse files
jdhughes-devjdhughes-dev
authored
fix(mf5to6): fix SimModule name clash (#2047)
Modification based on conda-forge/modflow6-feedstock#35 (comment)
1 parent 92df2c4 commit 8d5b621

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+151
-498
lines changed

‎utils/mf5to6/make/makefile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ ${SOURCEDIR8}
2828
OBJECTS = \
2929
$(OBJDIR)/kind.o \
3030
$(OBJDIR)/Constants.o \
31-
$(OBJDIR)/Global.o \
31+
$(OBJDIR)/ErrorUtil.o \
32+
$(OBJDIR)/CharString.o \
3233
$(OBJDIR)/SimVariables.o \
3334
$(OBJDIR)/ArrayHandlers.o \
3435
$(OBJDIR)/Message.o \
3536
$(OBJDIR)/defmacro.o \
3637
$(OBJDIR)/compilerversion.o \
3738
$(OBJDIR)/version.o \
39+
$(OBJDIR)/Sim.o \
3840
$(OBJDIR)/OpenSpec.o \
39-
$(OBJDIR)/GlobalVariables.o \
40-
$(OBJDIR)/SimPHMF.o \
4141
$(OBJDIR)/KeyValueNode.o \
4242
$(OBJDIR)/Iterator.o \
4343
$(OBJDIR)/InputOutput.o \
@@ -46,14 +46,15 @@ $(OBJDIR)/TableTerm.o \
4646
$(OBJDIR)/KeyValueList.o \
4747
$(OBJDIR)/Table.o \
4848
$(OBJDIR)/MemoryHelper.o \
49-
$(OBJDIR)/CharString.o \
5049
$(OBJDIR)/PtrHashTableIterator.o \
5150
$(OBJDIR)/Memory.o \
51+
$(OBJDIR)/GlobalVariables.o \
52+
$(OBJDIR)/Global.o \
5253
$(OBJDIR)/PtrHashTable.o \
5354
$(OBJDIR)/MemoryContainerIterator.o \
55+
$(OBJDIR)/SimPHMF.o \
5456
$(OBJDIR)/ListNode.o \
5557
$(OBJDIR)/MemoryStore.o \
56-
$(OBJDIR)/ErrorUtil.o \
5758
$(OBJDIR)/LongLineReader.o \
5859
$(OBJDIR)/DevFeature.o \
5960
$(OBJDIR)/Utilities.o \

‎utils/mf5to6/meson.build‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ mf5to6_sources = files(
6262
'src' / 'NWT' / 'NWT1_solver.f',
6363
'src' / 'NWT' / 'NWT1_xmd.f',
6464
'src' / 'NWT' / 'NWT1_xmdlib.f',
65-
'src' / 'Preproc' / 'ArrayHandlers.f90',
6665
'src' / 'Preproc' / 'ConstantsPHMF.f90',
6766
'src' / 'Preproc' / 'Discretization3D.f90',
6867
'src' / 'Preproc' / 'DiscretizationBasePHMF.f90',

‎utils/mf5to6/msvs/mf5to6.vfproj‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{EE5F8367-9220-45ED-9B0B-5942AF51229C}">
33
<Platforms>
4-
<Platform Name="Win32"/>
5-
</Platforms>
4+
<Platform Name="Win32"/></Platforms>
65
<Configurations>
76
<Configuration Name="Debug|Win32" TargetName="$(ProjectName)d">
8-
<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"/>
9-
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole"/>
10-
<Tool Name="VFResourceCompilerTool"/>
11-
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
12-
<Tool Name="VFCustomBuildTool"/>
13-
<Tool Name="VFPreLinkEventTool"/>
14-
<Tool Name="VFPreBuildEventTool"/>
15-
<Tool Name="VFPostBuildEventTool" CommandLine="copy $(OutDir)\$(TargetName)$(TargetExt) ..\..\..\bin"/>
16-
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/>
17-
</Configuration>
7+
<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"/>
8+
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole"/>
9+
<Tool Name="VFResourceCompilerTool"/>
10+
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
11+
<Tool Name="VFCustomBuildTool"/>
12+
<Tool Name="VFPreLinkEventTool"/>
13+
<Tool Name="VFPreBuildEventTool"/>
14+
<Tool Name="VFPostBuildEventTool" CommandLine="copy $(OutDir)\$(TargetName)$(TargetExt) ..\..\..\bin"/>
15+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
1816
<Configuration Name="Release|Win32">
19-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" HeapArrays="0" RuntimeLibrary="rtMultiThreadedDebug"/>
20-
<Tool Name="VFLinkerTool" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole"/>
21-
<Tool Name="VFResourceCompilerTool"/>
22-
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
23-
<Tool Name="VFCustomBuildTool"/>
24-
<Tool Name="VFPreLinkEventTool"/>
25-
<Tool Name="VFPreBuildEventTool"/>
26-
<Tool Name="VFPostBuildEventTool" CommandLine="copy $(OutDir)\$(TargetName)$(TargetExt) ..\..\..\bin"/>
27-
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/>
28-
</Configuration>
29-
</Configurations>
17+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" HeapArrays="0" RuntimeLibrary="rtMultiThreadedDebug"/>
18+
<Tool Name="VFLinkerTool" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole"/>
19+
<Tool Name="VFResourceCompilerTool"/>
20+
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
21+
<Tool Name="VFCustomBuildTool"/>
22+
<Tool Name="VFPreLinkEventTool"/>
23+
<Tool Name="VFPreBuildEventTool"/>
24+
<Tool Name="VFPostBuildEventTool" CommandLine="copy $(OutDir)\$(TargetName)$(TargetExt) ..\..\..\bin"/>
25+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
3026
<Files>
3127
<Filter Name="Header Files" Filter="fi;fd"/>
3228
<Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
@@ -89,20 +85,21 @@
8985
<File RelativePath="..\..\..\src\Utilities\Memory\Memory.f90"/>
9086
<File RelativePath="..\..\..\src\Utilities\Memory\MemoryContainerIterator.f90"/>
9187
<File RelativePath="..\..\..\src\Utilities\Memory\MemoryHelper.f90"/>
92-
<File RelativePath="..\..\..\src\Utilities\Memory\MemoryManager.f90"/></Filter>
93-
<File RelativePath="..\..\..\src\Utilities\Memory\MemoryStore.f90"/>
88+
<File RelativePath="..\..\..\src\Utilities\Memory\MemoryManager.f90"/>
89+
<File RelativePath="..\..\..\src\Utilities\Memory\MemoryStore.f90"/></Filter>
9490
<Filter Name="TimeSeries">
9591
<File RelativePath="..\..\..\src\Utilities\TimeSeries\TimeSeries.f90"/>
9692
<File RelativePath="..\..\..\src\Utilities\TimeSeries\TimeSeriesRecord.f90"/></Filter>
93+
<File RelativePath="..\..\..\src\Utilities\ArrayHandlers.f90"/>
9794
<File RelativePath="..\..\..\src\Utilities\BlockParser.f90"/>
9895
<File RelativePath="..\..\..\src\Utilities\CharString.f90"/>
9996
<File RelativePath="..\..\..\src\Utilities\compilerversion.F90">
10097
<FileConfiguration Name="Debug|Win32">
101-
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
98+
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
10299
<File RelativePath="..\..\..\src\Utilities\Constants.f90"/>
103100
<File RelativePath="..\..\..\src\Utilities\defmacro.F90">
104101
<FileConfiguration Name="Debug|Win32">
105-
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
102+
<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
106103
<File RelativePath="..\..\..\src\Utilities\DevFeature.f90"/>
107104
<File RelativePath="..\..\..\src\Utilities\ErrorUtil.f90"/>
108105
<File RelativePath="..\..\..\src\Utilities\GeomUtil.f90"/>
@@ -121,6 +118,7 @@
121118
<File RelativePath="..\..\..\src\Utilities\OpenSpec.f90"/>
122119
<File RelativePath="..\..\..\src\Utilities\PtrHashTable.f90"/>
123120
<File RelativePath="..\..\..\src\Utilities\PtrHashTableIterator.f90"/>
121+
<File RelativePath="..\..\..\src\Utilities\Sim.f90"/>
124122
<File RelativePath="..\..\..\src\Utilities\SimVariables.f90"/>
125123
<File RelativePath="..\..\..\src\Utilities\Table.f90"/>
126124
<File RelativePath="..\..\..\src\Utilities\TableTerm.f90"/>
@@ -140,7 +138,6 @@
140138
<File RelativePath="..\src\NWT\NWT1_xmd.f"/>
141139
<File RelativePath="..\src\NWT\NWT1_xmdlib.f"/></Filter>
142140
<Filter Name="Preproc">
143-
<File RelativePath="..\src\Preproc\ArrayHandlers.f90"/>
144141
<File RelativePath="..\src\Preproc\ConstantsPHMF.f90"/>
145142
<File RelativePath="..\src\Preproc\Discretization3D.f90"/>
146143
<File RelativePath="..\src\Preproc\DiscretizationBasePHMF.f90"/>
@@ -211,7 +208,5 @@
211208
<File RelativePath="..\src\TdisVariables.f90"/>
212209
<File RelativePath="..\src\TdisWriter.f90"/>
213210
<File RelativePath="..\src\UzfPackageWriter.f90"/>
214-
<File RelativePath="..\src\WelPackageWriter.f90"/></Filter>
215-
</Files>
216-
<Globals/>
217-
</VisualStudioProject>
211+
<File RelativePath="..\src\WelPackageWriter.f90"/></Filter></Files>
212+
<Globals/></VisualStudioProject>

‎utils/mf5to6/pymake/extrafiles.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
../../../src/Utilities/Memory/MemoryStore.f90
66
../../../src/Utilities/TimeSeries/TimeSeries.f90
77
../../../src/Utilities/TimeSeries/TimeSeriesRecord.f90
8+
../../../src/Utilities/ArrayHandlers.f90
89
../../../src/Utilities/BlockParser.f90
910
../../../src/Utilities/CharString.f90
1011
../../../src/Utilities/Constants.f90
@@ -15,6 +16,7 @@
1516
../../../src/Utilities/GeomUtil.f90
1617
../../../src/Utilities/InputOutput.f90
1718
../../../src/Utilities/Iterator.f90
19+
../../../src/Utilities/Sim.f90
1820
../../../src/Utilities/KeyValueList.f90
1921
../../../src/Utilities/KeyValueListIterator.f90
2022
../../../src/Utilities/KeyValueNode.f90

‎utils/mf5to6/src/ArrayReadersMF5.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module ArrayReadersMF5Module
55
use InputOutputModule, only: openfile, u9rdcom, urword, ucolno, ulaprw
66
use KindModule, only: DP, I4B
77
use OpenSpecModule, only: ACCESS, FORM
8-
use SimModule, only: store_error, ustop, store_error_unit
8+
use SimPHMFModule, only: store_error, ustop, store_error_unit
99

1010
implicit none
1111

‎utils/mf5to6/src/ChdPackageWriter.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module ChdPackageWriterModule
2020
use LineListModule, only: LineListType
2121
use ListModule, only: ListType
2222
use PackageWriterModule, only: PackageWriterType
23-
use SimModule, only: store_note, store_error, ustop
23+
use SimPHMFModule, only: store_note, store_error, ustop
2424
use TdisVariablesModule, only: GlobalTdisWriter
2525
use TimeSeriesRecordModule, only: TimeSeriesRecordType, &
2626
ConstructTimeSeriesRecord

‎utils/mf5to6/src/ChdType.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module ChdModule
22

33
use ConstantsModule, only: LENTIMESERIESNAME, MAXCHARLEN
44
use ListModule, only: ListType
5-
use SimModule, only: store_error, ustop
5+
use SimPHMFModule, only: store_error, ustop
66
use TimeSeriesModule, only: TimeSeriesType
77

88
implicit none

‎utils/mf5to6/src/DisWriter.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module DisWriterModule
88
IBOUND, NCNFBD
99
use GlobalVariablesModule, only: echo
1010
use GWFBCFMODULE, only: LAYCON
11-
use SimModule, only: store_error, store_note, store_warning, ustop
11+
use SimPHMFModule, only: store_error, store_note, store_warning, ustop
1212
use UtilitiesModule, only: ConstantInt2D, ConstantInt3D, &
1313
ConstantReal1D, ConstantReal2D, &
1414
ConstantReal3D, Write2Dint, Write3Dint, &

‎utils/mf5to6/src/DrnPackageWriter.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module DrnPackageWriterModule
88
use GwfDrnSubs, only: GWF2DRN7AR, GWF2DRN7RP
99
use LineListModule, only: same_lines
1010
use PackageWriterModule, only: PackageWriterType
11-
use SimModule, only: ustop, store_error, store_warning
11+
use SimPHMFModule, only: ustop, store_error, store_warning
1212
use utl7module, only: U1DREL, U2DREL, &
1313
urword, URDCOM, &
1414
ULSTRD

‎utils/mf5to6/src/EvtPackageWriter.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module EvtPackageWriterModule
1212
use GwfEvtSubs, only: GWF2EVT7AR, GWF2EVT7RP
1313
use LineListModule, only: LineListType, same_lines
1414
use PackageWriterModule, only: PackageWriterType
15-
use SimModule, only: ustop, store_error, store_warning, store_note
15+
use SimPHMFModule, only: ustop, store_error, store_warning, store_note
1616
use UtilitiesModule, only: Write1Drel, Write2Drel, Write3Drel, &
1717
ConstantInt2D, ConstantReal2D, &
1818
BuildArrayFormat

0 commit comments

Comments
 (0)