Changeset 6140 for trunk/NEMOGCM/SETTE/sette_rpt

Timestamp:

2015-12-21T12:35:23+01:00 (8 years ago)

Author:

timgraham

Message:

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

In working copy run:
svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.

File:

• trunk/NEMOGCM/SETTE/sette_rpt (modified) (2 diffs)

trunk/NEMOGCM/SETTE/sette_rpt

@@ -90 +90 @@
     set f1o = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/ocean.output
     set f1s = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/solver.stat
+    set f1t = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/tracer.stat
     set f2o = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/ocean.output
     set f2s = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/solver.stat
-  
-    set nl = `wc -l $f2s`
-    tail -$nl[1] $f1s > f1.tmp$$
-    cmp -s f1.tmp$$ $f2s
-    if ( $status == 0 ) then
-      echo "ORCA2LIMPIS restartability  passed"
-    else
-      echo "ORCA2LIMPIS restartability  FAILED"
-      if ( $pass == 1 ) then
-        echo "<return> to view solver.stat differences"
-        set y = $<
-        sdiff f1.tmp$$ $f2s
-        echo "<return> to view ocean.output differences"
-        set y = $<
-        sdiff $f1o $f2o | grep "|"
-        echo "<return> to continue"
-        set y = $<
-      endif
+    set f2t = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/tracer.stat
+
+    set stato = 0
+    set nl = `wc -l $f2s`
+    tail -$nl[1] $f1s > f1.tmp$$
+    cmp -s f1.tmp$$ $f2s
+    if ( $status == 0 ) then
+      echo "ORCA2LIMPIS solver.stat restartability  passed"
+    else
+      set stato = 1
+      echo "ORCA2LIMPIS solver.stat restartability  FAILED"
+      if ( $pass == 1 ) then
+        echo "<return> to view solver.stat differences"
+        set y = $<
+        sdiff f1.tmp$$ $f2s
+      endif
+    endif
+
+    set nl = `wc -l $f2t`
+    tail -$nl[1] $f1t > f1.tmp$$
+    cmp -s f1.tmp$$ $f2t
+    if ( $status == 0 ) then
+      echo "ORCA2LIMPIS tracer.stat restartability  passed"
+    else
+      set stato = 1
+      echo "ORCA2LIMPIS tracer.stat restartability  FAILED"
+      if ( $pass == 1 ) then
+        echo "<return> to view tracer.stat differences"
+        set y = $<
+        sdiff f1.tmp$$ $f2t
+      endif
+    endif
+    if ( $stato == 1 ) then
+      if ( $pass == 1 ) then
+        echo "<return> to view ocean.output differences"
+        set y = $<
+        sdiff $f1o $f2o | grep "|"
+        echo "<return> to continue"
+        set y = $<
+      endif
+      set stato = 0
     endif
     rm f1.tmp$$
@@ -293 +317 @@
     set f1o = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/ocean.output
     set f1s = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/solver.stat
+    set f1t = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/tracer.stat
     set f2o = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/ocean.output
     set f2s = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/solver.stat
-  
-    cmp -s $f1s $f2s
-    if ( $status == 0 ) then
-      echo "ORCA2LIMPIS reproducibility passed"
-    else
-      echo "ORCA2LIMPIS 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
+    set f2t = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/tracer.stat
+
+    set stato = 0
+    cmp -s $f1s $f2s
+    if ( $status == 0 ) then
+      echo "ORCA2LIMPIS solver.stat reproducibility  passed"
+    else
+      set stato = 1
+      echo "ORCA2LIMPIS solver.stat reproducibility  FAILED"
+      if ( $pass == 1 ) then
+        echo "<return> to view solver.stat differences"
+        set y = $<
+        sdiff $f1s $f2s
+      endif
+    endif
+
+    cmp -s $f1t $f2t
+    if ( $status == 0 ) then
+      echo "ORCA2LIMPIS tracer.stat reproducibility  passed"
+    else
+      set stato = 1
+      echo "ORCA2LIMPIS tracer.stat reproducibility  FAILED"
+      if ( $pass == 1 ) then
+        echo "<return> to view tracer.stat differences"
+        set y = $<
+        sdiff $f1t $f2t
+      endif
+    endif
+    if ( $stato == 1 ) then
+      if ( $pass == 1 ) then
+        echo "<return> to view ocean.output differences"
+        set y = $<
+        sdiff $f1o $f2o | grep "|"
+        echo "<return> to continue"
+        set y = $<
+      endif
+      set stato = 0
     endif
   endif