Skip to content

VS build: fix MD, add SeaStateS_c_binding and update GH deploy action #2866

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

Merged
andrew-platt merged 6 commits into from
Jun 18, 2025
Merged

VS build: fix MD, add SeaStateS_c_binding and update GH deploy action #2866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
175386d
VS build: add SeaState
andrew-platt Jun 17, 2025
cd4b483
VSbuild MD: add missing SS dependency
andrew-platt Jun 17, 2025
3326b75
VSbuild HD,MD: revise ordering for clarity
andrew-platt Jun 17, 2025
c5fb122
VSbuild MD: missing random number items in nwtc library (needed by SS)
andrew-platt Jun 17, 2025
46426c7
VSbuild SS,HD,MD: move random number source code to separate location
andrew-platt Jun 17, 2025
2627718
GH deploy: attempt to check if `devenv` actually works
andrew-platt Jun 18, 2025
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
1 change: 1 addition & 0 deletions .github/scripts/build_windows_executables.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ devenv vs-build/MoorDyn/MoorDynDriver.sln /Build "Release|x64"
devenv vs-build/MoorDyn_c_binding/MoorDyn_c_binding.sln /Build "Release|x64"
devenv vs-build/FAST/FAST.sln /Build "Release|x64"
devenv vs-build/SeaState/SeaStateDriver.sln /Build "Release|x64"
devenv vs-build/SeaState_c_binding/SeaState_c_binding.sln /Build "Release|x64"
devenv vs-build/SimpleElastoDyn/SimpleElastoDyn_Driver.sln /Build "Release|x64"
devenv vs-build/SubDyn/SubDyn.sln /Build "Release|x64"
devenv vs-build/TurbSim/TurbSim.vfproj /Build "Release|x64"
Expand Down
13 changes: 13 additions & 0 deletions .github/scripts/windows_devenv_test.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@REM Check if devenv actually works
for /f "usebackq tokens=1* delims=: " %%i in (`"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest`) do (
if /i "%%i"=="productPath" set devenv=%%j
)

@REM above command finds devenv.exe, but that opens the VS instance. We need the devenv.com version
set devenv=%devenv:devenv.exe=devenv.com%

echo Using Visual Studio: %devenv%

"%devenv%" /?

exit /b %ERRORLEVEL%
4 changes: 4 additions & 0 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ jobs:
submodules: true
fetch-depth: 0

- name: Test devenv actually works
shell: cmd
run: .github/scripts/windows_devenv_test.bat

- name: Install Intel oneAPI BaseKit (Windows)
shell: cmd
env:
Expand Down
16 changes: 8 additions & 8 deletions vs-build/HydroDyn/HydroDynDriver.vfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,8 @@
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\nwtc-library\src\NWTC_RandomNumber.f90">
<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Str.f90"/>
<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Release_Double|Win32">
Expand All @@ -454,8 +455,7 @@
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Str.f90"/>
<File RelativePath="..\..\modules\nwtc-library\src\SingPrec.f90">
<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Release_Double|Win32">
Expand All @@ -472,7 +472,9 @@
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\nwtc-library\src\SysIVF.f90">
<File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
<Filter Name="Random number">
<File RelativePath="..\..\modules\nwtc-library\src\NWTC_RandomNumber.f90">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Release_Double|Win32">
Expand All @@ -488,8 +490,7 @@
<FileConfiguration Name="Release_Double|x64">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File></Filter>
<Filter Name="RanLux">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\nwtc-library\src\ranlux\RANLUX.f90">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFFortranCompilerTool" StandardWarnings="standardWarningsNone" WarnDeclarations="false" WarnUnusedVariables="false"/></FileConfiguration>
Expand All @@ -506,8 +507,7 @@
<FileConfiguration Name="Release_Double|x64">
<Tool Name="VFFortranCompilerTool" StandardWarnings="standardWarningsNone" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFFortranCompilerTool" StandardWarnings="standardWarningsNone" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
<Tool Name="VFFortranCompilerTool" StandardWarnings="standardWarningsNone" WarnUnusedVariables="false"/></FileConfiguration></File></Filter>
<Filter Name="SeaState">
<Filter Name="RegistryFiles">
<File RelativePath="..\..\modules\SeaState\src\Current.txt">
Expand Down
7 changes: 4 additions & 3 deletions vs-build/HydroDyn_c_binding/HydroDyn_c_binding.vfproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File></Filter>
<File RelativePath="..\..\modules\HydroDyn\src\Conv_Radiation.f90"/>
<File RelativePath="..\..\modules\HydroDyn\src\HydroDyn.f90"/>
<File RelativePath="..\..\modules\hydrodyn\src\HydroDyn_C_Binding.f90"/>
<File RelativePath="..\..\modules\HydroDyn\src\HydroDyn_Input.f90"/>
<File RelativePath="..\..\modules\HydroDyn\src\HydroDyn_Output.f90"/>
<File RelativePath="..\..\modules\HydroDyn\src\Morison.f90"/>
Expand Down Expand Up @@ -263,11 +262,12 @@
<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Library.f90"/>
<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Num.f90"/>
<File RelativePath="..\..\modules\nwtc-library\src\NWTC_Str.f90"/>
<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"/>
<File RelativePath="..\..\modules\nwtc-library\src\VTK.f90"/></Filter>
<Filter Name="Random Number">
<File RelativePath="..\..\modules\nwtc-library\src\NWTC_RandomNumber.f90"/>
<File RelativePath="..\..\modules\nwtc-library\src\ranlux\RANLUX.f90"/></Filter>
<Filter Name="SeaState">
<Filter Name="RegistryFiles">
<File RelativePath="..\..\modules\SeaState\src\Current.txt">
Expand Down Expand Up @@ -382,5 +382,6 @@
<File RelativePath="..\..\modules\SeaState\src\UserWaves.f90"/>
<File RelativePath="..\..\modules\SeaState\src\Waves.f90"/>
<File RelativePath="..\..\modules\SeaState\src\Waves2.f90"/></Filter>
<File RelativePath="..\..\modules\hydrodyn\src\HydroDyn_C_Binding.f90"/>
<File RelativePath="..\..\modules\version\src\VersionInfo.f90"/></Filter></Files>
<Globals/></VisualStudioProject>
Loading