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 6152 for trunk/NEMOGCM/SETTE – NEMO

Changeset 6152 for trunk/NEMOGCM/SETTE


Ignore:
Timestamp:
2015-12-21T23:33:57+01:00 (8 years ago)
Author:
acc
Message:

Add wetting and drying option from dev_r5803_NOC_WAD branch. Logically isolated code changes in domvvl.F90, domzgr.F90, dynhpg.F90, dynspg_ts.F90, sshwzv.F90 and nemogcm.F90. New module wet_dry.F90 in DYN. Fully SETTE tested with code deactivated (ln_wad=.false.). No test case yet available to justify activating option (still under development)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/SETTE/sette_rpt.sh

    r6140 r6152  
    2929    f2t=$vdir/$nam/$mach/$dorv/SHORT/tracer.stat 
    3030 
    31     if  [ ! -f $f1s ]; then  
    32       printf "%-20s %s\n" $nam " incomplete test"; 
    33       return;  
    34     fi 
    35     if  [ ! -f $f2s ]; then  
    36       printf "%-20s %s\n" $nam " incomplete test"; 
    37       return;  
    38     fi 
    39 # 
    40 # Check for tracer.stat files 
    41 # 
    42     ttest=-1 
    43     if  [  -f $f1t ]; then (( ttest++ )); fi 
    44     if  [  -f $f2t ]; then (( ttest++ )); fi 
     31    if  [ ! -f $f1s ] &&  [ ! -f $f1t ] ; then  
     32      printf "%-20s %s\n" $nam " incomplete test"; 
     33      return;  
     34    fi 
     35    if  [ ! -f $f2s ] &&  [ ! -f $f2t ] ; then  
     36      printf "%-20s %s\n" $nam " incomplete test"; 
     37      return;  
     38    fi 
     39# 
    4540    done_oce=0 
    4641 
    47     nl=(`wc -l $f2s`) 
    48     tail -${nl[0]} $f1s > f1.tmp$$ 
    49     cmp -s f1.tmp$$ $f2s 
    50     if [ $? == 0 ]; then 
    51       if [ $pass == 0 ]; then printf "%-20s %s\n" $nam  " solver.stat restartability  passed";fi 
    52     else 
    53       printf "%-20s %s\n" $nam  " solver.stat restartability  FAILED" 
    54 # 
    55 # Offer view of differences on the second pass 
    56 # 
    57       if [ $pass == 1 ]; then 
    58         echo "<return> to view solver.stat differences" 
    59         read y 
    60         sdiff f1.tmp$$ $f2s 
    61         echo "<return> to view ocean.output differences" 
    62         read y 
    63         sdiff $f1o $f2o | grep "|" 
    64         done_oce=1 
    65         echo "<return> to continue" 
    66         read y 
     42    if  [  -f $f1s ] && [  -f $f2s ]; then  
     43      nl=(`wc -l $f2s`) 
     44      tail -${nl[0]} $f1s > f1.tmp$$ 
     45      cmp -s f1.tmp$$ $f2s 
     46      if [ $? == 0 ]; then 
     47        if [ $pass == 0 ]; then  
     48          printf "%-20s %s %s\n" $nam  " solver.stat restartability  passed : " $dorv 
     49        fi 
     50      else 
     51        printf "%-20s %s %s\n" $nam  " solver.stat restartability  FAILED : " $dorv  
     52# 
     53# Offer view of differences on the second pass 
     54# 
     55        if [ $pass == 1 ]; then 
     56          echo "<return> to view solver.stat differences" 
     57          read y 
     58          sdiff f1.tmp$$ $f2s 
     59          echo "<return> to view ocean.output differences" 
     60          read y 
     61          sdiff $f1o $f2o | grep "|" 
     62          done_oce=1 
     63          echo "<return> to continue" 
     64          read y 
     65        fi 
    6766      fi 
    6867    fi 
    … …  
    7069# Check tracer.stat files (if they exist) 
    7170# 
    72     if [ $ttest == 1 ]; then 
     71    if  [  -f $f1t ] && [  -f $f2t ]; then 
    7372      nl=(`wc -l $f2t`) 
    7473      tail -${nl[0]} $f1t > f1.tmp$$ 
    7574      cmp -s f1.tmp$$ $f2t 
    7675      if [ $? == 0 ]; then 
    77         if [ $pass == 0 ]; then printf "%-20s %s\n" $nam  " tracer.stat restartability  passed";fi 
    78       else 
    79         printf "%-20s %s\n" $nam  " solver.stat restartability  FAILED" 
     76        if [ $pass == 0 ]; then  
     77          printf "%-20s %s %s\n" $nam  " tracer.stat restartability  passed : " $dorv 
     78        fi 
     79      else 
     80        printf "%-20s %s %s\n" $nam  " tracer.stat restartability  FAILED : " $dorv  
    8081# 
    8182# Offer view of differences on the second pass 
    … …  
    123124    f2t=$vdir/$nam/$mach/$dorv/$rep2/tracer.stat 
    124125 
    125     if  [ ! -f $f1s ]; then  
    126       printf "%-20s %s\n" $nam " incomplete test"; 
    127       return;  
    128     fi 
    129     if  [ ! -f $f2s ]; then  
    130       printf "%-20s %s\n" $nam " incomplete test"; 
    131       return;  
    132     fi 
    133 # 
    134 # Check for tracer.stat files 
    135 # 
    136     ttest=-1 
    137     if  [  -f $f1t ]; then (( ttest++ )); fi 
    138     if  [  -f $f2t ]; then (( ttest++ )); fi 
     126    if  [ ! -f $f1s ] && [ ! -f $f1t ] ; then  
     127      printf "%-20s %s\n" $nam " incomplete test"; 
     128      return;  
     129    fi 
     130    if  [ ! -f $f2s ] && [ ! -f $f2t ] ; then  
     131      printf "%-20s %s\n" $nam " incomplete test"; 
     132      return;  
     133    fi 
     134# 
    139135    done_oce=0 
    140136 
    141     cmp -s $f1s $f2s 
    142     if [ $? == 0 ]; then 
    143       if [ $pass == 0 ]; then printf "%-20s %s\n" $nam  " solver.stat reproducibility passed";fi 
    144     else 
    145       printf "%-20s %s\n" $nam  " solver.stat reproducibility FAILED" 
    146 # 
    147 # Offer view of differences on the second pass 
    148 # 
    149       if [ $pass == 1 ]; then 
    150         echo "<return> to view solver.stat differences" 
    151         read y 
    152         sdiff f1.tmp$$ $f2s 
    153         echo "<return> to view ocean.output differences" 
    154         read y 
    155         sdiff $f1o $f2o | grep "|" 
    156         done_oce=1 
    157         echo "<return> to continue" 
    158         read y 
     137    if  [ -f $f1s ] && [ -f $f2s ] ; then 
     138      cmp -s $f1s $f2s 
     139      if [ $? == 0 ]; then 
     140        if [ $pass == 0 ]; then  
     141          printf "%-20s %s %s\n" $nam  " solver.stat reproducibility passed : " $dorv 
     142        fi 
     143      else 
     144        printf "%-20s %s %s\n" $nam  " solver.stat reproducibility FAILED : " $dorv  
     145# 
     146# Offer view of differences on the second pass 
     147# 
     148        if [ $pass == 1 ]; then 
     149          echo "<return> to view solver.stat differences" 
     150          read y 
     151          sdiff f1.tmp$$ $f2s 
     152          echo "<return> to view ocean.output differences" 
     153          read y 
     154          sdiff $f1o $f2o | grep "|" 
     155          done_oce=1 
     156          echo "<return> to continue" 
     157          read y 
     158        fi 
    159159      fi 
    160160    fi 
    … …  
    162162# Check tracer.stat files (if they exist) 
    163163# 
    164     if [ $ttest == 1 ]; then 
     164    if  [ -f $f1t ] && [ -f $f2t ] ; then 
    165165      cmp -s $f1t $f2t 
    166166      if [ $? == 0 ]; then 
    167         if [ $pass == 0 ]; then printf "%-20s %s\n" $nam  " tracer.stat reproducibility passed";fi 
    168       else 
    169         printf "%-20s %s\n" $nam  " solver.stat reproducibility FAILED" 
     167        if [ $pass == 0 ]; then           printf "%-20s %s %s\n" $nam  " tracer.stat reproducibility passed : " $dorv 
     168        fi 
     169      else 
     170        printf "%-20s %s %s\n" $nam  " tracer.stat reproducibility  FAILED : " $dorv 
    170171# 
    171172# Offer view of differences on the second pass 
Note: See TracChangeset for help on using the changeset viewer.