Merge branch 'master' of github.com:fabm-model/fabm into part_of_state

Author: jornbr

.github/workflows/add-release-assets.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Python dependencies
         run: python -m pip install git-archive-all
       - name: Clone fabm-plus
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: fabm-model/fabm-plus
           submodules: recursive

.github/workflows/fabm.yml

@@ -45,7 +45,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install gfortran-${{ matrix.version }}
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Run all test cases with host emulators
@@ -70,7 +70,7 @@ jobs:
       - name: Install compiler and Python dependencies
         run: conda install gfortran_linux-64=${{ matrix.version }} pip pyyaml
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Run all test cases with host emulators
@@ -113,7 +113,7 @@ jobs:
           wget --no-verbose ${{ matrix.url_dir }}/l_fortran-compiler_p_${{ matrix.version }}_offline.sh
           /bin/sh l_fortran-compiler_p_${{ matrix.version }}_offline.sh -a --silent --cli --install-dir ${HOME}/intel --eula accept
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Run all test cases with host emulators
@@ -161,7 +161,7 @@ jobs:
           wget --no-verbose ${{ matrix.url_dir }}/${{ matrix.version }}_offline.sh
           /bin/sh ${{ matrix.version }}_offline.sh -a --silent --cli --install-dir ${HOME}/intel --eula accept
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Run all test cases with host emulators
@@ -223,7 +223,7 @@ jobs:
           NVHPC_INSTALL_DIR: /home/runner/nvhpc
           NVHPC_INSTALL_TYPE: single
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Run all test cases with host emulators
@@ -264,7 +264,7 @@ jobs:
           rm aocc-compiler-${{ matrix.version }}.tar
           ./aocc-compiler-${{ matrix.version }}/install.sh
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Run all test cases with host emulators
@@ -299,7 +299,7 @@ jobs:
       - name: Install Python dependencies
         run: conda install -c conda-forge pyyaml flang>=19.0 ninja c-compiler
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Run all test cases with host emulators
@@ -324,7 +324,7 @@ jobs:
         shell: bash -el {0}
     steps:
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Set up Python ${{ matrix.python-version }} with conda
@@ -375,11 +375,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install libnetcdff-dev
       - name: Clone FABM
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Clone GOTM
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: gotm-model/code
           ref: v6.0
@@ -398,7 +398,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone FABM
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Download and extract cmake
@@ -414,7 +414,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone FABM
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Install Ninja
@@ -433,7 +433,7 @@ jobs:
         shell: bash -el {0}
     steps:
       - name: Clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Set up Python with conda

src/test/host.F90

@@ -208,6 +208,7 @@ program test_host
    integer :: ntest = -1
    logical :: no_mask = .false.
    logical :: no_diag = .false.
+   real(rke) :: dt = 1._rke
 
 #if _FABM_DIMENSION_COUNT_>0
    i__ = 50
@@ -259,6 +260,10 @@ program test_host
          i = i + 1
          call get_command_argument(i, arg)
          read (arg,*) ntest
+      case ('--dt')
+         i = i + 1
+         call get_command_argument(i, arg)
+         read (arg,*) dt
       case ('-h')
          write (*,'(a)') ''
          write (*,'(a)') ''
@@ -346,7 +351,7 @@ program test_host
    ! ======================================================================
 
    call start_test('set_domain')
-   call model%set_domain(_PREARG_LOCATION_ seconds_per_time_unit=1._rke)
+   call model%set_domain(_PREARG_LOCATION_ seconds_per_time_unit=dt)
    call report_test_result()
 
    ! ======================================================================
@@ -815,7 +820,7 @@ subroutine simulate(n)
       call cpu_time(time_begin)
 
       do i = 1, n
-         call model%prepare_inputs()
+         call model%prepare_inputs(real(i, rke))
 
          _BEGIN_OUTER_HORIZONTAL_LOOP_
             flux = 0

util/developers/environment.yaml

@@ -1,4 +1,5 @@
 bottom_depth: 10
+bottom_depth_below_geoid: 10
 bottom_stress: 0.01
 cell_thickness: 10
 density: 1020