coupling added and changes for including recom

configs/components/fesom/fesom-2.6.yaml

@@ -31,6 +31,21 @@ choose_version:
     wiso_code: true
     icb_code: true
     namelist_dir: "${model_dir}/config/"
+
+  "2.6-recom":
+    branch: "fesom2.6_recom_tp"
+    choose_general.setup_name:
+        fesom:
+            destination: "fesom-2.6-recom"
+    wiso_code: false
+    icb_code: false
+    namelist_dir: "${model_dir}/config/"
+    nproc: 1024
+    with_recom: true
+    include_models: ["recom"]
+    fesom_Dflags: "-DRECOM_COUPLED=ON"
+    #    mpi_num_groups: 1 #YY: only needed if using tracer parallelisation (usetp)
+
 destination: "fesom-2.6"
 install_bins: bin/fesom.x
 git-repository:
@@ -612,6 +627,31 @@ choose_with_wiso:
                         "[[wiso_fields-->FIELD]]":
                                 grid: feom
 
+choose_fesom.with_recom:
+    True:
+        add_config_sources:
+            tra:    "${namelist_dir}/namelist.tra.recom${namelist_ciso_sufix}"
+            io:     "${namelist_dir}/namelist.io.recom${namelist_ciso_sufix}"
+        remove_namelist_changes.namelist.config: [inout]
+        add_namelist_changes:
+            namelist.config:
+                restart_log:
+                    restart_length: "${restart_rate}"
+                    restart_length_unit: "${restart_unit}"
+                #run_config: #YY:TODO: new flag use_tp to switch on tracer parallelisation needed
+                    #num_fesom_groups: "${mpi_num_groups}"
+
+        # use_ciso switch
+        # ---------------
+        # num_tracers only changed if ``with_recom: true``, i.e. indentation)
+        #YY: ciso currently only combined with 2p1z1d, num_tracers not needed anymore
+        choose_recom.use_ciso:
+                True:
+                        namelist_ciso_sufix: ".ciso"
+                        #num_tracers: 33
+                False:
+                        namelist_ciso_sufix: ""
+                        #num_tracers: 24
 
 grids:
         feom:

configs/components/recom/recom.yaml

@@ -169,7 +169,6 @@ choose_scenario:
                 lastyearoffesomcycle: "${l_year_fesom_cycle}"
                 numofCO2cycles: "${num_CO2_cycles}"
                 currentCO2cycle: "${current_CO2_cycle}"
-#4.7.22 Ying: to use a different namelist.recom for LGM
         lgm:
                 namelist_sce: ".lgm"
         "*":
@@ -236,22 +235,22 @@ config_in_work:
 restart_name: ""
 
 restart_in_files:
-        bio_restart: bio_restart
+        par_oce_restart: par_bio_restart        
 
 restart_in_in_work:
-        bio_restart: fesom.${parent_date!syear}.bio.${restart_name}nc
+        par_bio_restart: fesom.${parent_date!syear}.bio.restart/*.nc
 
 restart_in_sources:
-        bio_restart: fesom.${parent_date!syear}.bio.nc
+        par_bio_restart: fesom.${parent_date!syear}.bio.restart/*.nc
 
 restart_out_files:
-        bio_restart: bio_restart
+        par_bio_restart: par_bio_restart
 
 restart_out_in_work:
-        bio_restart: fesom.${end_date!syear}.bio.${restart_name}nc
+        par_bio_restart: fesom.${end_date!syear}.bio.restart/*.nc
 
 restart_out_sources:
-        bio_restart: fesom.${end_date!syear}.bio.nc
+        par_bio_restart: fesom.${end_date!syear}.bio.restart/*.nc
 
 choose_computer.name:
         blogin:

configs/couplings/fesom2.6_recom_tp+echam-6.3.05p2-awiesm-2.1+recom-2.0/fesom2.6_recom_tp+echam-6.3.05p2-awiesm-2.1+recom-2.0.yaml

@@ -0,0 +1,9 @@
+components:
+- echam-6.3.05p2-awiesm-2.1
+- fesom-2.6-recom
+- oasis3mct-2.8-paleodyn-multi-group-support  
+#- oasis3mct-2.8-paleodyn
+coupling_changes:
+- sed -i '/set(FESOM_COUPLED/s/OFF/ON/g' fesom-2.6/CMakeLists.txt
+- sed -i '/ECHAM6_COUPLED/s/OFF/ON/g' echam-6.3.05p2/config/mh-linux
+- sed -ir '/..FC_DEFINE}__cpl_mpiom/s/..FC_DEFINE}__cpl_mpiom//g' echam-6.3.05p2/configure.ac