Skip to content

Commit 0ee5682

Browse files
authored
250 move fortran code to hydra ring (#279)
* remove Fortran wrapper * remove references to Fortran in sigrid config file
1 parent 4e30fd7 commit 0ee5682

28 files changed

Lines changed: 1 addition & 6129 deletions

CMakeLists.txt

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
# set minimum cmake version
22

3-
option(ENABLE_Fortran "Enable Fortran" ON)
4-
if(ENABLE_Fortran)
5-
enable_language(Fortran)
6-
else()
7-
message(STATUS "No Fortran support")
8-
endif()
9-
103
option(CODECOV "CodeCoverage on/off" OFF)
114
if (CODECOV)
125
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
13-
elseif (UNIX)
14-
cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
156
else()
16-
cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
7+
cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
178
endif()
189

1910
# project name and language
@@ -23,15 +14,13 @@ if ( NOT TARGET tools)
2314
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
2415
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
2516
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
26-
set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/modules)
2717
endif()
2818

2919
cmake_policy(SET CMP0079 NEW)
3020

3121
if(WIN32)
3222
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
3323
add_definitions(-D_USE_MATH_DEFINES)
34-
set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} /check:all")
3524

3625
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
3726
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
@@ -47,8 +36,6 @@ if (UNIX)
4736
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Werror")
4837
endif()
4938
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -Werror")
50-
set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -fcheck=bounds -fopenmp")
51-
set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fopenmp")
5239
endif (UNIX)
5340

5441
option(ENABLE_UNIT_TESTS "Enable unit tests" ON)

sigrid.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@ default_excludes: true
22
component_base_dirs:
33
- "sources/Deltares.Probabilistic"
44
- "sources/Deltares.Probabilistic.CWrapper"
5-
- "sources/Deltares.Probabilistic.FortranWrapper"
65
- "sources/Deltares.Probabilistic.Wrapper"
76
- ""
87
exclude:
98
- ".*/ASA/.*"
10-
- ".*/feedback/.*"
11-
- ".*/feedback_dll/.*"
12-
- ".*/general/.*f90"
139
- ".*/Cobyla.cpp"
1410
- ".*/rescale.cpp"
1511
- ".*/stop.cpp"
@@ -20,11 +16,6 @@ languages:
2016
test:
2117
include:
2218
- ".*sources/Deltares.Probabilistic.Test/.*[.].cpp"
23-
- name: "fortran"
24-
production:
25-
test:
26-
include:
27-
- ".*sources/Deltares.Probabilistic.FortranWrapper.Test/.*[.][fF]90"
2819
- name: "csharp"
2920
production:
3021
test:

sources/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@ endif(WIN32)
1010

1111
add_subdirectory(Deltares.Probabilistic.Test)
1212

13-
if(ENABLE_Fortran)
14-
add_subdirectory(Deltares.Probabilistic.FortranWrapper)
15-
endif()

sources/Deltares.Probabilistic.FortranWrapper/CMakeLists.txt

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

0 commit comments

Comments
 (0)