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

Changeset 6140 for trunk/NEMOGCM/SETTE


Ignore:
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.

Location:
trunk/NEMOGCM/SETTE
Files:
5 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC40_METO

    r5480 r6140  
    22#! 
    33#PBS -N nemo_sette 
    4 #PBS -l walltime=00:30:00 
     4#PBS -l walltime=00:08:00 
    55#PBS -j oe 
    6 #PBS -q QUEUE 
     6#PBS -q normal 
    77#PBS -l SELECT 
    88 
    … …  
    7777# Run SPMD case 
    7878# 
    79     if [ $OCORES -gt 32 ] ; then 
    80         #Still more than one node so run in parallel queue 
    81         echo time aprun -b  -n $OCORES -N $O_PER_NODE ./opa 
    82              time aprun -b  -n $OCORES -N $O_PER_NODE ./opa 
    83     else 
    84        echo time mpiexec -n $OCORES ./opa 
    85             time mpiexec -n $OCORES ./opa 
    86     fi 
     79    echo time aprun -b  -n $OCORES -N $O_PER_NODE ./opa 
     80         time aprun -b  -n $OCORES -N $O_PER_NODE ./opa 
    8781  fi 
    8882# 

  • trunk/NEMOGCM/SETTE/input_ORCA2_LIM.cfg

    r5398 r6140  
    1 ORCA2_LIM_nemo_v3.6.tar ORCA2_LIM_nemo_v3.6 
     1ORCA2_LIM_nemo_v3.6st.tar ORCA2_LIM_nemo_v3.6 

  • trunk/NEMOGCM/SETTE/prepare_job.sh

    r5559 r6140  
    266266                                echo NB_XNODES=${NB_XNODES}  
    267267                                echo Total NB_NODES=${NB_NODES} 
    268                                 if [ ${NB_NODES} -eq 1 ] ; then 
    269                                    QUEUE=shared 
    270                                    #Not using XIOS in detatched mode and using less than one node so should be ok on shared node 
    271                                    #Load snplauncher module to allow use of mpiexec 
    272                                    SELECT="select=1:ncpus=$((NXIO_PROC + NB_PROC))":mem=15GB 
    273                                    module load cray-snplauncher 
    274                                    echo 'Shared Queue' 
    275                                 else 
    276                                    QUEUE=normal 
    277                                    SELECT="select=$NB_NODES" 
    278                                    module unload cray-snplauncher #Make sure snplauncher module is not loaded 
    279                                    echo 'Normal Queue' 
    280                                 fi 
     268                                QUEUE=normal 
     269                                SELECT="select=$NB_NODES" 
     270                                module unload cray-snplauncher #Make sure snplauncher module is not loaded 
    281271                                ;; 
    282272                        openmpi_NAVITI_MERCATOR) 
    … …  
    330320                    ;; 
    331321              XC40_METO*) 
    332                     cat run_sette_test.job | sed -e"s/QUEUE/${QUEUE}/" \ 
    333                                                  -e"s/SELECT/${SELECT}/" > run_sette_test1.job 
     322                    cat run_sette_test.job | sed -e"s/SELECT/${SELECT}/" > run_sette_test1.job 
    334323                    mv run_sette_test1.job run_sette_test.job 
    335324                    ;; 

  • trunk/NEMOGCM/SETTE/sette.sh

    r5930 r6140  
    144144#                  18 & 19  
    145145 
    146 for config in  1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 
     146for config in  1 2 3 4 5 6 7 8 9 10 11 12 15 16 
    147147 
    148148do 
    … …  
    168168    set_namelist namelist_cfg ln_clobber .true. 
    169169    set_namelist namelist_cfg nn_fwb 0 
     170#   set_namelist namelist_cfg nn_solv 2 
    170171    set_namelist namelist_cfg jpni 2 
    171172    set_namelist namelist_cfg jpnj 2 
    … …  
    191192    set_namelist namelist_cfg ln_clobber .true. 
    192193    set_namelist namelist_cfg nn_fwb 0 
     194#   set_namelist namelist_cfg nn_solv 2 
    193195    set_namelist namelist_cfg jpni 2 
    194196    set_namelist namelist_cfg jpnj 2 
    … …  
    236238    set_namelist namelist_cfg ln_ctl .false. 
    237239    set_namelist namelist_cfg ln_clobber .true. 
     240#   set_namelist namelist_cfg nn_solv 2 
    238241    set_namelist namelist_cfg jpni 1 
    239242    set_namelist namelist_cfg jpnj 4 
    … …  
    262265    set_namelist namelist_cfg ln_ctl .false. 
    263266    set_namelist namelist_cfg ln_clobber .true. 
     267#   set_namelist namelist_cfg nn_solv 2 
    264268    set_namelist namelist_cfg jpni 2 
    265269    set_namelist namelist_cfg jpnj 2 
    … …  
    300304    set_namelist namelist_cfg jpnj 4 
    301305    set_namelist namelist_cfg jpnij 8 
     306#   set_namelist namelist_cfg nn_solv 2 
    302307    set_namelist namelist_top_cfg ln_trcdta .false. 
    303308    set_namelist namelist_top_cfg ln_diatrc .false. 
    … …  
    335340    set_namelist namelist_cfg jpnj 4 
    336341    set_namelist namelist_cfg jpnij 8 
     342#   set_namelist namelist_cfg nn_solv 2 
    337343    set_namelist namelist_top_cfg ln_diatrc .false. 
    338344    set_namelist namelist_top_cfg ln_rsttr .true. 
    … …  
    392398    set_namelist namelist_cfg jpnj 4 
    393399    set_namelist namelist_cfg jpnij 16 
     400#   set_namelist namelist_cfg nn_solv 2 
    394401    set_namelist namelist_top_cfg ln_trcdta .false. 
    395402    set_namelist namelist_top_cfg ln_diatrc .false. 
    … …  
    430437    set_namelist namelist_cfg jpnj 8 
    431438    set_namelist namelist_cfg jpnij 16 
     439#   set_namelist namelist_cfg nn_solv 2 
    432440    set_namelist namelist_top_cfg ln_trcdta .false. 
    433441    set_namelist namelist_top_cfg ln_diatrc .false. 
    … …  
    650658    set_namelist namelist_cfg jpnj 2 
    651659    set_namelist namelist_cfg jpnij 4 
     660#   set_namelist namelist_cfg nn_solv 2 
    652661    if [ ${USING_MPMD} == "yes" ] ; then 
    653662       set_xio_using_server iodef.xml true 
    … …  
    673682    set_namelist namelist_cfg jpnj 2 
    674683    set_namelist namelist_cfg jpnij 4 
     684#   set_namelist namelist_cfg nn_solv 2 
    675685    set_namelist namelist_cfg cn_ocerst_in \"O2L3_LONG_00000075_restart\" 
    676686    set_namelist namelist_ice_cfg cn_icerst_in \"O2L3_LONG_00000075_restart_ice\" 
    … …  
    713723    set_namelist namelist_cfg jpnj 4 
    714724    set_namelist namelist_cfg jpnij 16 
     725#   set_namelist namelist_cfg nn_solv 2 
    715726    if [ ${USING_MPMD} == "yes" ] ; then 
    716727       set_xio_using_server iodef.xml true 
    … …  
    737748    set_namelist namelist_cfg jpnj 8 
    738749    set_namelist namelist_cfg jpnij 16 
     750#   set_namelist namelist_cfg nn_solv 2 
    739751    if [ ${USING_MPMD} == "yes" ] ; then 
    740752       set_xio_using_server iodef.xml true 
    … …  
    10071019    set_namelist namelist_cfg ln_clobber .true. 
    10081020    set_namelist namelist_cfg nn_fwb 0 
     1021#   set_namelist namelist_cfg nn_solv 2 
    10091022    set_namelist namelist_cfg jpni 2 
    10101023    set_namelist namelist_cfg jpnj 2 
    … …  
    10301043    set_namelist namelist_cfg ln_clobber .true. 
    10311044    set_namelist namelist_cfg nn_fwb 0 
     1045#   set_namelist namelist_cfg nn_solv 2 
    10321046    set_namelist namelist_cfg jpni 2 
    10331047    set_namelist namelist_cfg jpnj 2 
    … …  
    10741088    set_namelist namelist_cfg ln_ctl .false. 
    10751089    set_namelist namelist_cfg ln_clobber .true. 
     1090#   set_namelist namelist_cfg nn_solv 2 
    10761091    set_namelist namelist_cfg jpni 1 
    10771092    set_namelist namelist_cfg jpnj 4 
    … …  
    11001115    set_namelist namelist_cfg ln_ctl .false. 
    11011116    set_namelist namelist_cfg ln_clobber .true. 
     1117#   set_namelist namelist_cfg nn_solv 2 
    11021118    set_namelist namelist_cfg jpni 2 
    11031119    set_namelist namelist_cfg jpnj 2 
    … …  
    11211137    export TEST_NAME="REPRO_4_4" 
    11221138    cd ${CONFIG_DIR} 
    1123     . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM_OBS -r ORCA2_LIM -j 8 add_key "key_mpp_rep key_diaobs key_asminc" del_key ${DEL_KEYS} 
     1139    . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM_OBS -r ORCA2_LIM -j 8 add_key "key_mpp_rep key_asminc" del_key ${DEL_KEYS} 
    11241140    cd ${SETTE_DIR} 
    11251141    . ./param.cfg 
    … …  
    11381154    set_namelist namelist_cfg jpnj 4 
    11391155    set_namelist namelist_cfg jpnij 16 
     1156    set_namelist namelist_cfg ln_diaobs .true. 
    11401157    set_namelist namelist_cfg ln_t3d .true. 
    11411158    set_namelist namelist_cfg ln_s3d .true. 
    1142     set_namelist namelist_cfg ln_profb .true. 
    11431159    set_namelist namelist_cfg ln_sst .true. 
    1144     set_namelist namelist_cfg ln_sstfb .true. 
    11451160    set_namelist namelist_cfg ln_sla .true. 
    1146     set_namelist namelist_cfg ln_slafb .true. 
    1147     set_namelist namelist_cfg ln_seaice .false. 
     1161    set_namelist namelist_cfg ln_sic .true. 
     1162    set_namelist namelist_cfg ln_vel3d .true. 
    11481163    set_namelist namelist_cfg ln_bkgwri .true. 
    11491164    set_namelist namelist_cfg ln_trainc .true. 
    … …  
    11761191    set_namelist namelist_cfg jpnj 8 
    11771192    set_namelist namelist_cfg jpnij 16 
     1193    set_namelist namelist_cfg ln_diaobs .true. 
    11781194    set_namelist namelist_cfg ln_t3d .true. 
    11791195    set_namelist namelist_cfg ln_s3d .true. 
    1180     set_namelist namelist_cfg ln_profb .true. 
    11811196    set_namelist namelist_cfg ln_sst .true. 
    1182     set_namelist namelist_cfg ln_sstfb .true. 
    11831197    set_namelist namelist_cfg ln_sla .true. 
    1184     set_namelist namelist_cfg ln_slafb .true. 
    1185     set_namelist namelist_cfg ln_seaice .false. 
     1198    set_namelist namelist_cfg ln_sic .true. 
     1199    set_namelist namelist_cfg ln_vel3d .true. 
    11861200    set_namelist namelist_cfg ln_bkgwri .true. 
    11871201    set_namelist namelist_cfg ln_trainc .true. 
    … …  
    13291343    set_namelist namelist_cfg jpnj 2 
    13301344    set_namelist namelist_cfg jpnij 4 
     1345#   set_namelist namelist_cfg nn_solv 2 
    13311346# 
    13321347    set_namelist 1_namelist_cfg cn_exp \"O2LP_LONG\" 
    … …  
    13611376 
    13621377    set_namelist namelist_cfg jpnij 4 
     1378#   set_namelist namelist_cfg nn_solv 2 
    13631379    set_namelist 1_namelist_cfg cn_exp \"O2LP_SHORT\" 
    13641380    set_namelist 1_namelist_cfg nn_it000 151 
    … …  
    14121428    set_namelist namelist_cfg jpnj 4 
    14131429    set_namelist namelist_cfg jpnij 16 
     1430#   set_namelist namelist_cfg nn_solv 2 
    14141431# 
    14151432    set_namelist 1_namelist_cfg nn_it000 1 
    … …  
    14431460    set_namelist namelist_cfg jpnj 8 
    14441461    set_namelist namelist_cfg jpnij 16 
     1462#   set_namelist namelist_cfg nn_solv 2 
    14451463# 
    14461464    set_namelist 1_namelist_cfg nn_it000 1 

  • trunk/NEMOGCM/SETTE/sette_rpt

    r5836 r6140  
    9090    set f1o = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/ocean.output 
    9191    set f1s = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/solver.stat 
     92    set f1t = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/LONG/tracer.stat 
    9293    set f2o = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/ocean.output 
    9394    set f2s = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/solver.stat 
    94    
    95     set nl = `wc -l $f2s` 
    96     tail -$nl[1] $f1s > f1.tmp$$ 
    97     cmp -s f1.tmp$$ $f2s 
    98     if ( $status == 0 ) then 
    99       echo "ORCA2LIMPIS restartability  passed" 
    100     else 
    101       echo "ORCA2LIMPIS restartability  FAILED" 
    102       if ( $pass == 1 ) then 
    103         echo "<return> to view solver.stat differences" 
    104         set y = $< 
    105         sdiff f1.tmp$$ $f2s 
    106         echo "<return> to view ocean.output differences" 
    107         set y = $< 
    108         sdiff $f1o $f2o | grep "|" 
    109         echo "<return> to continue" 
    110         set y = $< 
    111       endif 
     95    set f2t = ./WORCA2LIMPIS_LONG/{$mach}/{$dorv}/SHORT/tracer.stat 
     96 
     97    set stato = 0 
     98    set nl = `wc -l $f2s` 
     99    tail -$nl[1] $f1s > f1.tmp$$ 
     100    cmp -s f1.tmp$$ $f2s 
     101    if ( $status == 0 ) then 
     102      echo "ORCA2LIMPIS solver.stat restartability  passed" 
     103    else 
     104      set stato = 1 
     105      echo "ORCA2LIMPIS solver.stat restartability  FAILED" 
     106      if ( $pass == 1 ) then 
     107        echo "<return> to view solver.stat differences" 
     108        set y = $< 
     109        sdiff f1.tmp$$ $f2s 
     110      endif 
     111    endif 
     112 
     113    set nl = `wc -l $f2t` 
     114    tail -$nl[1] $f1t > f1.tmp$$ 
     115    cmp -s f1.tmp$$ $f2t 
     116    if ( $status == 0 ) then 
     117      echo "ORCA2LIMPIS tracer.stat restartability  passed" 
     118    else 
     119      set stato = 1 
     120      echo "ORCA2LIMPIS tracer.stat restartability  FAILED" 
     121      if ( $pass == 1 ) then 
     122        echo "<return> to view tracer.stat differences" 
     123        set y = $< 
     124        sdiff f1.tmp$$ $f2t 
     125      endif 
     126    endif 
     127    if ( $stato == 1 ) then 
     128      if ( $pass == 1 ) then 
     129        echo "<return> to view ocean.output differences" 
     130        set y = $< 
     131        sdiff $f1o $f2o | grep "|" 
     132        echo "<return> to continue" 
     133        set y = $< 
     134      endif 
     135      set stato = 0 
    112136    endif 
    113137    rm f1.tmp$$ 
    … …  
    293317    set f1o = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/ocean.output 
    294318    set f1s = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/solver.stat 
     319    set f1t = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_2_8/tracer.stat 
    295320    set f2o = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/ocean.output 
    296321    set f2s = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/solver.stat 
    297    
    298     cmp -s $f1s $f2s 
    299     if ( $status == 0 ) then 
    300       echo "ORCA2LIMPIS reproducibility passed" 
    301     else 
    302       echo "ORCA2LIMPIS reproducibility FAILED" 
    303       if ( $pass == 1 ) then 
    304         echo "<return> to view solver.stat differences" 
    305         set y = $< 
    306         sdiff $f1s $f2s 
    307         echo "<return> to view ocean.output differences" 
    308         set y = $< 
    309         sdiff $f1o $f2o | grep "|" 
    310         echo "<return> to continue" 
    311         set y = $< 
    312       endif 
     322    set f2t = ./WORCA2LIMPIS_16/{$mach}/{$dorv}/REPRO_4_4/tracer.stat 
     323 
     324    set stato = 0 
     325    cmp -s $f1s $f2s 
     326    if ( $status == 0 ) then 
     327      echo "ORCA2LIMPIS solver.stat reproducibility  passed" 
     328    else 
     329      set stato = 1 
     330      echo "ORCA2LIMPIS solver.stat reproducibility  FAILED" 
     331      if ( $pass == 1 ) then 
     332        echo "<return> to view solver.stat differences" 
     333        set y = $< 
     334        sdiff $f1s $f2s 
     335      endif 
     336    endif 
     337 
     338    cmp -s $f1t $f2t 
     339    if ( $status == 0 ) then 
     340      echo "ORCA2LIMPIS tracer.stat reproducibility  passed" 
     341    else 
     342      set stato = 1 
     343      echo "ORCA2LIMPIS tracer.stat reproducibility  FAILED" 
     344      if ( $pass == 1 ) then 
     345        echo "<return> to view tracer.stat differences" 
     346        set y = $< 
     347        sdiff $f1t $f2t 
     348      endif 
     349    endif 
     350    if ( $stato == 1 ) then 
     351      if ( $pass == 1 ) then 
     352        echo "<return> to view ocean.output differences" 
     353        set y = $< 
     354        sdiff $f1o $f2o | grep "|" 
     355        echo "<return> to continue" 
     356        set y = $< 
     357      endif 
     358      set stato = 0 
    313359    endif 
    314360  endif 
Note: See TracChangeset for help on using the changeset viewer.