Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
033b3e8
Merge pull request #4 from nikhar-abbas/master
Jul 5, 2019
39f2c76
Update DISCON.IN
Jul 5, 2019
3cbd781
Update DISCON.IN
Jul 5, 2019
dffc519
Updated binaries
Jul 24, 2019
9a5fe1c
Merge branch 'master' of https://github.com/nikhar-abbas/DRC_Fortran
nikhar-abbas Sep 16, 2019
08ba4ab
Re-org
nikhar-abbas Sep 16, 2019
00b08ce
Include SetpointSmoother - hard coded
nikhar-abbas Sep 17, 2019
28908df
Call SetpointSmoother
nikhar-abbas Sep 17, 2019
ba3c4da
Reorg to compile Filters first
nikhar-abbas Sep 17, 2019
677790f
Comment updates
nikhar-abbas Sep 18, 2019
a4eb203
Include SS_DelOmegaF in LocalVar
nikhar-abbas Sep 18, 2019
e4e0c3c
Comment updates
nikhar-abbas Sep 18, 2019
a65d967
Include ControllerBlocks module
nikhar-abbas Sep 18, 2019
f009b17
Comment cleanup
nikhar-abbas Sep 18, 2019
d1af1f3
Comment updates
nikhar-abbas Sep 18, 2019
8b13796
Introduce pitch controller flag
nikhar-abbas Sep 18, 2019
66b1f84
Implement setpoint smoothing
nikhar-abbas Sep 18, 2019
9f410b7
Note as OUTDATED. Note: Fix to be same as NREL5MW
nikhar-abbas Sep 19, 2019
67fe9ba
Include PC_ControlMode
nikhar-abbas Sep 19, 2019
c7856d7
Include setpoint smoother in input file
nikhar-abbas Sep 19, 2019
118bfdf
Update binaries
nikhar-abbas Sep 19, 2019
28f729f
Add setpoint smoother inputs
nikhar-abbas Sep 19, 2019
a5d6748
Comment cleanup
nikhar-abbas Sep 19, 2019
34b09f3
Comment cleanup
nikhar-abbas Sep 19, 2019
e1d77da
Comment Cleanup
nikhar-abbas Sep 19, 2019
593e30a
Comment Cleanup
nikhar-abbas Sep 19, 2019
cc017f8
Add filtered hub wind speed option to wind speed estimator
nikhar-abbas Sep 19, 2019
e68a2ee
Debug wind speed estimator
nikhar-abbas Sep 19, 2019
066b118
Comment Cleanup
nikhar-abbas Sep 20, 2019
91b0fd0
Update binaries
nikhar-abbas Sep 20, 2019
cfa8efe
Cleanup for clarity
nikhar-abbas Sep 20, 2019
f59093e
WE_CornerFreq update
nikhar-abbas Sep 20, 2019
44cb23a
Cleanup
nikhar-abbas Sep 20, 2019
9ee1c1b
Comment Updates
nikhar-abbas Sep 20, 2019
67b3856
Cleanup for clarity
nikhar-abbas Sep 20, 2019
4d9f4d5
Include TSR tracking VS torque controller
nikhar-abbas Sep 20, 2019
1ca7f47
Comment cleanup
nikhar-abbas Sep 20, 2019
f32cf39
Debug TSR tracking controller
nikhar-abbas Sep 20, 2019
b2e9d02
Saturate torque controller at rated torque
nikhar-abbas Sep 20, 2019
dc86fe1
Update wind speed filter cornering freq
nikhar-abbas Sep 20, 2019
b99a486
Update binaries - still need SOME tuning
nikhar-abbas Sep 20, 2019
9c3acfe
Comment updates
nikhar-abbas Sep 23, 2019
26d91e8
Merge branch 'dev_TorquePI'
nikhar-abbas Sep 23, 2019
aa48706
Include matrix inverse and identity matrix, functions
nikhar-abbas Sep 24, 2019
4461993
Add EKF wind speed estimator - stable, but poor
nikhar-abbas Sep 24, 2019
60cfaf9
Add degrees to radians
nikhar-abbas Sep 25, 2019
1f111a3
Use updated Cp Lookup force real numbers
nikhar-abbas Sep 25, 2019
7cf4280
Read Cp data from input file
nikhar-abbas Sep 25, 2019
4a87292
Update to use PerfData
nikhar-abbas Sep 25, 2019
cb2b93f
Add CpData for NREL 5MW
nikhar-abbas Sep 25, 2019
a53f95c
Comment updates
nikhar-abbas Sep 25, 2019
fb336d5
Algorithm update
nikhar-abbas Sep 25, 2019
e559e9a
Comment Updates
nikhar-abbas Sep 25, 2019
0fac735
Update binaries
nikhar-abbas Sep 25, 2019
26d3117
Include Peak Shaving
nikhar-abbas Sep 25, 2019
3f4b5e0
Code Reorg
nikhar-abbas Sep 26, 2019
7dc12fa
Parameter updates
nikhar-abbas Sep 26, 2019
5b2bdd7
Update binaries
nikhar-abbas Sep 26, 2019
82daa5f
Move peak shaving to ControllerBlocks
nikhar-abbas Sep 27, 2019
5b4c8bc
Use ControllerBlocks
nikhar-abbas Sep 27, 2019
b68998b
Include towertop motion
nikhar-abbas Sep 27, 2019
f784ae4
Comment Updates
nikhar-abbas Sep 27, 2019
580cb7b
Update binaries
nikhar-abbas Sep 27, 2019
1786a4a
ignore .DS_Store
nikhar-abbas Sep 27, 2019
5cb37e1
Merge branch 'dev_PeakShaving'
nikhar-abbas Sep 27, 2019
8673f3c
Parameter updates
nikhar-abbas Oct 8, 2019
e9c7f74
Cleanup Peak Shaving
nikhar-abbas Oct 8, 2019
0ba7479
Rate limit pitch signal
nikhar-abbas Oct 8, 2019
fac36d7
Use previous pitch command instead of avrSWAP
nikhar-abbas Oct 8, 2019
cdfedc0
Update binaries
nikhar-abbas Oct 8, 2019
ad89ebf
Normalize DelOmega
nikhar-abbas Oct 18, 2019
736e023
Saturate at VS_RefSpd, Initialize Torque
nikhar-abbas Oct 18, 2019
2a24127
Debug Setpoint Smoother
nikhar-abbas Oct 18, 2019
fbb697f
Update binaries
nikhar-abbas Oct 18, 2019
b9d67a5
Cleanup
nikhar-abbas Oct 22, 2019
20ec624
Include NREL5MW Performance Tables
nikhar-abbas Oct 22, 2019
fc99bbc
Delete some and rename other files
rafmudaf Oct 24, 2019
f64f568
Add initial CMakeLists
rafmudaf Oct 24, 2019
8c6b5bf
Contain Fortran .mod files in a single directory
rafmudaf Oct 24, 2019
ec920f0
Update gitignore for cmake build dir
nikhar-abbas Oct 28, 2019
8417059
Rename to ROSCO, update commenting
nikhar-abbas Oct 30, 2019
a8ada99
Rename DRC_Types to ROSCO_Types
nikhar-abbas Oct 30, 2019
982d276
Update compiler flags
nikhar-abbas Oct 30, 2019
d67b643
Update for ROSCO
nikhar-abbas Oct 30, 2019
6a7a895
Update compile instructions
nikhar-abbas Oct 30, 2019
e7d8258
Update referencing
nikhar-abbas Oct 30, 2019
9a44756
Include information to run controller
nikhar-abbas Oct 30, 2019
746caab
Fix links
nikhar-abbas Oct 30, 2019
9986047
Update disclaimer
nikhar-abbas Oct 30, 2019
52f1615
Update Acknowledgments
nikhar-abbas Oct 30, 2019
04aa1ca
Cleanup
nikhar-abbas Oct 30, 2019
ec8c3a6
Clarity for DISCON.IN use
nikhar-abbas Oct 31, 2019
c0cde02
Update parameter files for new controller updates
nikhar-abbas Oct 31, 2019
d784ffa
Update for windows
nikhar-abbas Oct 31, 2019
cae59de
Update disclaimer
nikhar-abbas Nov 4, 2019
2e26ece
Develop stage disclaimer
nikhar-abbas Nov 4, 2019
6554ecd
Rename to have capital F, force preprocessor
nikhar-abbas Nov 5, 2019
d393256
Free form for gfortran
nikhar-abbas Nov 5, 2019
20168d4
Merge pull request #6 from nikhar-abbas/master
Nov 5, 2019
3573ae3
Update Acknowledgments
nikhar-abbas Nov 5, 2019
8f2ce83
Merge pull request #7 from nikhar-abbas/develop
Nov 5, 2019
32ae97d
Fix initial bld pitch bug
nikhar-abbas Nov 5, 2019
524270f
Added Visual studio project files, corrected double !DEC attributes line
Nov 6, 2019
2f0f2fb
Read avrswap pitch signal for numerical stability
nikhar-abbas Nov 6, 2019
70c8721
Update Parameters - VS_Rgn2K bug
nikhar-abbas Nov 7, 2019
112ae00
PitCom for numerical stability, actually...
nikhar-abbas Nov 8, 2019
2d05649
Sort out actuator ICs
nikhar-abbas Nov 8, 2019
c7bbbda
Update acknowledgments
nikhar-abbas Nov 8, 2019
bc7848a
Update parameter file
nikhar-abbas Nov 8, 2019
087ae5a
Merge pull request #8 from nikhar-abbas/develop
Nov 11, 2019
902746a
.gitignore update
Nov 11, 2019
b17fc2f
Add Shutdown Mode
nikhar-abbas Nov 11, 2019
450e3f7
Merge remote-tracking branch 'DRC/master' into develop
nikhar-abbas Nov 11, 2019
e0184db
Merge remote-tracking branch 'DRC/development_ROSCO' into develop
nikhar-abbas Nov 11, 2019
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Source/Obj_lin64
*.mod
Source/x64/
Source/Release/
Build/

