store wip for awiesm3.4 on juwels

esm-tools · Feb 7, 2025 · 041dbec · 041dbec
1 parent 5dd5fc7
commit 041dbec
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 20 deletions.
diff --git a/configs/components/oifs/oifs48.env.yaml b/configs/components/oifs/oifs48.env.yaml
@@ -3,7 +3,7 @@
 
 add_environment_changes:
     add_module_actions:
-        - "load python3"
+        - "load Python"
     add_add_add_export_vars:
             DATA: "${general.work_dir}"
             LD_LIBRARY_PATH[(3)]: '$LD_LIBRARY_PATH:${thisrun_work_dir}/lib/oifs/'
@@ -14,15 +14,13 @@ add_environment_changes:
         levante:
             compiler_mpi: gnu11_ompi4
             iolibraries: system_gnu_libs
-            #compiler_mpi: intel2022_impi2021
-            #iolibraries: system_libs
             add_add_export_vars:
                 OIFS_DATA_DIR: "/p/project/chhb19/streffing1/input/oifs-48r1/"
                 MKL_CBWR: AUTO,STRICT
 
         juwels:
             compiler_mpi: gnu2023_ompi2023
-            iolibraries: system_libs
+            iolibraries: awi_libs
             add_add_export_vars:
                 MKL_CBWR: AUTO,STRICT
 
diff --git a/configs/components/rnfmap/rnfmap.env.yaml b/configs/components/rnfmap/rnfmap.env.yaml
@@ -20,8 +20,13 @@ compiletime_environment_changes:
         RNF_NETCDFF_INCLUDE: '"-I$NETCDFFROOT/include"'
         RNF_NETCDFF_LIB: '"-L$NETCDFFROOT/lib -lnetcdff"'
         # compilers and compile switches
-        RNF_FFLAGS: '"-r8 -fp-model precise -align array32byte -O1 ${computer.OpenMP_flag} -xCORE_AVX2 -g -traceback -convert big_endian -fpe0"'
-        RNF_CFLAGS: '"-r8 -fp-model precise -align array32byte -O1 ${computer.OpenMP_flag} -xCORE_AVX2 -g -traceback -convert big_endian -fpe0"'
+      choose_computer.compiler_mpi:
+        gnu2023_ompi2023:
+          RNF_FFLAGS: '"-fdefault-real-8 -march=core-avx2 -mtune=core-avx2 -O3 -fopenmp -g -fbacktrace -fconvert=big-endian"'
+          RNF_CFLAGS: '"-march=core-avx2 -mtune=core-avx2 -O3 -fopenmp -g -fbacktrace -fno-opt-report -fpe0"'
+        intel2025_psmpi:
+          RNF_FFLAGS: '"-r8 -fp-model precise -align array32byte -O1 ${computer.OpenMP_flag} -xCORE_AVX2 -g -traceback -convert big_endian -fpe0"'
+          RNF_CFLAGS: '"-r8 -fp-model precise -align array32byte -O1 ${computer.OpenMP_flag} -xCORE_AVX2 -g -traceback -convert big_endian -fpe0"'
 
     levante:
       add_export_vars:

diff --git a/configs/machines/juwels.yaml b/configs/machines/juwels.yaml
@@ -7,8 +7,9 @@ jobtype: compute
 accounting: true
 
 # default settings for compiler, mpi and I/O libs
-compiler_mpi: intel2025_psmpi
-iolibraries: none
+compiler_mpi: gnu2023_ompi2023
+
+iolibraries: system_libs
 useMPI: intelmpi
 
 # slurm setup

diff --git a/configs/setups/awicm3/awicm3.yaml b/configs/setups/awicm3/awicm3.yaml
@@ -412,8 +412,8 @@ oifs:
                 iolibraries: awi_libs
                 choose_computer.name:
                         juwels:
-                                #compiler_mpi: intel2022_ompi2022
-                                compiler_mpi: intel2024_psmpi2024
+                                iolibraries: system_libs
+                                compiler_mpi: intel2025_psmpi
                         blogin:
                                 iolibraries: geomar_libs
                         glogin:
@@ -431,8 +431,8 @@ oifs:
                 iolibraries: awi_libs
                 choose_computer.name:
                         juwels:
-                                #compiler_mpi: intel2022_ompi2022
-                                compiler_mpi: intel2024_psmpi2024
+                                iolibraries: system_libs
+                                compiler_mpi: intel2025_psmpi
                         blogin:
                                 iolibraries: geomar_libs
                         glogin:

diff --git a/configs/setups/awiesm3/awiesm3.yaml b/configs/setups/awiesm3/awiesm3.yaml
@@ -27,9 +27,6 @@ general:
             - fesom-2.6+oifs-48r1+xios-2.5+lpj_guess-4.1.2
             add_include_models:
             - xios
-            add_add_environment_changes:
-                levante:        
-                    iolibraries: system_gnu_libs
             oasis_with_yac: False
             xios_interp_order: 1
 
@@ -67,10 +64,13 @@ general:
                 - xios/xios.env.yaml
                 - rnfmap/rnfmap.env.yaml
 
- #       add_environment_changes:
-            #    choose_computer.name:
-            #            levante:
-            #                    compiler_mpi: intel2022_openmpi
+        add_add_environment_changes:
+            levante:        
+                iolibraries: system_gnu_libs
+            juwels:
+                compiler_mpi: gnu2023_ompi2023
+                iolibraries: awi_libs
+
 
 #########################################################################################
 ########### necessary changes to submodels compared to standalone setups ################
@@ -434,7 +434,6 @@ oasis3mct:
         v2a_seq: 2
         v2a_lag: "86400"
 
-        coupling_time_step: "${oasis3mct.time_step}"
         choose_general.major_version:
                 'v3.4':
                         add_process_ordering:
@@ -466,6 +465,8 @@ oasis3mct:
                         rstas_file_name: 'rstas'
                         vegin_file_name: 'vegin'
 
+        coupling_time_step: "${oasis3mct.time_step}"
+        land_atmo_coupling_time_step: 86400
 
         coupling_directions:
                 'atma->feom':
@@ -483,9 +484,11 @@ oasis3mct:
                 '${lpj_guess.mygrid}-land->atma':
                         lag: ${v2a_lag}
                         seq: ${v2a_seq}
+                        coupling_time_step: ${land_atmo_coupling_time_step}
                 'atma->${lpj_guess.mygrid}-land': 
                         lag: ${a2v_lag}
                         seq: ${a2v_seq}
+                        coupling_time_step: ${land_atmo_coupling_time_step}
 
 
         coupling_methods:

diff --git a/src/esm_runscripts/oasis.py b/src/esm_runscripts/oasis.py
@@ -120,6 +120,9 @@ def add_coupling(
         # this part was broke, confused seq with nb of trafo lines
 
         seq = int(direction.get("seq", "2"))
+
+        coupling_time_step = direction.get("coupling_time_step", coupling_time_step)
+
         # if transformation.get("postprocessing", {}).get("conserv", {}).get("method"):
         #    seq += 1