Merge pull request #28 from nhm-usgs/pymt_fix1

Code address broken setter/getter functions found in the surface bmi
nhm-usgs · Apr 6, 2020 · 8443eb5 · 8443eb5
2 parents eeb7115 + d41dd9b
commit 8443eb5
Show file tree

Hide file tree

Showing 49 changed files with 372 additions and 51,008 deletions.
diff --git a/bmi_prms_surface/bmi_prms_surface.sln b/bmi_prms_surface/bmi_prms_surface.sln
@@ -22,6 +22,9 @@ EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test_set_value", "test_set_value\test_set_value.vfproj", "{9F284DEA-CEB1-43B1-B26C-FFD78ADA9F71}"
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "test_set_value_at_indices", "test_set_value_at_indices\test_set_value_at_indices.vfproj", "{210FAD66-CBE5-49D0-924A-2D76FC70D07F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{915D4282-B8C2-4FF4-BBCD-1C904D9C8E77} = {915D4282-B8C2-4FF4-BBCD-1C904D9C8E77}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/bmi_prms_surface/irf_ex/irf_ex.vfproj b/bmi_prms_surface/irf_ex/irf_ex.vfproj
@@ -26,17 +26,17 @@
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
 		<Configuration Name="Debug|x64">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="B:\gitbmi\bmi-prms6-surface\bmi_prms_surface\bmi_prms_surface\x64\Debug" WarnInterfaces="true" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\bmi_prms_surface\x64\Debug;B:\BuildNetcdf\install\lib;B:\BuildNetcdf\install\1.10.5\lib" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="bmi_prms_surface.lib B:\gitbmi\prms\prms_project\prmslib\Debug\prmslib.lib B:\BuildNetcdf\install\lib\coretran.lib B:\BuildNetcdf\install\lib\netcdf.lib B:\BuildNetcdf\install\lib\netcdff.lib libhdf5.lib libhdf5_hl.lib libszip.lib libzlib.lib"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\bmi_prms_surface\x64\Debug;B:\BuildNetcdf\install\lib;B:\BuildNetcdf\install\1.10.5\lib" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="bmi_prms_surface.lib B:\gitbmi\prms\_build\prmslib\Debug\prmslib.lib B:\BuildNetcdf\install\lib\coretran.lib B:\BuildNetcdf\install\lib\netcdf.lib B:\BuildNetcdf\install\lib\netcdff.lib libhdf5.lib libhdf5_hl.lib libszip.lib libzlib.lib"/>
 				<Tool Name="VFResourceCompilerTool"/>
 				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
 				<Tool Name="VFCustomBuildTool"/>
 				<Tool Name="VFPreLinkEventTool"/>
-				<Tool Name="VFPreBuildEventTool" CommandLine="xcopy ..\..\..\bmi-test-projects\prms\pipestem .\pipestem /i /e /s /y" Description="Pipstem project in bmi-test-projects repo"/>
+				<Tool Name="VFPreBuildEventTool" CommandLine="xcopy ..\..\..\bmi-test-projects\prms\pipestem  /i /e /s /y" Description="Pipstem project in bmi-test-projects repo"/>
 				<Tool Name="VFPostBuildEventTool"/>
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
 		<Configuration Name="Release|x64">
 				<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="B:\gitbmi\bmi-prms6-surface\bmi_prms_surface\bmi_prms_surface\x64\Release" RuntimeLibrary="rtMultiThreadedDLL"/>
-				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\bmi_prms_surface\x64\Release;B:\BuildNetcdf\install\lib;B:\BuildNetcdf\install\1.10.5\lib;B:\gitbmi\prms\prmslib\Release" LinkLibraryDependencies="false" SubSystem="subSystemConsole" AdditionalDependencies="bmi_prms_surface.lib prmslib.lib B:\BuildNetcdf\install\lib\coretran.lib B:\BuildNetcdf\install\lib\netcdf.lib B:\BuildNetcdf\install\lib\netcdff.lib libhdf5.lib libhdf5_hl.lib libszip.lib libzlib.lib"/>
+				<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\bmi_prms_surface\x64\Release;B:\BuildNetcdf\install\lib;B:\BuildNetcdf\install\1.10.5\lib;B:\gitbmi\prms\prms_project\prmslib\Release" LinkLibraryDependencies="false" SubSystem="subSystemConsole" AdditionalDependencies="bmi_prms_surface.lib prmslib.lib B:\BuildNetcdf\install\lib\coretran.lib B:\BuildNetcdf\install\lib\netcdf.lib B:\BuildNetcdf\install\lib\netcdff.lib libhdf5.lib libhdf5_hl.lib libszip.lib libzlib.lib"/>
 				<Tool Name="VFResourceCompilerTool"/>
 				<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
 				<Tool Name="VFCustomBuildTool"/>

diff --git a/bmi_prms_surface/test_get_grid_x/pipestem/.gitignore b/bmi_prms_surface/test_get_grid_x/pipestem/.gitignore
diff --git a/bmi_prms_surface/test_get_grid_x/pipestem/.tmax.cbh.swo b/bmi_prms_surface/test_get_grid_x/pipestem/.tmax.cbh.swo
diff --git a/bmi_prms_surface/test_get_grid_x/pipestem/control.default b/bmi_prms_surface/test_get_grid_x/pipestem/control.default