Merge branch 'feat/awicm3_v3.3_and_v3.4' of ssh://github.com/esm-tool…

…s/esm_tools into feat/awicm3_v3.3_and_v3.4

.github/workflows/esm_tools_actions_novm.yml

@@ -12,8 +12,13 @@ jobs:
           LC_ALL: en_US.UTF-8
           LANG: en_US.UTF-8
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: 
+            - "3.8"
+            - "3.9"
+            - "3.10"
+            - "3.11"
     name: Python ${{ matrix.python-version }} sample
     steps:
       - uses: actions/checkout@v2

configs/components/fesom/fesom-2.6.yaml

@@ -24,10 +24,10 @@ required_plugins:
 
 choose_version:
   "2.6":
-    branch: "2.6.1"
+    branch: "2.6.4"
 
   "2.6-paleodyn":
-    branch: "2.6.1"
+    branch: "2.6.4"
     wiso_code: true
     icb_code: true
     namelist_dir: "${model_dir}/config/"

configs/components/oasis3mct/oasis3mct.yaml

@@ -40,6 +40,7 @@ available_versions:
 - '4.0-awicm-frontiers'
 - '4.0-awicm-3.0'
 - '4.0-awicm-3.1'
+- '4.0-awicm-3.2'
 - '5.0-smhi'
 - '6.0-YAC'
 choose_version:
@@ -65,6 +66,8 @@ choose_version:
     branch: awicm3-frontiers-freeze-candidate-1
   4.0-awicm-3.1:
     branch: awicm-3.1
+  4.0-awicm-3.2:
+    branch: awicm-3.2
   4.0-awicm-frontiers:
     branch: awicm-3-frontiers
   5.0-smhi:

configs/components/oifs/oifs.yaml

@@ -189,7 +189,7 @@ choose_version:
     major_version: 43r3
   43r3-awicm-3.2:
     requires:
-    - oasis3mct-4.0-awicm-3.1
+    - oasis3mct-4.0-awicm-3.2
     branch: awicm-3.2
     comp_command: "export OIFS_TOPLEVEL_DIR=${model_dir}; export OIFS_XIOS=enable ; export OIFS_XIOS_DIR=${model_dir}/../xios ; export OIFS_XIOS_INCLUDE=-I/${model_dir}/../xios/inc/; cd make; ../fcm/bin/fcm make -v -j8 -f oifs.fcm ; chmod -R ${source_code_permissions} .; mv esm/oifs/bin/master.exe esm/oifs/bin/oifs"
     git-repository: https://gitlab.dkrz.de/ec-earth/oifs-43r3.git

configs/components/oifs/oifs43.env.yaml

@@ -301,6 +301,7 @@ compiletime_environment_changes:
       iolibraries: system_libs
       add_module_actions:
         - "load libaec/1.0.5-intel-2021.5.0"
+        - "load python3"
       add_export_vars:
 
         SZIPROOT: "/sw/spack-levante/libaec-1.0.5-gij7yv"

configs/components/oifs/oifs48.env.yaml

@@ -1,7 +1,9 @@
 # Setup up compile and runtime environment i.e. what needs
 # to be changed w.r.t the default config/machines/<computer>.yaml
 
-environment_changes:
+add_environment_changes:
+    add_module_actions:
+        - "load python3"
     add_add_add_export_vars:
             DATA: "${general.work_dir}"
             LD_LIBRARY_PATH[(3)]: '$LD_LIBRARY_PATH:${thisrun_work_dir}/lib/oifs/'
@@ -17,14 +19,10 @@ environment_changes:
             add_add_export_vars:
                 OIFS_DATA_DIR: "/p/project/chhb19/streffing1/input/oifs-48r1/"
                 MKL_CBWR: AUTO,STRICT
-            add_module_actions:
-                - "load python3"
 
         juwels:
             compiler_mpi: gnu2023_ompi2023
             iolibraries: system_libs
             add_add_export_vars:
                 MKL_CBWR: AUTO,STRICT
-            add_module_actions:
-                - "load python3"
 

