Skip to content

Commit 8f2ce83

Browse files
author
Sebastiaan Mulders
authored
Merge pull request #7 from nikhar-abbas/develop
Develop
2 parents 20168d4 + 3573ae3 commit 8f2ce83

33 files changed

+663
-1082
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Source/Obj_lin64
88
*.mod
99
Source/x64/
1010
Source/Release/
11+
Build/
1112

1213
# Archive
1314
Scripts/CompileDISCONHereCopyRun\.cmd

CMakeLists.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
cmake_minimum_required(VERSION 3.6)
3+
project(DRC_Fortran VERSION 0.1 LANGUAGES Fortran)
4+
5+
set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/ftnmods")
6+
7+
# Sets the optimization level to -O2 and includes -g
8+
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
9+
10+
# Enable .dll export
11+
if(APPLE OR UNIX)
12+
if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
13+
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DIMPLICIT_DLLEXPORT ")
14+
else()
15+
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DIMPLICIT_DLLEXPORT -ffree-line-length-0")
16+
endif()
17+
endif()
18+
19+
set(SOURCES
20+
src/Constants.f90
21+
src/ControllerBlocks.f90
22+
src/Controllers.f90
23+
src/DISCON.F90
24+
src/ROSCO_Types.f90
25+
src/Filters.f90
26+
src/Functions.f90
27+
src/ReadSetParameters.f90
28+
)
29+
30+
add_library(discon SHARED ${SOURCES})

DISCON/DISCON_glin64.so

-63.3 KB
Binary file not shown.

Parameter_files/Cp_Ct_Cq.txt

Lines changed: 0 additions & 137 deletions
This file was deleted.

Parameter_files/DTU10MW/DISCON.IN

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)