swtich awicm3-v3.4 candidate to fesom2.6.1 and rename candidate from …

…3.3 to 3.4
esm-tools · Oct 21, 2024 · 014f218 · 014f218
1 parent 7444e9e
commit 014f218
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/configs/components/fesom/fesom-2.6.yaml b/configs/components/fesom/fesom-2.6.yaml
@@ -24,9 +24,10 @@ required_plugins:
 
 choose_version:
   "2.6":
-    branch: "2.6"
+    branch: "2.6.1"
 
   "2.6-paleodyn":
+    branch: "2.6.1"
     wiso_code: true
     icb_code: true
     namelist_dir: "${model_dir}/config/"
@@ -494,11 +495,11 @@ choose_lresume:
 
 bin_in_work:
         bin: "${executable}"
-        lib: "lib/fesom/*"
+        lib: "lib/fesom/libfesom.so"
 
 bin_sources:
         bin: "${bin_dir}/${comp_executable}"
-        lib: "${fesom.model_dir}/build/lib/*"
+        lib: "${fesom.model_dir}/build/lib/libfesom.so"
 
 
 

diff --git a/...m-2.5-refactoring+oifs-48r1+xios-2.5.yaml → ...ios-2.5/fesom-2.6+oifs-48r1+xios-2.5.yaml b/...m-2.5-refactoring+oifs-48r1+xios-2.5.yaml → ...ios-2.5/fesom-2.6+oifs-48r1+xios-2.5.yaml
@@ -2,7 +2,7 @@ components:
 - xios-2.5-ece
 - rnfmap-v1.0
 - oifs-48r1
-- fesom-2.5-refactoring
+- fesom-2.6
 - oasis3mct-5.0-smhi
 coupling_changes:
 - sed -i 's/xios-2.5+/xios/g' oifs-48r1/bundle.yml

diff --git a/configs/setups/awicm3/awicm3.yaml b/configs/setups/awicm3/awicm3.yaml
@@ -118,7 +118,7 @@ general:
           v3.4:
             major_version: v3.4
             couplings:
-            - fesom-2.5-refactoring+oifs-48r1+xios-2.5
+            - fesom-2.6+oifs-48r1+xios-2.5
             add_include_models:
             - xios
             add_further_reading:
@@ -519,8 +519,7 @@ fesom:
                                                 albi: 0.6
                                                 albim: 0.43
                 "v3.4":
-                        version: "2.5"
-                        namelist_dir: "${esm_namelist_dir}/fesom2/2.5/awicm3/v3.2/"
+                        version: "2.6"
                         append_icmcl: ""
                         add_namelist_changes:
                                 namelist.config:

diff --git a/runscripts/awicm3/v3.4/awicm3-v3.4-levante-TCO95L91-CORE2_1d.yaml b/runscripts/awicm3/v3.4/awicm3-v3.4-levante-TCO95L91-CORE2_1d.yaml
@@ -27,7 +27,7 @@ fesom:
     time_step: 1800
     nproc: 128
     tar_binary_restarts: true
-    namelist_dir: "/work/ab0246/a270092/model_codes/awicm3-v3.4/fesom-2.5/config/"
+    namelist_dir: "/work/ab0246/a270092/model_codes/awicm3-v3.4/fesom-2.6/config/"
 
 oifs:
     resolution: "TCO95"