Skip to content

Commit aef71a6

Browse files
skfoggemorway-usgs
skfogg
authored and
emorway-usgs
committed
Msvs update (#13)
1 parent 4f70724 commit aef71a6

File tree

2 files changed

+80
-67
lines changed

2 files changed

+80
-67
lines changed

‎msvs/mf6.vfproj‎

Lines changed: 75 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -2,71 +2,83 @@
22
<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{369C1E2E-A513-4E83-A076-923534E30304}">
33
<Platforms>
44
<Platform Name="Win32"/>
5-
<Platform Name="x64"/></Platforms>
5+
<Platform Name="x64"/>
6+
</Platforms>
67
<Configurations>
7-
<Configuration Name="Debug|Win32" OutputDirectory="../bin" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" TargetName="$(ProjectName)d">
8-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" HeapArrays="0" Preprocess="preprocessYes" StandardWarnings="standardWarningsF08" WarnUnusedVariables="true" WarnUncalled="true" WarnInterfaces="true" OptDiagFile="optrpt" FloatingPointExceptionHandling="fpe0" Traceback="true" BoundsCheck="true" UninitializedVariablesCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
9-
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" 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"/>
16-
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
17-
<Configuration Name="Release|Win32" OutputDirectory="../../bin" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)">
18-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" FloatingPointExceptionHandling="fpe0" BoundsCheck="true"/>
19-
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
20-
<Tool Name="VFResourceCompilerTool"/>
21-
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
22-
<Tool Name="VFCustomBuildTool"/>
23-
<Tool Name="VFPreLinkEventTool"/>
24-
<Tool Name="VFPreBuildEventTool"/>
25-
<Tool Name="VFPostBuildEventTool"/>
26-
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
27-
<Configuration Name="Debug|x64" OutputDirectory="../bin" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" TargetName="$(ProjectName)d">
28-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" HeapArrays="0" Preprocess="preprocessYes" WarnUnusedVariables="true" WarnUncalled="true" WarnInterfaces="true" FloatingPointExceptionHandling="fpe0" Traceback="true" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" ArgTempCreatedCheck="true" StackFrameCheck="true"/>
29-
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="LIBCMTD" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
30-
<Tool Name="VFResourceCompilerTool"/>
31-
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
32-
<Tool Name="VFCustomBuildTool"/>
33-
<Tool Name="VFPreLinkEventTool"/>
34-
<Tool Name="VFPreBuildEventTool"/>
35-
<Tool Name="VFPostBuildEventTool"/>
36-
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
37-
<Configuration Name="Release|x64" OutputDirectory="../bin/" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)">
38-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" HeapArrays="0" Preprocess="preprocessYes" OptDiagFile="optrpt" FloatingPointExceptionHandling="fpe0"/>
39-
<Tool Name="VFLinkerTool" AdditionalOptions="/verbose:lib" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="LIBCMTD" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
40-
<Tool Name="VFResourceCompilerTool"/>
41-
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
42-
<Tool Name="VFCustomBuildTool"/>
43-
<Tool Name="VFPreLinkEventTool"/>
44-
<Tool Name="VFPreBuildEventTool"/>
45-
<Tool Name="VFPostBuildEventTool"/>
46-
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
47-
<Configuration Name="Profile|Win32" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)">
48-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" FloatingPointExceptionHandling="fpe0" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDLL"/>
49-
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
50-
<Tool Name="VFResourceCompilerTool"/>
51-
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
52-
<Tool Name="VFCustomBuildTool"/>
53-
<Tool Name="VFPreLinkEventTool"/>
54-
<Tool Name="VFPreBuildEventTool"/>
55-
<Tool Name="VFPostBuildEventTool"/>
56-
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
57-
<Configuration Name="Profile|x64" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)">
58-
<Tool Name="VFFortranCompilerTool" AdditionalOptions="/debug:inline-debug-info" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" DebugParameter="debugParameterAll" FloatingPointExceptionHandling="fpe0" Traceback="true" RuntimeLibrary="rtMultiThreadedDLL"/>
59-
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="LIBCMTD" GenerateManifest="false" ManifestFile="$(IntDir)\$(TargetName)p$(TargetExt).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
60-
<Tool Name="VFResourceCompilerTool"/>
61-
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
62-
<Tool Name="VFCustomBuildTool"/>
63-
<Tool Name="VFPreLinkEventTool"/>
64-
<Tool Name="VFPreBuildEventTool"/>
65-
<Tool Name="VFPostBuildEventTool"/>
66-
<Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(IntDir)\$(TargetName)p$(TargetExt).embed.manifest" ResourceFile="$(IntDir)\$(TargetName)p$(TargetExt).embed.manifest.res"/></Configuration></Configurations>
8+
<Configuration Name="Debug|Win32" UseCompiler="ifxCompiler" OutputDirectory="../bin" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" TargetName="$(ProjectName)d">
9+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" HeapArrays="0" Preprocess="preprocessYes" StandardWarnings="standardWarningsF08" WarnUnusedVariables="true" WarnUncalled="true" WarnInterfaces="true" OptDiagFile="optrpt" FloatingPointExceptionHandling="fpe0" Traceback="true" BoundsCheck="true" UninitializedVariablesCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
10+
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
11+
<Tool Name="VFResourceCompilerTool"/>
12+
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
13+
<Tool Name="VFCustomBuildTool"/>
14+
<Tool Name="VFPreLinkEventTool"/>
15+
<Tool Name="VFPreBuildEventTool"/>
16+
<Tool Name="VFPostBuildEventTool"/>
17+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/>
18+
</Configuration>
19+
<Configuration Name="Release|Win32" UseCompiler="ifortCompiler" OutputDirectory="../../bin" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)">
20+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" FloatingPointExceptionHandling="fpe0" BoundsCheck="true"/>
21+
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
22+
<Tool Name="VFResourceCompilerTool"/>
23+
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
24+
<Tool Name="VFCustomBuildTool"/>
25+
<Tool Name="VFPreLinkEventTool"/>
26+
<Tool Name="VFPreBuildEventTool"/>
27+
<Tool Name="VFPostBuildEventTool"/>
28+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/>
29+
</Configuration>
30+
<Configuration Name="Debug|x64" UseCompiler="ifortCompiler" OutputDirectory="../bin" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" TargetName="$(ProjectName)d">
31+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" HeapArrays="0" Preprocess="preprocessYes" WarnUnusedVariables="true" WarnUncalled="true" WarnInterfaces="true" FloatingPointExceptionHandling="fpe0" Traceback="true" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" ArgTempCreatedCheck="true" StackFrameCheck="true"/>
32+
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="LIBCMTD" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
33+
<Tool Name="VFResourceCompilerTool"/>
34+
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
35+
<Tool Name="VFCustomBuildTool"/>
36+
<Tool Name="VFPreLinkEventTool"/>
37+
<Tool Name="VFPreBuildEventTool"/>
38+
<Tool Name="VFPostBuildEventTool"/>
39+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/>
40+
</Configuration>
41+
<Configuration Name="Release|x64" UseCompiler="ifortCompiler" OutputDirectory="../bin/" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)">
42+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" HeapArrays="0" Preprocess="preprocessYes" OptDiagFile="optrpt" FloatingPointExceptionHandling="fpe0"/>
43+
<Tool Name="VFLinkerTool" AdditionalOptions="/verbose:lib" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="LIBCMTD" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
44+
<Tool Name="VFResourceCompilerTool"/>
45+
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
46+
<Tool Name="VFCustomBuildTool"/>
47+
<Tool Name="VFPreLinkEventTool"/>
48+
<Tool Name="VFPreBuildEventTool"/>
49+
<Tool Name="VFPostBuildEventTool"/>
50+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/>
51+
</Configuration>
52+
<Configuration Name="Profile|Win32" UseCompiler="ifortCompiler" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)">
53+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" FloatingPointExceptionHandling="fpe0" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDLL"/>
54+
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
55+
<Tool Name="VFResourceCompilerTool"/>
56+
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
57+
<Tool Name="VFCustomBuildTool"/>
58+
<Tool Name="VFPreLinkEventTool"/>
59+
<Tool Name="VFPreBuildEventTool"/>
60+
<Tool Name="VFPostBuildEventTool"/>
61+
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/>
62+
</Configuration>
63+
<Configuration Name="Profile|x64" UseCompiler="ifortCompiler" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)">
64+
<Tool Name="VFFortranCompilerTool" AdditionalOptions="/debug:inline-debug-info" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" DebugParameter="debugParameterAll" FloatingPointExceptionHandling="fpe0" Traceback="true" RuntimeLibrary="rtMultiThreadedDLL"/>
65+
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="LIBCMTD" GenerateManifest="false" ManifestFile="$(IntDir)\$(TargetName)p$(TargetExt).intermediate.manifest" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="subSystemConsole"/>
66+
<Tool Name="VFResourceCompilerTool"/>
67+
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
68+
<Tool Name="VFCustomBuildTool"/>
69+
<Tool Name="VFPreLinkEventTool"/>
70+
<Tool Name="VFPreBuildEventTool"/>
71+
<Tool Name="VFPostBuildEventTool"/>
72+
<Tool Name="VFManifestTool" SuppressStartupBanner="true" OutputManifestFile="$(IntDir)\$(TargetName)p$(TargetExt).embed.manifest" ResourceFile="$(IntDir)\$(TargetName)p$(TargetExt).embed.manifest.res"/>
73+
</Configuration>
74+
</Configurations>
6775
<Files>
6876
<Filter Name="Header Files" Filter="fi;fd"/>
6977
<Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
7078
<Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
71-
<File RelativePath="..\src\mf6.f90"/></Filter></Files>
72-
<Globals/></VisualStudioProject>
79+
<File RelativePath="..\src\mf6.f90">
80+
</File>
81+
</Filter>
82+
</Files>
83+
<Globals/>
84+
</VisualStudioProject>

