Merge pull request NREL#7 from nikhar-abbas/develop

Develop
Ben-Mertz · Nov 5, 2019 · 8f2ce83 · 8f2ce83
2 parents 20168d4 + 3573ae3
commit 8f2ce83
Show file tree

Hide file tree

Showing 33 changed files with 663 additions and 1,082 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ Source/Obj_lin64
 *.mod
 Source/x64/
 Source/Release/
+Build/
 
 # Archive
 Scripts/CompileDISCONHereCopyRun\.cmd

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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})
diff --git a/DISCON/DISCON_glin64.so b/DISCON/DISCON_glin64.so
diff --git a/Parameter_files/Cp_Ct_Cq.txt b/Parameter_files/Cp_Ct_Cq.txt
diff --git a/Parameter_files/DTU10MW/DISCON.IN b/Parameter_files/DTU10MW/DISCON.IN