configs/couplings/fesom-2.6+oifs-43r3-awicm-3.2.1+xios-2.5/fesom-2.6+oifs-43r3-awicm-3.2.1+xios-2.5.yaml → configs/couplings/fesom-2.6+oifs-43r3-awicm-3.2+xios-2.5/fesom-2.6+oifs-43r3-awicm-3.2+xios-2.5.yaml

@@ -1,9 +1,9 @@
 components:
 - xios-2.5
 - rnfmap-awicm-3.1
-- oifs-43r3-awicm-3.2.1
-- fesom-2.6
-- oasis3mct-4.0-awicm-3.1
+- oifs-43r3-awicm-3.2
+- fesom-2.6-5
+- oasis3mct-4.0-awicm-3.2
 coupling_changes:
 - sed -i '/COUPLENEMOECE = /s/.TRUE./.FALSE./g' oifs-43r3/src/ifs/module/yommcc.F90
 - sed -i '/COUPLEFESOM2 = /s/.FALSE./.TRUE./g' oifs-43r3/src/ifs/module/yommcc.F90

configs/setups/awicm3/awicm3.yaml

@@ -119,7 +119,7 @@ general:
           v3.3:
             major_version: v3.3
             couplings:
-            - fesom-2.6+oifs-43r3-awicm-3.2.1+xios-2.5
+            - fesom-2.6+oifs-43r3-awicm-3.2+xios-2.5
             add_include_models:
             - xios
             add_further_reading:

runscripts/awicm3/v3.2.2/awicm3-v3.2.2-levante-TCO95L91-CORE2.yaml

@@ -5,7 +5,7 @@ general:
     account: "ab0246"
     compute_time: "08:00:00"
     initial_date: "2000-01-01"
-    final_date: "2010-01-01"
+    final_date: "2050-01-01"
     base_dir: "/work/ab0246/${user}/runtime/${general.setup_name}-${general.version}/"
     nday: 0
     nmonth: 0
@@ -20,9 +20,9 @@ awicm3:
 
 fesom:
     resolution: "CORE2"
-    restart_rate: 10
+    restart_rate: 25
     restart_unit: "y"
-    restart_first: 10
+    restart_first: 25
     lresume: false
     time_step: 1800
     nproc: 432
@@ -41,7 +41,7 @@ oifs:
 
 oasis3mct:
     lresume: true # Set to false to generate the rst files for first leg
-    time_step: 3600
+    time_step: 7200
 
 xios:
     with_model: oifs

runscripts/awicm3/v3.2/awicm3-v3.2-levante-TCO95L91-CORE2.yaml

@@ -4,8 +4,8 @@ general:
     version: "v3.2"
     account: "ab0246"
     compute_time: "08:00:00"
-    initial_date: "1350-01-01"
-    final_date: "1400-01-01"
+    initial_date: "2000-01-01"
+    final_date: "2050-01-01"
     base_dir: "/work/ab0246/${user}/runtime/${general.setup_name}-${general.version}/"
     nday: 0
     nmonth: 0
@@ -38,13 +38,6 @@ oifs:
     time_step: 3600
     nproc: 384
     omp_num_threads: 8
-    add_namelist_changes:
-        fort.4:
-            NAERAD:
-                LCMIP6: True
-                CMIP6DATADIR: '/work/ab0246/a270092/input/oifs-43r3/cmip6-data'
-                NCMIPFIXYR: 1990
-                SSPNAME: 'historical'
 
 oasis3mct:
     lresume: true # Set to false to generate the rst files for first leg

runscripts/awiesm/v2.6/PI_dynveg_nomomix_withspp_nowiso_noiceberg.yaml

