Skip to content

Commit

Permalink
Merge branch 'dev' into f/EnvisionAeroMerge
Browse files Browse the repository at this point in the history
  • Loading branch information
@bjonkman
bjonkman committed Jul 16, 2024
2 parents 9bb6e86 + 180ac35 commit 5cfb5ba
Showing 1 changed file with 1 addition and 86 deletions.
87 changes: 1 addition & 86 deletions vs-build/FASTlib/FASTlib.vfproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,92 +462,7 @@
<File RelativePath="..\..\modules\aerodyn\src\BEMTUncoupled.f90"/>
<File RelativePath="..\..\modules\aerodyn\src\DBEMT.f90"/>
<File RelativePath="..\..\modules\aerodyn\src\mod_root1dim.f90"/>
<File RelativePath="..\..\modules\aerodyn\src\UnsteadyAero.f90"/></Filter>
<Filter Name="AeroDyn14">
<Filter Name="DWM">
<Filter Name="RegistryFiles">
<File RelativePath="..\..\modules\aerodyn14\src\DWM_Types.f90">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Debug_Double|x64">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\aerodyn14\src\Registry-DWM.txt">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_OpenMP|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_Double|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_OpenMP|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Double|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Matlab|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_Double|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_Matlab|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Matlab|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_Matlab|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat DWM" Description="Running Registry for DWM" Outputs="..\..\modules\aerodyn14\src\DWM_Types.f90"/></FileConfiguration></File></Filter>
<File RelativePath="..\..\modules\aerodyn14\src\DWM.f90"/>
<File RelativePath="..\..\modules\aerodyn14\src\DWM_Wake_Sub_ver2.f90"/></Filter>
<Filter Name="RegistryFiles">
<File RelativePath="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration>
<FileConfiguration Name="Debug_Double|x64">
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="false"/></FileConfiguration></File>
<File RelativePath="..\..\modules\aerodyn14\src\Registry-AD14.txt">
<FileConfiguration Name="Debug_Double|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_OpenMP|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_Double|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_OpenMP|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Double|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Matlab|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_Double|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_Matlab|x64">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Debug_Matlab|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration>
<FileConfiguration Name="Release_Matlab|Win32">
<Tool Name="VFCustomBuildTool" CommandLine="CALL ..\RunRegistry.bat AeroDyn14" Description="Running Registry for AeroDyn14" Outputs="..\..\modules\aerodyn14\src\AeroDyn14_Types.f90"/></FileConfiguration></File></Filter>
<File RelativePath="..\..\modules\aerodyn14\src\AeroDyn14.f90"/>
<File RelativePath="..\..\modules\aerodyn14\src\AeroSubs.f90"/>
<File RelativePath="..\..\modules\aerodyn14\src\GenSubs.f90"/></Filter></Filter>
<File RelativePath="..\..\modules\aerodyn\src\UnsteadyAero.f90"/></Filter></Filter>
<Filter Name="BeamDyn">
<Filter Name="RegistryFiles">
<File RelativePath="..\..\modules\beamdyn\src\BeamDyn_Types.f90">
Expand Down

0 comments on commit 5cfb5ba

Please sign in to comment.