Merge branch 'refactoring' into feature/cmake-improvements

.github/workflows/lumi-sync.yaml

@@ -0,0 +1,28 @@
+name: Run CICD on Lumi (using .gitlab-ci.yml)
+
+on: 
+  push:
+    branches:
+      - refactoring
+      - lumi_gpu_evatali
+
+jobs:
+  gitlabsync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Check out code"
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: "Gitlab mirror and CI"
+        uses: "tiggi/gitlab-mirror-and-ci-action@tiggi/fixes"
+        with:
+          args: "https://gitlab.com/lumi-cicd/fesom2.git"
+        env:
+          FOLLOW_TAGS: "true"
+          FORCE_PUSH: "true"
+          GITLAB_HOSTNAME: "gitlab.com"
+          GITLAB_USERNAME: "tiggi"
+          GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
+          GITLAB_PROJECT_ID: "51374059"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitlab-ci.yml

@@ -0,0 +1,12 @@
+fesom-job:
+  stage: build
+  variables:
+    SCHEDULER_PARAMETERS: "-N 1 -n 56 --mem=32G -p dev-g -t 00:30:00 -A project_462000376"
+  tags:
+    - lumi
+#  artifacts:
+#    paths:
+#      - fesom_build.log
+  script:
+    - echo "building fesom branch"
+    - bash -l configure.sh lumi

docs/getting_started/getting_started.rst

@@ -461,19 +461,20 @@ The best way to run the model locally is to use Docker container. You obviously
 
 - Get the image::
     
-    docker pull koldunovn/fesom2_test:fesom2.1
+    docker pull koldunovn/fesom2_test:refactoring2
 
 - Go to the folder with your version of fesom2 folder (NOT inside fesom2 folder, one up, the one you run ``git clone https://github.com/FESOM/fesom2.git`` in).
 - Run::
 
-    docker run -it -v "$(pwd)"/fesom2:/fesom/fesom2 koldunovn/fesom2_test:fesom2.1 /bin/bash
+    docker run -it -v "$(pwd)"/fesom2:/fesom/fesom2 koldunovn/fesom2_test:refactoring2 /bin/bash
 
 - This should get you inside the container. You now can edit the files in your fesom2 folder (on host system), but run compule and run the model inside the container.
 - When inside the container, to compile do:
 
   ::
 
     cd fesom2
+    git checkout refactoring
     bash -l configure.sh ubuntu
 
 - To prepare the run (this will do the test with pi mesh)::

src/oce_adv_tra_fct.F90

@@ -104,7 +104,7 @@ subroutine oce_tra_adv_fct(dt, ttf, lo, adf_h, adf_v, fct_ttf_min, fct_ttf_max,
 #include "associate_mesh_ass.h"
 
 !$OMP PARALLEL DEFAULT(SHARED) PRIVATE(n, nz, k, elem, enodes, num, el, nl1, nl2, nu1, nu2, nl12, nu12, edge, &
-!$OMP                          flux, ae,tvert_max, tvert_min)
+!$OMP                          flux, ae)
     ! --------------------------------------------------------------------------
     ! ttf is the tracer field on step n
     ! del_ttf is the increment