Merge branch 'gotm-model:master' into fabm_calendar_year

Author: knutaros

.github/workflows/gotm.yml

@@ -3,38 +3,38 @@ on: push
 jobs:
   gfortran:
     strategy:
-        matrix:
-          version: [9, 10, 11, 12]
-          os: ["ubuntu-latest"]
-          include:
-              - version: 7
-                os: ubuntu-20.04
-              - 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
+      matrix:
+        version: [9, 10, 11, 12]
+        os: ["ubuntu-latest"]
+        include:
+          #- version: 7
+          #os: ubuntu-20.04
+          #- 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 }}
     steps:
-    - name: Install compiler
-      run: |
+      - name: Install compiler
+        run: |
           sudo apt-get update
           sudo apt-get install gfortran-${{ matrix.version }}
-    - name: Clone gotm
-      uses: actions/checkout@v4
-      with:
+      - name: Clone gotm
+        uses: actions/checkout@v4
+        with:
           path: gotm
           submodules: recursive
-    - name: Clone gotm-cases
-      uses: actions/checkout@v4
-      with:
+      - name: Clone gotm-cases
+        uses: actions/checkout@v4
+        with:
           path: cases
           repository: gotm-model/cases
-    - name: Build and run all test cases
-      run: python3 cases/scripts/run_all.py --show_logs --gotm_base=gotm --exclude plume --compiler=gfortran-${{ matrix.version }} -DGOTM_USE_STIM=ON -DGOTM_USE_SEAGRASS=ON -DGOTM_USE_NetCDF=OFF ${{ matrix.cmake_args }}
+      - name: Build and run all test cases
+        run: python3 cases/scripts/run_all.py --show_logs --gotm_base=gotm --exclude plume --compiler=gfortran-${{ matrix.version }} -DGOTM_USE_STIM=ON -DGOTM_USE_SEAGRASS=ON -DGOTM_USE_NetCDF=OFF ${{ matrix.cmake_args }}
   conda-forge:
     strategy:
       fail-fast: false
@@ -45,22 +45,22 @@ jobs:
         shell: bash -el {0}
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: conda-incubator/setup-miniconda@v3
-      with:
-        auto-update-conda: true
-    - name: Clone gotm
-      uses: actions/checkout@v4
-      with:
+      - uses: conda-incubator/setup-miniconda@v3
+        with:
+          auto-update-conda: true
+      - name: Clone gotm
+        uses: actions/checkout@v4
+        with:
           submodules: recursive
-    - name: Install conda packages (Linux, Mac)
-      if: matrix.os != 'windows-latest'
-      run: conda install -c conda-forge fortran-compiler netcdf-fortran
-    - name: Install conda packages (Windows)
-      if: matrix.os == 'windows-latest'
-      run: |
-        conda install -c conda-forge m2w64-gcc-fortran m2w64-make netcdf-fortran
-        echo "CMAKE_GENERATOR=MinGW Makefiles" >> "$GITHUB_ENV"
-    - name: build
-      run: |
-        cmake -B build -S . -DGOTM_USE_STIM=ON -DGOTM_USE_SEAGRASS=ON -DCMAKE_BUILD_TYPE=Release
-        cmake --build build --config Release
+      - name: Install conda packages (Linux, Mac)
+        if: matrix.os != 'windows-latest'
+        run: conda install -c conda-forge fortran-compiler netcdf-fortran
+      - name: Install conda packages (Windows)
+        if: matrix.os == 'windows-latest'
+        run: |
+          conda install -c conda-forge m2w64-gcc-fortran m2w64-make netcdf-fortran
+          echo "CMAKE_GENERATOR=MinGW Makefiles" >> "$GITHUB_ENV"
+      - name: build
+        run: |
+          cmake -B build -S . -DGOTM_USE_STIM=ON -DGOTM_USE_SEAGRASS=ON -DCMAKE_BUILD_TYPE=Release
+          cmake --build build --config Release

src/extras/seagrass/seagrass.F90

@@ -35,6 +35,7 @@ module seagrass
 !  Original author(s): Hans Burchard & Karsten Bolding
 !
    REALTYPE, dimension(:), allocatable :: exc,vfric,grassz,xxP
+   integer                   :: method
    character(len=PATH_MAX)   :: grassfile='seagrass.dat'
    REALTYPE                  :: alpha
    integer                   :: grassind
@@ -75,7 +76,7 @@ subroutine init_seagrass()
 
 
    branch => settings_store%get_typed_child('seagrass','calculate seagrass effect on turbulence')
-   call branch%get(i, 'method', '', options=(/option(0, 'off'), option(1, 'from file')/), default=0)
+   call branch%get(method, 'method', '', options=(/option(0, 'off'), option(1, 'from file')/), default=0)
    call branch%get(grassfile, 'file', 'path to file with grass specifications', default='seagrass.dat')
    call branch%get(alpha, 'alpha', 'efficiency of leafes turbulence production', '',default=0._rk)
 

src/gotm/print_version.F90

@@ -63,6 +63,9 @@ subroutine print_version()
 #ifdef _CVMIX_
    LEVEL0 'CVMix:   included'
 #endif
+#ifdef _SEAGRASS_
+   LEVEL0 'Seagrass:included'
+#endif
 #ifdef NETCDF_FMT
    LEVEL0 'NetCDF:  ',trim(NF90_INQ_LIBVERS())
 #endif