Changeset 8989 for branches/2017

Timestamp:

2017-12-12T15:14:01+01:00 (6 years ago)

Author:

timgraham

Message:

Merged head of trunk into branch

Location:

branches/2017/dev_METO_2017/NEMOGCM/SETTE

Files:

• new_sette.sh (copied) (copied from trunk/NEMOGCM/SETTE/new_sette.sh)
• new_sette_rpt.sh (copied) (copied from trunk/NEMOGCM/SETTE/new_sette_rpt.sh)
• sette.sh (modified) (2 diffs)
• sette_rpt.sh (modified) (2 diffs)

branches/2017/dev_METO_2017/NEMOGCM/SETTE/sette.sh

@@ -805 +805 @@
     set_namelist namelist_cfg ln_read_cfg .true.
     set_namelist namelist_cfg ln_linssh .true.
+    set_namelist namelist_cfg nn_fsbc 1
     set_namelist namelist_cfg nn_fwb 0
     set_namelist namelist_cfg jpni 4
@@ -828 +829 @@
     set_namelist namelist_cfg ln_read_cfg .true.
     set_namelist namelist_cfg ln_linssh .true.
+    set_namelist namelist_cfg nn_fsbc 1
     set_namelist namelist_cfg nn_fwb 0
     set_namelist namelist_cfg jpni 4

branches/2017/dev_METO_2017/NEMOGCM/SETTE/sette_rpt.sh

@@ -32 +32 @@
     cd ${TOOLS_DIR}/REBUILD_NEMO
     #SF echo "REBUILD LONG restart SAS files, without standard output"
-    ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/LONG/SAS_00000100_restart_ice  $NPROC > /dev/null 2>&1
+    ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1
     #SF echo "REBUILD SHORT restart SAS files, without standard output"
-    ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/SHORT/SAS_00000100_restart_ice $NPROC >&-
+    ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/SHORT/SAS_00000240_restart_ice $NPROC >&-
     cd ${SAS_RESTART_DIR}/LONG
     #SF echo "COPY rebuild restart files"
-    cp SAS_00000100_restart_ice.nc $vdir/$nam/$mach/$dorv/LONG/.
-    cp ../SHORT/SAS_00000100_restart_ice.nc $vdir/$nam/$mach/$dorv/SHORT/.
-
-    f1o=$vdir/$nam/$mach/$dorv/LONG/SAS_00000100_restart_ice.nc
-    f2o=$vdir/$nam/$mach/$dorv/SHORT/SAS_00000100_restart_ice.nc
+    cp SAS_00000240_restart_ice.nc $vdir/$nam/$mach/$dorv/LONG/.
+    cp ../SHORT/SAS_00000240_restart_ice.nc $vdir/$nam/$mach/$dorv/SHORT/.
+
+    f1o=$vdir/$nam/$mach/$dorv/LONG/SAS_00000240_restart_ice.nc
+    f2o=$vdir/$nam/$mach/$dorv/SHORT/SAS_00000240_restart_ice.nc
     if  [ ! -f $f1o ] &&  [ ! -f $f2o ] ; then
       printf "%-20s %s\n" $nam " REBUILD SAS restart ice DOES NOT exists; incomplete test";
@@ -51 +51 @@
     if  [  -f $f1o ] && [  -f $f2o ]; then
       cmp -s $f1o $f2o 
-      #SF  cmp SAS_00000100_restart_ice.nc  ../SHORT/SAS_00000100_restart_ice.nc  > diff_restart.txt
+      #SF  cmp SAS_00000240_restart_ice.nc  ../SHORT/SAS_00000240_restart_ice.nc  > diff_restart.txt
       if [ $? == 0 ]; then
         if [ $pass == 0 ]; then