Merge pull request #531 from wdeconinck/production_DE_fixup

production_DE fixup
FESOM · Nov 10, 2023 · e8598fd · e8598fd
2 parents 220202d + 7560ab4
commit e8598fd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/fesom2.1.yml b/.github/workflows/fesom2.1.yml
@@ -21,7 +21,7 @@ jobs:
 
     - name: Git safe directory
       run: |
-        git config --global --add safe.directory /__w/fesom2/fesom2
+        git config --global --add safe.directory ${PWD}
 
     - name: Compile model (binary)
       run: |
@@ -32,16 +32,16 @@ jobs:
         export BUILD_DIR=$PWD/build.ifs_interface
         ./configure.sh ubuntu -DENABLE_IFS_INTERFACE=ON -DCMAKE_INSTALL_PREFIX=$PWD/install.ifs_interface
 
-    - name: Test downstream from /usr/local install-dir
+    - name: Test downstream from install-dir
       run: |
+        export fesom_ROOT=${PWD}
         rm -rf test_downstream/build
-        cmake -S test_downstream -B test_downstream/build -DASSERT_HAVE_IFS_INTERFACE=OFF -DASSERT_FESOM_DIR=/usr/local
+        cmake -S test_downstream -B test_downstream/build -DASSERT_HAVE_IFS_INTERFACE=OFF -DASSERT_FESOM_DIR=${fesom_ROOT}
         cmake --build test_downstream/build
         test_downstream/build/main
 
     - name: Test downstream from ifs_interface build-dir
       run: |
-        cmake --version
         export fesom_ROOT=$PWD/build.ifs_interface
         rm -rf test_downstream/build
         cmake -S test_downstream -B test_downstream/build -DASSERT_HAVE_IFS_INTERFACE=ON -DASSERT_FESOM_DIR=${fesom_ROOT}

diff --git a/.github/workflows/fesom2_openmp.yml b/.github/workflows/fesom2_openmp.yml
@@ -21,7 +21,7 @@ jobs:
 
     - name: Git safe directory
       run: |
-        git config --global --add safe.directory /__w/fesom2/fesom2
+        git config --global --add safe.directory ${PWD}
 
     - name: Compile model
       run: |

diff --git a/configure.sh b/configure.sh
@@ -2,13 +2,14 @@
 
 set -e
 
+HERE=$PWD
 SOURCE_DIR="$( cd $( dirname "${BASH_SOURCE[0]}" ) && pwd -P )"
 BUILD_DIR=${BUILD_DIR:-build}
 
 source env.sh # source this from your run script too
 mkdir -p ${BUILD_DIR} # make sure not to commit this to svn or git
 cd ${BUILD_DIR}
-cmake ${SOURCE_DIR} -DCMAKE_BUILD_TYPE=Debug ${CMAKE_ARGS} $@
+cmake ${SOURCE_DIR} -DCMAKE_INSTALL_PREFIX=$HERE -DCMAKE_BUILD_TYPE=Debug ${CMAKE_ARGS} $@
     # not required when re-compiling
     # additional cmake arguments can be passed to configure.sh
     # this also includes fesom specific options in CMakeLists, can be used as -DFESOM_COUPLED=ON

diff --git a/src/io_meandata.F90 b/src/io_meandata.F90
@@ -1735,8 +1735,6 @@ subroutine io_r2g(n, partit, mesh)
 #if defined(__MULTIO)
 SUBROUTINE send_data_to_multio(entry)
     USE iom
-    USE multio_api
-
     IMPLICIT NONE
 
     TYPE(Meandata), TARGET, INTENT(INOUT)                       :: entry