@@ -0,0 +1,78 @@
+general:
+    account: "paleodyn.paleodyn"
+    setup_name: "awiesm"
+    compute_time: "01:55:00"
+    initial_date: "5001-01-01"
+    final_date: "7999-12-31"
+    base_dir: "/albedo/work/projects/p_paleo_compute/stepanek/esm_tools_6_PlioMIP3_production/PlioMIP3_experiments/"
+    nmonth: 0
+    nyear: 1
+    use_venv: False
+    with_wiso: False
+    with_icb: False
+    clean_old_rundirs_except: 2
+    clean_old_rundirs_keep_every: 50
+    version: "2.6"
+    description: >
+      PI_dynveg for PlioMIP3; with dynamic vegetation, without momix, with spp, no stable water isotopes; new model version by Lars; for spinup, stream definitions not yet optimized for production
+
+computer:
+    mail_type: "FAIL"
+    mail_user: "[email protected]"
+
+awiesm:
+    model_dir: "/albedo/work/projects/p_paleo_compute/stepanek/esm_tools_6_PlioMIP3_production/esm_tools/model_codes/awiesm-2.6"
+
+echam:
+    lresume: 1
+    ini_parent_exp_id: "PI_251_wiso_c"
+    #fake_initial_date: "5001-01-01"
+    #ini_parent_date:  "$(( ${fake_initial_date} - ${echam.time_step}seconds ))"
+    ini_parent_date: "50001231"
+    ini_parent_dir: "/albedo/work/projects/p_paleo_compute/stepanek/esm_tools_6_PlioMIP3_production/initial_conditions/PI_251_wiso_c_from_Yuchen/echam/"
+    restart_rate: 1
+    restart_unit: "years"
+    nproca: 24
+    nprocb: 24 
+    nprocar: 0 
+    nprocbr: 0 
+    use_transient_forcing: False
+    namelist_dir: "/albedo/work/projects/p_paleo_compute/stepanek/esm_tools_6_PlioMIP3_production/namelists/namelist_spinup/echam/"
+
+jsbach:
+    namelist_dir: "/albedo/work/projects/p_paleo_compute/stepanek/esm_tools_6_PlioMIP3_production/namelists/namelist_spinup/jsbach/"
+    input_sources:
+        jsbach_1850: "${fesom.mesh_dir}/tarfiles${echam.resolution}/input/jsbach/jsbach_T63CORE2_11tiles_5layers_1850.nc"
+
+fesom:
+    res: "CORE2"
+    nproc: 384
+    mesh_dir: "/albedo/work/projects/p_paleo_compute/stepanek/esm_tools_6_PlioMIP3_production/meshes/mesh_core2/"
+    namelist_dir: "/albedo/work/projects/p_paleo_compute/stepanek/esm_tools_6_PlioMIP3_production/namelists/namelist_spinup/fesom/"
+    lresume: 1
+    ini_parent_exp_id: "PI_251_wiso_c"
+    ini_parent_date: "5000-12-31"
+    ini_parent_dir: "/albedo/work/projects/p_paleo_compute/stepanek/esm_tools_6_PlioMIP3_production/initial_conditions/PI_251_wiso_c_from_Yuchen/fesom/"
+    restart_rate: 1
+    restart_unit: "y"
+    restart_first: 1
+    namelist_changes:
+        namelist.io:
+            diag_list: 
+                ldiag_Ri: remove_from_namelist
+                ldiag_turbflux: remove_from_namelist
+        namelist.tra:
+            tracer_phys: 
+                use_momix: false
+        namelist.oce:
+            oce_dyn: 
+                spp: true
+        namelist.config:
+            paths:
+                ClimateDataPath: "/albedo/work/projects/p_paleo_compute/stepanek/esm_tools_6_PlioMIP3_production/hydrography_fromXiaoXu/"
+
+oasis3mct:
+    lresume: 1
+    ini_parent_exp_id: "PI_251_wiso_c"
+    ini_parent_date: "50001231"
+    ini_parent_dir: "/albedo/work/projects/p_paleo_compute/stepanek/esm_tools_6_PlioMIP3_production/initial_conditions/PI_251_wiso_c_from_Yuchen/oasis3mct/"

runscripts/fesom2/fesom2.6-levante-reference.yaml

@@ -4,9 +4,9 @@ general:
         setup_name: fesom
         compute_time: "08:00:00"
         initial_date: '1958-01-01'
-        final_date: '2017-12-31'
-        base_dir: "/work/ab0246/${user}/runtime/fesom26_rc1/"
-        nyear: 10
+        final_date: '2018-03-31'
+        base_dir: "/work/ab0246/${user}/runtime/${general.setup_name}-${general.version}/"
+        nyear: 20
         nmonth: 0
         use_venv: False