‎msvs/mf6core.vfproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Name="x64"/>
66
</Platforms>
77
<Configurations>
8-
<Configuration Name="Debug|x64" OutputDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" ConfigurationType="typeStaticLibrary">
8+
<Configuration Name="Debug|x64" UseCompiler="ifortCompiler" OutputDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" ConfigurationType="typeStaticLibrary">
99
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" WarnDeclarations="true" WarnUnusedVariables="true" WarnInterfaces="true" FloatingPointExceptionHandling="fpe0" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
1010
<Tool Name="VFLibrarianTool"/>
1111
<Tool Name="VFResourceCompilerTool"/>
@@ -15,7 +15,7 @@
1515
<Tool Name="VFPreBuildEventTool"/>
1616
<Tool Name="VFPostBuildEventTool"/>
1717
</Configuration>
18-
<Configuration Name="Release|x64" OutputDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" ConfigurationType="typeStaticLibrary">
18+
<Configuration Name="Release|x64" UseCompiler="ifortCompiler" OutputDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" ConfigurationType="typeStaticLibrary">
1919
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Preprocess="preprocessYes" WarnDeclarations="true" WarnUnusedVariables="true" FloatingPointExceptionHandling="fpe0"/>
2020
<Tool Name="VFLibrarianTool"/>
2121
<Tool Name="VFResourceCompilerTool"/>
@@ -25,7 +25,7 @@
2525
<Tool Name="VFPreBuildEventTool"/>
2626
<Tool Name="VFPostBuildEventTool"/>
2727
</Configuration>
28-
<Configuration Name="Debug|Win32" OutputDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" ConfigurationType="typeStaticLibrary">
28+
<Configuration Name="Debug|Win32" UseCompiler="ifxCompiler" OutputDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" ConfigurationType="typeStaticLibrary">
2929
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" WarnUnusedVariables="true" WarnUncalled="true" WarnInterfaces="true" FloatingPointExceptionHandling="fpe0" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
3030
<Tool Name="VFLibrarianTool"/>
3131
<Tool Name="VFResourceCompilerTool"/>
@@ -35,7 +35,7 @@
3535
<Tool Name="VFPreBuildEventTool"/>
3636
<Tool Name="VFPostBuildEventTool"/>
3737
</Configuration>
38-
<Configuration Name="Release|Win32" OutputDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" ConfigurationType="typeStaticLibrary" Preprocess="preprocessYes">
38+
<Configuration Name="Release|Win32" UseCompiler="ifortCompiler" OutputDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="obj_temp\$(ProjectName)\$(PlatformName)\$(ConfigurationName)" ConfigurationType="typeStaticLibrary">
3939
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Preprocess="preprocessYes" WarnDeclarations="true" WarnUnusedVariables="true" FloatingPointExceptionHandling="fpe0"/>
4040
<Tool Name="VFLibrarianTool"/>
4141
<Tool Name="VFResourceCompilerTool"/>
@@ -264,6 +264,7 @@
264264
<File RelativePath="..\src\Model\GroundWaterEnergy\gwe-mwe.f90"/>
265265
<File RelativePath="..\src\Model\GroundWaterEnergy\gwe-sfe.f90"/>
266266
<File RelativePath="..\src\Model\GroundWaterEnergy\gwe-shf.f90"/>
267+
<File RelativePath="..\src\Model\GroundWaterEnergy\gwe-swr.f90">
267268
<File RelativePath="..\src\Model\GroundWaterEnergy\gwe-uze.f90"/>
268269
<File RelativePath="..\src\Model\GroundWaterEnergy\gwe.f90"/>
269270
<File RelativePath="..\src\Model\GroundWaterEnergy\PbstBase.f90"/></Filter>

0 commit comments

Comments
 (0)