Merge branch 'CO9_AMM7'

JMMP-Group · Sep 28, 2022 · 3e67176 · 3e67176
2 parents 87e54d4 + d0bfdbb
commit 3e67176
Show file tree

Hide file tree

Showing 37 changed files with 1,851 additions and 15,195 deletions.
diff --git a/EXP00/file_def_nemo-oce.xml b/EXP00/file_def_nemo-oce.xml
@@ -11,15 +11,7 @@
     <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1d" min_digits="4">
 
       <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
-      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."  >                      
-
-        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" enabled=".TRUE." >
-          <field field_ref="toce"           name="toce"   operation="instant" enabled=".TRUE." />
-          <field field_ref="soce"           name="soce"   operation="instant" enabled=".TRUE." />
-        </file>
-
-      </file_group>
-
+      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->                      
       <file_group id="2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
       <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
       <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->

diff --git a/EXP00/namelist_cfg b/EXP00/namelist_cfg
diff --git a/EXP00/namelist_hpg_cfg b/EXP00/namelist_hpg_cfg
diff --git a/EXP00/namelist_ran_cfg b/EXP00/namelist_ran_cfg
diff --git a/EXP00/runscript.pbs b/EXP00/runscript.pbs
diff --git a/EXP00/runscript.slurm b/EXP00/runscript.slurm
@@ -0,0 +1,30 @@
+#!/bin/bash
+#SBATCH --job-name=co9_test
+#SBATCH --time=00:15:00
+#SBATCH --account=n01
+#SBATCH --partition=standard
+#SBATCH --qos=standard
+
+#SBATCH --nodes=2
+#SBATCH --ntasks-per-core=1
+
+module swap craype-network-ofi craype-network-ucx #depend on xios version
+module swap cray-mpich cray-mpich-ucx #depend on xios version
+module load cray-hdf5-parallel/1.12.0.7
+module load cray-netcdf-hdf5parallel/4.7.4.7
+export OMP_NUM_THREADS=1
+
+cat > myscript_wrapper.sh << EOFB
+#!/bin/ksh
+#
+set -A map ./xios_server.exe ./nemo
+exec_map=( 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 )
+#
+exec \${map[\${exec_map[\$SLURM_PROCID]}]}
+##
+EOFB
+chmod u+x ./myscript_wrapper.sh
+
+srun --mem-bind=local \
+--ntasks=100 --ntasks-per-node=50 --cpu-bind=v,mask_cpu:0x1,0x10000,0x100000000,0x400000000,0x1000000000,0x4000000000,0x10000000000,0x40000000000,0x100000000000,0x400000000000,0x1000000000000,0x4000000000000,0x10000000000000,0x40000000000000,0x100000000000000,0x400000000000000,0x1000000000000000,0x4000000000000000,0x10000000000000000,0x40000000000000000,0x100000000000000000,0x400000000000000000,0x1000000000000000000,0x4000000000000000000,0x10000000000000000000,0x40000000000000000000,0x100000000000000000000,0x400000000000000000000,0x1000000000000000000000,0x4000000000000000000000,0x10000000000000000000000,0x40000000000000000000000,0x100000000000000000000000,0x400000000000000000000000,0x1000000000000000000000000,0x4000000000000000000000000,0x10000000000000000000000000,0x40000000000000000000000000,0x100000000000000000000000000,0x400000000000000000000000000,0x1000000000000000000000000000,0x4000000000000000000000000000,0x10000000000000000000000000000,0x40000000000000000000000000000,0x100000000000000000000000000000,0x400000000000000000000000000000,0x1000000000000000000000000000000,0x4000000000000000000000000000000,0x10000000000000000000000000000000,0x40000000000000000000000000000000 ./myscript_wrapper.sh
+
diff --git a/MY_SRC/dynhpg.F90 b/MY_SRC/dynhpg.F90
diff --git a/MY_SRC/dynhpg.F90 b/MY_SRC/dynhpg.F90
diff --git a/MY_SRC/dynhpg.F90.cub b/MY_SRC/dynhpg.F90.cub
diff --git a/MY_SRC/dynhpg.F90.djc b/MY_SRC/dynhpg.F90.djc
diff --git a/MY_SRC/dynhpg.F90.lin b/MY_SRC/dynhpg.F90.lin
diff --git a/MY_SRC/usrdef_istate.F90 b/MY_SRC/usrdef_istate.F90
diff --git a/MY_SRC/usrdef_sbc.F90 b/MY_SRC/usrdef_sbc.F90