add ogs (#71)

* add ogs to optional institutes

* add quotes around CMAKE_Fortran_COMPILER_ID to support cases where it is undefined

* use ubuntu-24.04 to test gfortran-13

* test gfortran 13 and 14 only with ubuntu-24.04

.github/workflows/fabm.yml

@@ -9,7 +9,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
     strategy:
       matrix:
-        version: [9, 10, 11, 12, 13]
+        version: [9, 10, 11, 12]
         os: [ubuntu-latest]
         include:
           #- version: 4.8
@@ -24,6 +24,10 @@ jobs:
           - version: 8
             os: ubuntu-20.04
             cmake_args: -DFABM_USE_CONTIGUOUS=OFF
+          - version: 13
+            os: ubuntu-24.04
+          - version: 14
+            os: ubuntu-24.04
       fail-fast: false
     runs-on: ${{ matrix.os }}
     env:

CMakeLists.txt

@@ -55,13 +55,13 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 # Customize compiler flags
-if(${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU")
+if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
   add_compile_options(-ffree-line-length-none)
-elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
+elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Intel")
   if(WIN32)
     add_compile_options("$<$<CONFIG:DEBUG>:/Od>")
   endif()
-elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL "Cray")
+elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Cray")
   add_compile_options(-N 1023)
 endif()
 

src/CMakeLists.txt

@@ -16,6 +16,7 @@ set(DEFAULT_INSTITUTES
     msi          # Marine Systems Institute, Tallinn University of Technology, Estonia
     nersc        # Nansen Environmental and Remote Sensing Center
     niva         # Norwegian Institute for Water Research, Norway
+    ogs          # National Institute of Oceanography and Applied Geophysics - OGS, Italy
     pclake       # The PCLake model - reference implementation
     pisces       # Pelagic Interactions Scheme for Carbon and Ecosystem Studies, https://doi.org/10.5194/gmd-8-2465-2015
     pml          # Plymouth Marine Laboratory, United Kingdom
@@ -24,7 +25,7 @@ set(DEFAULT_INSTITUTES
     uhh          # University of Hamburg, Germany
 )
 
-set(OPTIONAL_INSTITUTES ersem mops pclake pisces ihamocc)
+set(OPTIONAL_INSTITUTES ersem mops pclake pisces ihamocc ogs)
 
 if(CMAKE_CURRENT_LIST_DIR STREQUAL CMAKE_SOURCE_DIR)
   message(FATAL_ERROR "Please point cmake to the top-level directory with FABM source code, not to its src subdirectory.")

src/drivers/0d/CMakeLists.txt

@@ -19,9 +19,9 @@ find_path(GOTM_BASE
 option(FABM_USE_NetCDF "Enable NetCDF output" ON)
 
 # Specify additional compiler flags
-if(${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU")
+if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
   set (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-line-length-none")
-elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
+elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Intel")
   if(WIN32)
     set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} /Od")
   endif()

src/drivers/python/CMakeLists.txt

@@ -9,7 +9,7 @@ set(BUILD_SHARED_LIBS ON)
 project(python_fabm Fortran)
 
 # Customize compiler flags
-if(${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
+if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Intel")
   if(WIN32)
     set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} /Od")
   else()