Changeset 5836 for trunk/NEMOGCM/SETTE

Timestamp:

2015-10-26T15:49:40+01:00 (9 years ago)

Author:

cetlod

Message:

merge the simplification branch onto the trunk, see ticket #1612

Location:

trunk/NEMOGCM/SETTE

Files:

• param.cfg (modified) (1 diff)
• sette.sh (modified) (7 diffs)
• sette_rpt (modified) (1 diff)

trunk/NEMOGCM/SETTE/param.cfg

@@ -1 @@
-#- forcing files storing 
+#- forcing files storing
 FORCING_DIR=~/FORCING
-#- input files storing 
+#- input files storing
 INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
 #- only for IBM
 #TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
-#- VALIDATION files storing 
+#- VALIDATION files storing
 NEMO_VALIDATION_DIR=~/NEMO_VALIDATION

trunk/NEMOGCM/SETTE/sette.sh

@@ -143 +143 @@
 # ORCA2_AGRIF_LIM :16 & 17 
 #                  18 & 19 
-for config in  1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
+
+for config in  1 2 3 4 5 6 7 8 9 10 11 12 15 16
 
 do
@@ -291 +292 @@
     . ./prepare_exe_dir.sh
     JOB_FILE=${EXE_DIR}/run_job.sh
-    NPROC=4
+    NPROC=8
     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi
     cd ${EXE_DIR}
@@ -301 +302 @@
     set_namelist namelist_cfg nn_fwb 0
     set_namelist namelist_cfg jpni 2
-    set_namelist namelist_cfg jpnj 2
-    set_namelist namelist_cfg jpnij 4
+    set_namelist namelist_cfg jpnj 4
+    set_namelist namelist_cfg jpnij 8
     set_namelist namelist_cfg nn_solv 2
     set_namelist namelist_top_cfg ln_trcdta .false.
@@ -337 +338 @@
     set_namelist namelist_cfg nn_fwb 0
     set_namelist namelist_cfg jpni 2
-    set_namelist namelist_cfg jpnj 2
-    set_namelist namelist_cfg jpnij 4
+    set_namelist namelist_cfg jpnj 4
+    set_namelist namelist_cfg jpnij 8
     set_namelist namelist_cfg nn_solv 2
     set_namelist namelist_top_cfg ln_diatrc .false.
@@ -473 +474 @@
     . ./prepare_exe_dir.sh
     JOB_FILE=${EXE_DIR}/run_job.sh
-    NPROC=4
+    NPROC=8
     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi
     cd ${EXE_DIR}
@@ -482 +483 @@
     set_namelist namelist_cfg ln_clobber .true.
     set_namelist namelist_cfg jpni 2
-    set_namelist namelist_cfg jpnj 2
-    set_namelist namelist_cfg jpnij 4
+    set_namelist namelist_cfg jpnj 4
+    set_namelist namelist_cfg jpnij 8
     set_namelist namelist_top_cfg ln_trcdta .false.
     set_namelist namelist_top_cfg ln_diatrc .false.
@@ -516 +517 @@
     set_namelist namelist_cfg ln_clobber .true.
     set_namelist namelist_cfg jpni 2
-    set_namelist namelist_cfg jpnj 2
-    set_namelist namelist_cfg jpnij 4
+    set_namelist namelist_cfg jpnj 4
+    set_namelist namelist_cfg jpnij 8
     set_namelist namelist_top_cfg ln_diatrc .false.
     set_namelist namelist_top_cfg ln_rsttr .true.

trunk/NEMOGCM/SETTE/sette_rpt

@@ -393 +393 @@
 
 
+  if ( -d ./WORCA2_LIM_OBS ) then
+    set dorv = `ls -1rtd ./WORCA2_LIM_OBS/{$mach}/* | tail -1l `
+    set dorv = $dorv:t
+    set f1o = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_2_8/ocean.output
+    set f1s = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_2_8/solver.stat
+    set f2o = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_4_4/ocean.output
+    set f2s = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_4_4/solver.stat
+
+    cmp -s $f1s $f2s
+    if ( $status == 0 ) then
+      echo "ORCA2_LIM_OBS   reproducibility passed"
+    else
+      echo "ORCA2_LIM_OBS   reproducibility FAILED"
+      if ( $pass == 1 ) then
+        echo "<return> to view solver.stat differences"
+        set y = $<
+        sdiff $f1s $f2s
+        echo "<return> to view ocean.output differences"
+        set y = $<
+        sdiff $f1o $f2o | grep "|"
+        echo "<return> to continue"
+        set y = $<
+      endif
+    endif
+  endif
+
+
   if ( -d ./WSAS_32 ) then
     set dorv = `ls -1rtd ./WSAS_32/{$mach}/* | tail -1l `