NWTC_Lib: fix of vs proj files

OpenFAST · Nov 28, 2022 · a1210a5 · a1210a5
1 parent e8438af
commit a1210a5
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,7 +34,7 @@ __pycache__/*
 build*/
 _build*/
 install/
-vs-build/
+
 
 # OS and IDE specific files
 .DS_Store

diff --git a/modules/nwtc-library/src/JSON.f90 b/modules/nwtc-library/src/JSON.f90
@@ -28,6 +28,7 @@ module JSON
    interface json_write_array
       module procedure json_write_array2R4  ! Two dimension array of SiKi
       module procedure json_write_array2I   ! Two dimension array of IntKi
+      module procedure json_write_array2R8  ! Two dimension array of R8Ki
       module procedure json_write_array2R16 ! Two dimension array of QuKi
    end interface
 
@@ -41,16 +42,13 @@ module JSON
 ! --------------------------------------------------------------------------------}
 ! --- Write Array 2D 
 ! --------------------------------------------------------------------------------{
-subroutine json_write_array2I(fid, key, A, VarFmt, ErrStat, ErrMsg, level, comment, label)
+subroutine json_write_array2I(fid, key, A, VarFmt, ErrStat, ErrMsg)
    integer(IntKi),             intent(in   ) :: fid     !< File Unit
    character(len=*),           intent(in   ) :: key     !< Array name
    integer(IntKi), dimension(:,:), intent(in   ) :: A   !< Array
    character(len=*),           intent(in   ) :: VarFmt  !< Format for printing real numbers  
    integer,                    intent(  out) :: ErrStat !< A non-zero value indicates an error occurred
    character(len=*),           intent(  out) :: ErrMsg  !< Error message if errstat /= errid_none
-   integer(IntKi),   optional, intent(in   ) :: level   !< indentation level
-   character(len=*), optional, intent(in   ) :: comment !< 
-   logical,          optional, intent(in   ) :: label   !< If present, add a index label at end of line
    integer            :: nr, nc, i  ! size (rows and columns) of A
    character(256)     :: Fmt
    ErrStat = ErrID_None   
@@ -85,15 +83,13 @@ subroutine json_write_array2I(fid, key, A, VarFmt, ErrStat, ErrMsg, level, comme
 
 end subroutine json_write_array2I
 
-subroutine json_write_array2R4(fid, key, A, VarFmt, ErrStat, ErrMsg, level, comment, AllFmt)
+subroutine json_write_array2R4(fid, key, A, VarFmt, ErrStat, ErrMsg, AllFmt)
    integer(IntKi),             intent(in   ) :: fid     !< File Unit
    character(len=*),           intent(in   ) :: key     !< Array name
    real(SiKi), dimension(:,:), intent(in   ) :: A       !< Array
    character(len=*),           intent(in   ) :: VarFmt  !< Format for printing real numbers  
    integer,                    intent(  out) :: ErrStat !< A non-zero value indicates an error occurred
    character(len=*),           intent(  out) :: ErrMsg  !< Error message if errstat /= errid_none
-   integer(IntKi),   optional, intent(in   ) :: level   !< indentation level
-   character(len=*), optional, intent(in   ) :: comment !< 
    character(len=*), optional, intent(in   ) :: AllFmt  !< Format for printing a line
    integer            :: nr, nc, i  ! size (rows and columns) of A
    character(256)     :: Fmt
@@ -131,15 +127,13 @@ subroutine json_write_array2R4(fid, key, A, VarFmt, ErrStat, ErrMsg, level, comm
 
 end subroutine json_write_array2R4
 
-subroutine json_write_array2R8(fid, key, A, VarFmt, ErrStat, ErrMsg, level, comment, AllFmt)
+subroutine json_write_array2R8(fid, key, A, VarFmt, ErrStat, ErrMsg, AllFmt)
    integer(IntKi),             intent(in   ) :: fid     !< File Unit
    character(len=*),           intent(in   ) :: key     !< Array name
    real(R8Ki), dimension(:,:), intent(in   ) :: A       !< Array
    character(len=*),           intent(in   ) :: VarFmt  !< Format for printing real numbers  
    integer,                    intent(  out) :: ErrStat !< A non-zero value indicates an error occurred
    character(len=*),           intent(  out) :: ErrMsg  !< Error message if errstat /= errid_none
-   integer(IntKi),   optional, intent(in   ) :: level   !< indentation level
-   character(len=*), optional, intent(in   ) :: comment !< 
    character(len=*), optional, intent(in   ) :: AllFmt  !< Format for printing a line
    integer            :: nr, nc, i  ! size (rows and columns) of A
    character(256)     :: Fmt
@@ -177,15 +171,13 @@ subroutine json_write_array2R8(fid, key, A, VarFmt, ErrStat, ErrMsg, level, comm
 
 end subroutine json_write_array2R8
 
-subroutine json_write_array2R16(fid, key, A, VarFmt, ErrStat, ErrMsg, level, comment, AllFmt)
+subroutine json_write_array2R16(fid, key, A, VarFmt, ErrStat, ErrMsg, AllFmt)
    integer(IntKi),             intent(in   ) :: fid     !< File Unit
    character(len=*),           intent(in   ) :: key     !< Array name
    real(QuKi), dimension(:,:), intent(in   ) :: A       !< Array
    character(len=*),           intent(in   ) :: VarFmt  !< Format for printing real numbers  
    integer,                    intent(  out) :: ErrStat !< A non-zero value indicates an error occurred
    character(len=*),           intent(  out) :: ErrMsg  !< Error message if errstat /= errid_none
-   integer(IntKi),   optional, intent(in   ) :: level   !< indentation level
-   character(len=*), optional, intent(in   ) :: comment !< 
    character(len=*), optional, intent(in   ) :: AllFmt  !< Format for printing a line
    integer            :: nr, nc, i  ! size (rows and columns) of A
    character(256)     :: Fmt

diff --git a/vs-build/.gitignore b/vs-build/.gitignore
@@ -0,0 +1,12 @@
+# File extensions
+*.u2d
+*.user
+
+# Folders Created during build
+Debug*
+Release*
+x64
+.vs/
+
+# Generated Files
+gitVersionInfo.h
diff --git a/vs-build/AeroDyn/AeroDyn_Driver.vfproj b/vs-build/AeroDyn/AeroDyn_Driver.vfproj
@@ -1024,9 +1024,9 @@
 			<FileConfiguration Name="Debug_Double|x64">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Num.f90"/>
-		<File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90"/>
-		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/></Filter>
+		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/>
+        <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
 		<Filter Name="UnsteadyAero">
 		<Filter Name="RegistryFiles">
 		<File RelativePath="..\..\modules\AeroDyn\src\UnsteadyAero_Registry.txt">

diff --git a/vs-build/AeroDyn_Inflow_c_binding/AeroDyn_Inflow_c_binding.vfproj b/vs-build/AeroDyn_Inflow_c_binding/AeroDyn_Inflow_c_binding.vfproj
@@ -1186,9 +1186,9 @@
 			<FileConfiguration Name="Debug_Double|x64">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Num.f90"/>
-		<File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90"/>
-		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/></Filter>
+		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/>
+        <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
 		<Filter Name="UnsteadyAero">
 		<Filter Name="RegistryFiles">
 		<File RelativePath="..\..\modules\AeroDyn\src\UnsteadyAero_Registry.txt">

diff --git a/vs-build/BeamDyn/BeamDyn.vfproj b/vs-build/BeamDyn/BeamDyn.vfproj
@@ -291,6 +291,7 @@
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
 			<FileConfiguration Name="Release|Win32">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
+        <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/>
         <File RelativePath="..\..\modules\nwtc-library\src\YAML.f90"/></Filter>
 		<File RelativePath="..\..\modules\version\src\VersionInfo.f90"/></Filter></Files>
 	<Globals/></VisualStudioProject>
diff --git a/vs-build/FASTlib/FASTlib.vfproj b/vs-build/FASTlib/FASTlib.vfproj
@@ -2256,6 +2256,7 @@
 		<File RelativePath="..\..\modules\nwtc-library\src\ranlux\RANLUX.f90"/></Filter>
 		<Filter Name="RegistryFiles">
 		<File RelativePath="..\..\modules\nwtc-library\src\Registry_NWTC_Library.txt"/></Filter>
+		<File RelativePath="..\..\modules\nwtc-library\src\JSON.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\ModMesh.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\ModMesh_Mapping.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\ModMesh_Types.f90"/>
@@ -2273,7 +2274,6 @@
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Num.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_RandomNumber.f90"/>
-		<File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90">
 			<FileConfiguration Name="Debug_Matlab|x64" ExcludedFromBuild="true"/>
@@ -2291,6 +2291,7 @@
 			<FileConfiguration Name="Release_OpenMP|Win32" ExcludedFromBuild="true"/>
 			<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true"/>
             <FileConfiguration Name="Release_Double|x64" ExcludedFromBuild="true"/></File>
+		<File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\YAML.f90"/></Filter>
 		<Filter Name="OpenFOAM Integration">
 		<Filter Name="RegistryFiles">

diff --git a/vs-build/HydroDyn/HydroDynDriver.vfproj b/vs-build/HydroDyn/HydroDynDriver.vfproj
@@ -436,6 +436,7 @@
 			<FileConfiguration Name="Debug_Double|x64">
 				<Tool Name="VFFortranCompilerTool" StandardWarnings="standardWarningsNone" WarnDeclarations="false" WarnUnusedVariables="false"/></FileConfiguration>
 			<FileConfiguration Name="Release|Win32">
-				<Tool Name="VFFortranCompilerTool" StandardWarnings="standardWarningsNone" WarnUnusedVariables="false"/></FileConfiguration></File></Filter>
+				<Tool Name="VFFortranCompilerTool" StandardWarnings="standardWarningsNone" WarnUnusedVariables="false"/></FileConfiguration></File>
+          <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
 		<File RelativePath="..\..\modules\version\src\VersionInfo.f90"/></Filter></Files>
 	<Globals/></VisualStudioProject>
diff --git a/vs-build/HydroDyn_c_binding/HydroDyn_c_binding.vfproj b/vs-build/HydroDyn_c_binding/HydroDyn_c_binding.vfproj
@@ -313,6 +313,7 @@
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_RandomNumber.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\ranlux\RANLUX.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90"/>
-		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/></Filter>
+        <File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/>
+        <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
 		<File RelativePath="..\..\modules\version\src\VersionInfo.f90"/></Filter></Files>
 	<Globals/></VisualStudioProject>
diff --git a/vs-build/InflowWind/InflowWind_driver.vfproj b/vs-build/InflowWind/InflowWind_driver.vfproj
@@ -352,6 +352,7 @@
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Library_Types.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Num.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90"/>
-		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/></Filter>
+		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/>
+        <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
 		<File RelativePath="..\..\modules\version\src\VersionInfo.f90"/></Filter></Files>
 	<Globals/></VisualStudioProject>
diff --git a/vs-build/InflowWind_c_binding/InflowWind_c_binding.vfproj b/vs-build/InflowWind_c_binding/InflowWind_c_binding.vfproj
@@ -348,7 +348,8 @@
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Library_Types.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Num.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90"/>
-		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/></Filter>
+		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/>
+        <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
 		<File RelativePath="..\..\modules\inflowwind\src\IfW_C_Binding.f90"/>
 		<File RelativePath="..\..\modules\version\src\VersionInfo.f90"/></Filter></Files>
 	<Globals/></VisualStudioProject>
diff --git a/vs-build/MoorDyn/MoorDynDriver.vfproj b/vs-build/MoorDyn/MoorDynDriver.vfproj
@@ -145,15 +145,7 @@
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
 			<FileConfiguration Name="Release|Win32">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
-		<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90">
-			<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
-			<FileConfiguration Name="Release|x64">
-				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
-			<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true">
-				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
-			<FileConfiguration Name="Release|Win32">
-				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
+        <File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90">
 			<FileConfiguration Name="Debug|Win32">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
@@ -162,6 +154,7 @@
 			<FileConfiguration Name="Debug|x64">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
 			<FileConfiguration Name="Release|Win32">
-				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File></Filter>
+				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
+        <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
 		<File RelativePath="..\..\modules\version\src\VersionInfo.f90"/></Filter></Files>
 	<Globals/></VisualStudioProject>
diff --git a/vs-build/SubDyn/SubDyn.vfproj b/vs-build/SubDyn/SubDyn.vfproj
@@ -135,7 +135,7 @@
 			<FileConfiguration Name="Release_Double|x64">
 				<Tool Name="VFFortranCompilerTool" RealKIND="realKIND8" DoublePrecisionKIND="doublePrecisionKIND16"/></FileConfiguration></File></Filter>
 		<File RelativePath="..\..\modules\nwtc-library\src\NetLib\lapack\NWTC_LAPACK.f90"/></Filter>
-		<File RelativePath="..\..\modules\nwtc-library\src\JSON.f90"/></Filter>
+		<File RelativePath="..\..\modules\nwtc-library\src\JSON.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\ModMesh.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\ModMesh_Mapping.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\ModMesh_Types.f90"/>
@@ -154,6 +154,7 @@
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Num.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90"/>
         <File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/>
+        <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\Yaml.f90"/></Filter>
 		<Filter Name="SubDyn">
 		<Filter Name="RegistryFiles">

diff --git a/vs-build/TurbSim/TurbSim.vfproj b/vs-build/TurbSim/TurbSim.vfproj
@@ -62,7 +62,8 @@
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Library_Types.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Num.f90"/>
 		<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90"/>
-		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/></Filter>
+		<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90"/>
+        <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
 		<Filter Name="RanLux">
 		<File RelativePath="..\..\modules\nwtc-library\src\ranlux\RANLUX.f90"/></Filter></Filter>
 		<Filter Name="TurbSim">

diff --git a/vs-build/UnsteadyAero/UnsteadyAero.vfproj b/vs-build/UnsteadyAero/UnsteadyAero.vfproj
@@ -292,7 +292,8 @@
 			<FileConfiguration Name="Release|Win32">
 				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
 			<FileConfiguration Name="Release_Double|x64">
-				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File></Filter>
+				<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
+        <File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
 		<Filter Name="UnsteadyAero">
 		<Filter Name="RegistryFiles">
 		<File RelativePath="..\..\modules\aerodyn\src\UnsteadyAero_Registry.txt">