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

Ignore:
Timestamp:
2017-02-06T10:25:03+01:00 (7 years ago)
Author:
timgraham
Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/SETTE/sette_rpt

    r6140 r7646  
    8585 
    8686   
    87   if ( -d ./WORCA2LIMPIS_LONG ) then 
    88     set dorv = `ls -1rtd ./WORCA2LIMPIS_LONG/{$mach}/* | tail -1l ` 
    89     set dorv = $dorv:t 
    90     set f1o = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/ocean.output 
    91     set f1s = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/solver.stat 
    92     set f1t = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/tracer.stat 
    93     set f2o = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
    94     set f2s = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
    95     set f2t = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/tracer.stat 
     87  if ( -d ./WORCA2LIM3PIS_LONG ) then 
     88    set dorv = `ls -1rtd ./WORCA2LIM3PIS_LONG/{$mach}/* | tail -1l ` 
     89    set dorv = $dorv:t 
     90    set f1o = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/LONG/ocean.output 
     91    set f1s = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/LONG/solver.stat 
     92    set f1t = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/LONG/tracer.stat 
     93    set f2o = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
     94    set f2s = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
     95    set f2t = ./WORCA2LIM3PIS_LONG/{$mach}/{$dorv}/SHORT/tracer.stat 
    9696 
    9797    set stato = 0 
     
    100100    cmp -s f1.tmp$$ $f2s 
    101101    if ( $status == 0 ) then 
    102       echo "ORCA2LIMPIS solver.stat restartability  passed" 
     102      echo "ORCA2LIM3PIS solver.stat restartability  passed" 
    103103    else 
    104104      set stato = 1 
    105       echo "ORCA2LIMPIS solver.stat restartability  FAILED" 
     105      echo "ORCA2LIM3PIS solver.stat restartability  FAILED" 
    106106      if ( $pass == 1 ) then 
    107107        echo "<return> to view solver.stat differences" 
     
    115115    cmp -s f1.tmp$$ $f2t 
    116116    if ( $status == 0 ) then 
    117       echo "ORCA2LIMPIS tracer.stat restartability  passed" 
     117      echo "ORCA2LIM3PIS tracer.stat restartability  passed" 
    118118    else 
    119119      set stato = 1 
    120       echo "ORCA2LIMPIS tracer.stat restartability  FAILED" 
     120      echo "ORCA2LIM3PIS tracer.stat restartability  FAILED" 
    121121      if ( $pass == 1 ) then 
    122122        echo "<return> to view tracer.stat differences" 
     
    260260NEXT1: 
    261261   
    262   if ( -d ./WGYRE_4 ) then 
    263     set dorv = `ls -1rtd ./WGYRE_4/{$mach}/* | tail -1l ` 
    264     set dorv = $dorv:t 
    265     set f1o = ./WGYRE_4/{$mach}/{$dorv}/REPRO_1_4/ocean.output 
    266     set f1s = ./WGYRE_4/{$mach}/{$dorv}/REPRO_1_4/solver.stat 
    267     set f2o = ./WGYRE_4/{$mach}/{$dorv}/REPRO_2_2/ocean.output 
    268     set f2s = ./WGYRE_4/{$mach}/{$dorv}/REPRO_2_2/solver.stat 
     262  if ( -d ./WGYRE_32 ) then 
     263    set dorv = `ls -1rtd ./WGYRE_32/{$mach}/* | tail -1l ` 
     264    set dorv = $dorv:t 
     265    set f1o = ./WGYRE_32/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     266    set f1s = ./WGYRE_32/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     267    set f2o = ./WGYRE_32/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     268    set f2s = ./WGYRE_32/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
    269269   
    270270    cmp -s $f1s $f2s 
     
    286286  endif 
    287287 
    288   if ( -d ./WISOMIP_4 ) then 
    289     set dorv = `ls -1rtd ./WISOMIP_4/{$mach}/* | tail -1l ` 
    290     set dorv = $dorv:t 
    291     set f1o = ./WISOMIP_4/{$mach}/{$dorv}/REPRO_1_4/ocean.output 
    292     set f1s = ./WISOMIP_4/{$mach}/{$dorv}/REPRO_1_4/solver.stat 
    293     set f2o = ./WISOMIP_4/{$mach}/{$dorv}/REPRO_2_2/ocean.output 
    294     set f2s = ./WISOMIP_4/{$mach}/{$dorv}/REPRO_2_2/solver.stat 
     288  if ( -d ./WISOMIP_32 ) then 
     289    set dorv = `ls -1rtd ./WISOMIP_32/{$mach}/* | tail -1l ` 
     290    set dorv = $dorv:t 
     291    set f1o = ./WISOMIP_32/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     292    set f1s = ./WISOMIP_32/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     293    set f2o = ./WISOMIP_32/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     294    set f2s = ./WISOMIP_32/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
    295295 
    296296    cmp -s $f1s $f2s 
     
    312312  endif 
    313313  
    314   if ( -d ./WORCA2LIMPIS_16 ) then 
    315     set dorv = `ls -1rtd ./WORCA2LIMPIS_16/{$mach}/* | tail -1l ` 
    316     set dorv = $dorv:t 
    317     set f1o = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/ocean.output 
    318     set f1s = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/solver.stat 
    319     set f1t = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/tracer.stat 
    320     set f2o = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/ocean.output 
    321     set f2s = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/solver.stat 
    322     set f2t = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/tracer.stat 
     314  if ( -d ./WORCA2LIM3PIS_32 ) then 
     315    set dorv = `ls -1rtd ./WORCA2LIM3PIS_32/{$mach}/* | tail -1l ` 
     316    set dorv = $dorv:t 
     317    set f1o = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     318    set f1s = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     319    set f1t = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_4_8/tracer.stat 
     320    set f2o = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     321    set f2s = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
     322    set f2t = ./WORCA2LIM3PIS_32/{$mach}/{$dorv}/REPRO_8_4/tracer.stat 
    323323 
    324324    set stato = 0 
    325325    cmp -s $f1s $f2s 
    326326    if ( $status == 0 ) then 
    327       echo "ORCA2LIMPIS solver.stat reproducibility  passed" 
     327      echo "ORCA2LIM3PIS solver.stat reproducibility  passed" 
    328328    else 
    329329      set stato = 1 
    330       echo "ORCA2LIMPIS solver.stat reproducibility  FAILED" 
     330      echo "ORCA2LIM3PIS solver.stat reproducibility  FAILED" 
    331331      if ( $pass == 1 ) then 
    332332        echo "<return> to view solver.stat differences" 
     
    338338    cmp -s $f1t $f2t 
    339339    if ( $status == 0 ) then 
    340       echo "ORCA2LIMPIS tracer.stat reproducibility  passed" 
     340      echo "ORCA2LIM3PIS tracer.stat reproducibility  passed" 
    341341    else 
    342342      set stato = 1 
    343       echo "ORCA2LIMPIS tracer.stat reproducibility  FAILED" 
     343      echo "ORCA2LIM3PIS tracer.stat reproducibility  FAILED" 
    344344      if ( $pass == 1 ) then 
    345345        echo "<return> to view tracer.stat differences" 
     
    360360  endif 
    361361 
    362   if ( -d ./WORCA2OFFPIS_16 ) then 
    363     set dorv = `ls -1rtd ./WORCA2OFFPIS_16/{$mach}/* | tail -1l ` 
    364     set dorv = $dorv:t 
    365     set f1o = ./WORCA2OFFPIS_16/{$mach}/{$dorv}/REPRO_2_8/ocean.output 
    366     set f1s = ./WORCA2OFFPIS_16/{$mach}/{$dorv}/REPRO_2_8/tracer.stat 
    367     set f2o = ./WORCA2OFFPIS_16/{$mach}/{$dorv}/REPRO_4_4/ocean.output 
    368     set f2s = ./WORCA2OFFPIS_16/{$mach}/{$dorv}/REPRO_4_4/tracer.stat 
     362  if ( -d ./WORCA2OFFPIS_32 ) then 
     363    set dorv = `ls -1rtd ./WORCA2OFFPIS_32/{$mach}/* | tail -1l ` 
     364    set dorv = $dorv:t 
     365    set f1o = ./WORCA2OFFPIS_32/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     366    set f1s = ./WORCA2OFFPIS_32/{$mach}/{$dorv}/REPRO_4_8/tracer.stat 
     367    set f2o = ./WORCA2OFFPIS_32/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     368    set f2s = ./WORCA2OFFPIS_32/{$mach}/{$dorv}/REPRO_8_4/tracer.stat 
    369369 
    370370    cmp -s $f1s $f2s 
     
    415415    set dorv = `ls -1rtd ./WORCA2LIM3_16/{$mach}/* | tail -1l ` 
    416416    set dorv = $dorv:t 
    417     set f1o = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_2_8/ocean.output 
    418     set f1s = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_2_8/solver.stat 
    419     set f2o = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_4_4/ocean.output 
    420     set f2s = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_4_4/solver.stat 
     417    set f1o = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     418    set f1s = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     419    set f2o = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     420    set f2s = ./WORCA2LIM3_16/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
    421421 
    422422    cmp -s $f1s $f2s 
     
    439439 
    440440 
    441   if ( -d ./WORCA2_LIM_OBS ) then 
    442     set dorv = `ls -1rtd ./WORCA2_LIM_OBS/{$mach}/* | tail -1l ` 
    443     set dorv = $dorv:t 
    444     set f1o = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_2_8/ocean.output 
    445     set f1s = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_2_8/solver.stat 
    446     set f2o = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_4_4/ocean.output 
    447     set f2s = ./WORCA2_LIM_OBS/{$mach}/{$dorv}/REPRO_4_4/solver.stat 
    448  
    449     cmp -s $f1s $f2s 
    450     if ( $status == 0 ) then 
    451       echo "ORCA2_LIM_OBS   reproducibility passed" 
    452     else 
    453       echo "ORCA2_LIM_OBS   reproducibility FAILED" 
     441  if ( -d ./WORCA2_LIM3_OBS ) then 
     442    set dorv = `ls -1rtd ./WORCA2_LIM3_OBS/{$mach}/* | tail -1l ` 
     443    set dorv = $dorv:t 
     444    set f1o = ./WORCA2_LIM3_OBS/{$mach}/{$dorv}/REPRO_4_8/ocean.output 
     445    set f1s = ./WORCA2_LIM3_OBS/{$mach}/{$dorv}/REPRO_4_8/solver.stat 
     446    set f2o = ./WORCA2_LIM3_OBS/{$mach}/{$dorv}/REPRO_8_4/ocean.output 
     447    set f2s = ./WORCA2_LIM3_OBS/{$mach}/{$dorv}/REPRO_8_4/solver.stat 
     448 
     449    cmp -s $f1s $f2s 
     450    if ( $status == 0 ) then 
     451      echo "ORCA2_LIM3_OBS   reproducibility passed" 
     452    else 
     453      echo "ORCA2_LIM3_OBS   reproducibility FAILED" 
    454454      if ( $pass == 1 ) then 
    455455        echo "<return> to view solver.stat differences" 
Note: See TracChangeset for help on using the changeset viewer.