New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 4936 – NEMO

Changeset 4936


Ignore:
Timestamp:
2014-12-01T13:44:26+01:00 (9 years ago)
Author:
acc
Message:

Branch dev_r4879_UKMO_NOC_MERGE. Fix incorrect version of sette_rpt. All sette tests (except AGRIF (untested)) passed.

Location:
branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/SETTE
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/SETTE/param.cfg

    r4924 r4936  
    11#- forcing files storing  
    2 FORCING_DIR=/data/scihub-users/piethi/WORKDIR/dev_r4650_UKMO2_ice_shelves_merge/NEMOGCM/SETTE/FORCING 
     2FORCING_DIR=~/FORCING 
    33#- input files storing  
    44INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
    … …  
    66#TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 
    77#- VALIDATION files storing  
    8 NEMO_VALIDATION_DIR=/data/scihub-users/piethi/WORKDIR/dev_r4650_UKMO2_ice_shelves_merge/NEMOGCM/SETTE/NEMO_VALIDATION 
     8NEMO_VALIDATION_DIR=~/NEMO_VALIDATION 

  • branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/SETTE/sette_rpt

    r4932 r4936  
    171171    rm f1.tmp$$ 
    172172  endif 
    173 <<<<<<< .working 
    174173  if ( -d ./WORCA2LIM3_LONG ) then 
    175174    set dorv = `ls -1rtd ./WORCA2LIM3_LONG/{$mach}/* | tail -1l ` 
    … …  
    179178    set f2o = ./WORCA2LIM3_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
    180179    set f2s = ./WORCA2LIM3_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
    181 ======= 
    182 NEXT0: 
     180    set nl = `wc -l $f2s` 
     181    tail -$nl[1] $f1s > f1.tmp$$ 
     182    cmp -s f1.tmp$$ $f2s 
     183    if ( $status == 0 ) then 
     184      echo "ORCA2LIM3   restartability  passed" 
     185    else 
     186      echo "ORCA2LIM3   restartability  FAILED" 
     187      if ( $pass == 1 ) then 
     188        echo "<return> to view solver.stat differences" 
     189        set y = $< 
     190        sdiff f1.tmp$$ $f2s 
     191        echo "<return> to view ocean.output differences" 
     192        set y = $< 
     193        sdiff $f1o $f2o | grep "|" 
     194        echo "<return> to continue" 
     195        set y = $< 
     196      endif 
     197    endif 
     198    rm f1.tmp$$ 
     199  endif 
     200 
    183201  if ( -d ./WSAS_LONG ) then 
    184202    set dorv = `ls -1rtd ./WSAS_LONG/{$mach}/* | tail -1l ` 
    … …  
    188206    set f2o = ./WSAS_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
    189207    set f2s = ./WSAS_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
    190 >>>>>>> .merge-right.r4926 
    191  
    192 <<<<<<< .working 
    193     set nl = `wc -l $f2s` 
    194     tail -$nl[1] $f1s > f1.tmp$$ 
    195     cmp -s f1.tmp$$ $f2s 
    196     if ( $status == 0 ) then 
    197       echo "ORCA2LIM3       restartability  passed" 
    198     else 
    199       echo "ORCA2LIM3       restartability  FAILED" 
    200       if ( $pass == 1 ) then 
    201         echo "<return> to view solver.stat differences" 
    202         set y = $< 
    203         sdiff f1.tmp$$ $f2s 
    204         echo "<return> to view ocean.output differences" 
    205         set y = $< 
    206         sdiff $f1o $f2o | grep "|" 
    207         echo "<return> to continue" 
    208         set y = $< 
    209       endif 
    210     endif 
    211     rm f1.tmp$$ 
    212   endif 
    213 NEXT0: 
    214   if ( -d ./WSAS_LONG ) then 
    215     set dorv = `ls -1rtd ./WSAS_LONG/{$mach}/* | tail -1l ` 
    216     set dorv = $dorv:t 
    217     set f1o = ./WSAS_LONG/{$mach}/{$dorv}/LONG/ocean.output 
    218     set f1s = ./WSAS_LONG/{$mach}/{$dorv}/LONG/solver.stat 
    219     set f2o = ./WSAS_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
    220     set f2s = ./WSAS_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
    221  
    222208    foreach f ( $f1o $f1s $f2o $f2s ) 
    223209     if ( ! -f $f ) then 
    224210      echo 'SAS         restartability  inconclusive ( ' $f:t ' not found )' 
    225       goto NEXT 
     211      goto NEXT1 
    226212     endif 
    227213    end 
    … …  
    248234  endif 
    249235 
    250 NEXT: 
    251 ======= 
    252     foreach f ( $f1o $f1s $f2o $f2s ) 
    253      if ( ! -f $f ) then 
    254       echo 'SAS         restartability  inconclusive ( ' $f:t ' not found )' 
    255       goto NEXT 
    256      endif 
    257     end 
    258  
    259     set nl = `wc -l $f2s` 
    260     tail -$nl[1] $f1s > f1.tmp$$ 
    261     cmp -s f1.tmp$$ $f2s 
    262     if ( $status == 0 ) then 
    263       echo "SAS         restartability  passed" 
    264     else 
    265       echo "SAS         restartability  FAILED" 
    266       if ( $pass == 1 ) then 
    267         echo "<return> to view solver.stat differences" 
    268         set y = $< 
    269         sdiff f1.tmp$$ $f2s 
    270         echo "<return> to view ocean.output differences" 
    271         set y = $< 
    272         sdiff $f1o $f2o | grep "|" 
    273         echo "<return> to continue" 
    274         set y = $< 
    275       endif 
    276     endif 
    277     rm f1.tmp$$ 
    278   endif 
    279  
    280 NEXT: 
    281 >>>>>>> .merge-right.r4926 
    282 echo 
     236NEXT1: 
    283237   
    284238  if ( -d ./WGYRE_4 ) then 
    … …  
    411365    endif 
    412366  endif 
     367 
    413368  if ( -d ./WORCA2LIM3_16 ) then 
    414369    set dorv = `ls -1rtd ./WORCA2LIM3_16/{$mach}/* | tail -1l ` 
    … …  
    419374    set f2s = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_4_4/solver.stat 
    420375 
    421 <<<<<<< .working 
    422376    cmp -s $f1s $f2s 
    423377    if ( $status == 0 ) then 
    … …  
    450404     if ( ! -f $f ) then 
    451405      echo 'SAS         reproducibility inconclusive ( ' $f:t ' not found )' 
    452       goto NEXT1 
     406      goto NEXT2 
    453407     endif 
    454408    end 
    … …  
    471425    endif 
    472426  endif 
    473 NEXT1: 
    474  
    475 ======= 
    476   if ( -d ./WSAS_32 ) then 
    477     set dorv = `ls -1rtd ./WSAS_32/{$mach}/* | tail -1l ` 
    478     set dorv = $dorv:t 
    479     set f1o = ./WSAS_32/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
    480     set f1s = ./WSAS_32/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
    481     set f2o = ./WSAS_32/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
    482     set f2s = ./WSAS_32/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
    483  
    484     foreach f ( $f1o $f1s $f2o $f2s ) 
    485      if ( ! -f $f ) then 
    486       echo 'SAS         reproducibility inconclusive ( ' $f:t ' not found )' 
    487       goto NEXT1 
    488      endif 
    489     end 
    490  
    491     cmp -s $f1s $f2s 
    492     if ( $status == 0 ) then 
    493       echo "SAS reproducibility passed" 
    494     else 
    495       echo "SAS reproducibility FAILED" 
    496       if ( $pass == 1 ) then 
    497         echo "<return> to view solver.stat differences" 
    498         set y = $< 
    499         sdiff $f1s $f2s 
    500         echo "<return> to view ocean.output differences" 
    501         set y = $< 
    502         sdiff $f1o $f2o | grep "|" 
    503         echo "<return> to continue" 
    504         set y = $< 
    505       endif 
    506     endif 
    507   endif 
    508 NEXT1: 
    509  
    510 >>>>>>> .merge-right.r4926 
     427NEXT2: 
     428 
    511429  if ( -d ./WORCA2AGUL_1_2 ) then 
    512430    set dorv = `ls -1rtd ./WORCA2AGUL_1_2/{$mach}/* | tail -1l ` 
Note: See TracChangeset for help on using the changeset viewer.