# Archive
Scripts/CompileDISCONHereCopyRun\.cmd
Expand All @@ -16,4 +17,6 @@ Scripts/CompileDISCONHereCopyRun\.cmd

# Temp Files
*~
*.u2d
.DS_Store
*.u2d
30 changes: 30 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

cmake_minimum_required(VERSION 3.6)
project(DRC_Fortran VERSION 0.1 LANGUAGES Fortran)

set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/ftnmods")

# Sets the optimization level to -O2 and includes -g
set(CMAKE_BUILD_TYPE "RelWithDebInfo")

# Enable .dll export
if(APPLE OR UNIX)
if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DIMPLICIT_DLLEXPORT ")
else()
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DIMPLICIT_DLLEXPORT -ffree-line-length-0")
endif()
endif()

set(SOURCES
src/Constants.f90
src/ControllerBlocks.f90
src/Controllers.f90
src/DISCON.F90
src/ROSCO_Types.f90
src/Filters.f90
src/Functions.f90
src/ReadSetParameters.f90
)

add_library(discon SHARED ${SOURCES})
10 changes: 5 additions & 5 deletions Source/DISCON.sln → DISCON.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "DISCON", "DISCON.vfproj", "{1EDB6BC1-C5C9-4E4F-8785-31B8143FCBC6}"
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "DISCON", "DISCON.vfproj", "{CC29A9F7-BDAD-4A60-B1FC-5D016BD853E4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1EDB6BC1-C5C9-4E4F-8785-31B8143FCBC6}.Release|x64.ActiveCfg = Release|x64
{1EDB6BC1-C5C9-4E4F-8785-31B8143FCBC6}.Release|x64.Build.0 = Release|x64
{1EDB6BC1-C5C9-4E4F-8785-31B8143FCBC6}.Release|x86.ActiveCfg = Release|Win32
{1EDB6BC1-C5C9-4E4F-8785-31B8143FCBC6}.Release|x86.Build.0 = Release|Win32
{CC29A9F7-BDAD-4A60-B1FC-5D016BD853E4}.Release|x64.ActiveCfg = Release|x64
{CC29A9F7-BDAD-4A60-B1FC-5D016BD853E4}.Release|x64.Build.0 = Release|x64
{CC29A9F7-BDAD-4A60-B1FC-5D016BD853E4}.Release|x86.ActiveCfg = Release|Win32
{CC29A9F7-BDAD-4A60-B1FC-5D016BD853E4}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
59 changes: 59 additions & 0 deletions DISCON.vfproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject ProjectType="typeDynamicLibrary" ProjectCreator="Intel Fortran" Keyword="Dll" Version="11.0" ProjectIdGuid="{CC29A9F7-BDAD-4A60-B1FC-5D016BD853E4}">
<Platforms>
<Platform Name="Win32"/>
<Platform Name="x64"/></Platforms>
<Configurations>
<Configuration Name="Debug|Win32" ConfigurationType="typeDynamicLibrary">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnInterfaces="true" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemWindows" LinkDLL="true"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Release|Win32" OutputDirectory="build\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="build\$(PlatformName)\$(ConfigurationName)" ConfigurationType="typeDynamicLibrary">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" RuntimeLibrary="rtMultiThreadedDLL"/>
<Tool Name="VFLinkerTool" SuppressStartupBanner="true" SubSystem="subSystemWindows" LinkDLL="true"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Debug|x64" ConfigurationType="typeDynamicLibrary">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" WarnInterfaces="true" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemWindows" LinkDLL="true"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Release|x64" OutputDirectory="build\$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="build\$(PlatformName)\$(ConfigurationName)" ConfigurationType="typeDynamicLibrary">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" RuntimeLibrary="rtMultiThreadedDLL"/>
<Tool Name="VFLinkerTool" SuppressStartupBanner="true" SubSystem="subSystemWindows" LinkDLL="true"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
<Files>
<Filter Name="Header Files" Filter="fi;fd;h;inc"/>
<Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
<Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
<File RelativePath=".\src\Constants.f90"/>
<File RelativePath=".\src\ControllerBlocks.f90"/>
<File RelativePath=".\src\Controllers.f90"/>
<File RelativePath=".\src\DISCON.F90"/>
<File RelativePath=".\src\Filters.f90"/>
<File RelativePath=".\src\Functions.f90"/>
<File RelativePath=".\src\ReadSetParameters.f90"/>
<File RelativePath=".\src\ROSCO_Types.f90"/></Filter></Files>
<Globals/></VisualStudioProject>
Binary file removed DISCON/DISCON_glin64.so
Binary file not shown.
84 changes: 0 additions & 84 deletions Parameter_files/DTU10MW/DISCON.IN

This file was deleted.

Loading