Changeset 8839


Ignore:
Timestamp:
2017-11-28T16:56:25+01:00 (3 years ago)
Author:
clevy
Message:

take in account AGRIF code corruption test and add nn_fsbc =1 for SAS, ticket #1983

Location:
trunk/NEMOGCM/SETTE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/SETTE/new_sette.sh

    r8828 r8839  
    141141# ORCA2_LIM3_OBS    :  7 
    142142# ORCA2_AGRIF_LIM3  :  8  
    143  
    144 for config in 1 2 3 4 5 6 7 8 
     143# ORCA2AGR          :  9 & 10  AGRIF active with no zoom, compared to no AGRIF cpp key 
     144 
     145for config in 1 2 3 4 5 6 7 8 9 10 
    145146do 
    146147 
     
    150151    export TEST_NAME="LONG" 
    151152    cd ${CONFIG_DIR0} 
    152     . ./makenemo -m ${CMP_NAM} -n GYREPIS_SETTETESTS -r GYRE_PISCES -j 8 del_key ${DEL_KEYS} 
     153    . ./makenemo -m ${CMP_NAM} -n GYREPIS_ST -r GYRE_PISCES -j 8 del_key ${DEL_KEYS} 
    153154    cd ${SETTE_DIR} 
    154155    . ./param.cfg 
     
    287288    export TEST_NAME="LONG" 
    288289    cd ${CONFIG_DIR0} 
    289     . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3PIS_SETTETESTS -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS} 
     290    . ./makenemo -m ${CMP_NAM} -n ORCA2LIM3PIS_ST -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS} 
    290291    cd ${SETTE_DIR} 
    291292    . ./param.cfg 
     
    474475    export TEST_NAME="LONG" 
    475476    cd ${CONFIG_DIR0} 
    476     . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_SETTETESTS -r ORCA2_OFF_PISCES -j 8 del_key ${DEL_KEYS} 
     477    . ./makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_ST -r ORCA2_OFF_PISCES -j 8 del_key ${DEL_KEYS} 
    477478    cd ${SETTE_DIR} 
    478479    . ./param.cfg 
     
    650651    export TEST_NAME="LONG" 
    651652    cd ${CONFIG_DIR0} 
    652     . ./makenemo -m ${CMP_NAM} -n AMM12_SETTETESTS -r AMM12 -j 8 del_key ${DEL_KEYS} 
     653    . ./makenemo -m ${CMP_NAM} -n AMM12_ST -r AMM12 -j 8 del_key ${DEL_KEYS} 
    653654    cd ${SETTE_DIR} 
    654655    . ./param.cfg 
     
    775776    export TEST_NAME="LONG" 
    776777    cd ${CONFIG_DIR0} 
    777     . ./makenemo -m ${CMP_NAM} -n SAS_SETTETESTS -r ORCA2_SAS_LIM3 -j 8 del_key ${DEL_KEYS} 
     778    . ./makenemo -m ${CMP_NAM} -n SAS_ST -r ORCA2_SAS_LIM3 -j 8 del_key ${DEL_KEYS} 
    778779    cd ${SETTE_DIR} 
    779780    . ./param.cfg 
     
    792793    set_namelist namelist_cfg ln_read_cfg .true. 
    793794    set_namelist namelist_cfg ln_linssh .true. 
     795    set_namelist namelist_cfg nn_fsbc 1  
    794796    set_namelist namelist_cfg nn_fwb 0 
    795797    set_namelist namelist_cfg jpni 4 
     
    815817    set_namelist namelist_cfg ln_read_cfg .true. 
    816818    set_namelist namelist_cfg ln_linssh .true. 
     819    set_namelist namelist_cfg nn_fsbc 1  
    817820    set_namelist namelist_cfg nn_fwb 0 
    818821    set_namelist namelist_cfg jpni 4 
     
    846849    export TEST_NAME="LONG" 
    847850    cd ${CONFIG_DIR0} 
    848     . ./makenemo -m ${CMP_NAM} -n ISOMIP_SETTETESTS -r ISOMIP -a TEST_CASES -j 8 del_key ${DEL_KEYS} 
     851    . ./makenemo -m ${CMP_NAM} -n ISOMIP_ST -r ISOMIP -a TEST_CASES -j 8 del_key ${DEL_KEYS} 
    849852    cd ${SETTE_DIR} 
    850853    . ./param.cfg 
     
    972975    export TEST_NAME="REPRO_4_8" 
    973976    cd ${CONFIG_DIR0} 
    974     . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS_SETTETESTS -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3"  -j 8 add_key "key_asminc" del_key "key_top" 
     977    . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM3_OBS_ST -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3"  -j 8 add_key "key_asminc" del_key "key_top" 
    975978    cd ${SETTE_DIR} 
    976979    . ./param.cfg 
     
    10801083    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    10811084fi 
    1082 # TEST FOR ORCA2_LIM3_AGRIF : simple test of running AGRIF (no restartability neither reproducibility tests) 
     1085# TEST FOR ORCA2_LIM3_AGRIF : AGULHAS AGRIF 
    10831086if [ ${config} -eq 8 ] ;  then 
    1084     ## ORCA2_LIM3 with Agulhas AGRIF zoom in MPI 
    1085     export TEST_NAME="SHORT" 
    1086     cd ${CONFIG_DIR0} 
    1087     . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_SETTETESTS -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif key_zdftmx" del_key "key_zdftmx_new key_top" 
    1088     cd ${SETTE_DIR} 
    1089     . ./param.cfg 
    1090     . ./all_functions.sh 
    1091     . ./prepare_exe_dir.sh 
    1092     JOB_FILE=${EXE_DIR}/run_job.sh 
    1093     NPROC=2 
    1094     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    1095     cd ${EXE_DIR} 
    1096     set_namelist namelist_cfg nn_it000 1 
    1097     set_namelist namelist_cfg nn_itend 75 
    1098     set_namelist namelist_cfg ln_ctl .false. 
    1099     set_namelist namelist_cfg ln_clobber .true. 
    1100     set_namelist namelist_cfg ln_read_cfg .true. 
    1101     set_namelist namelist_cfg ln_linssh .true. 
    1102     set_namelist namelist_cfg ln_hpg_sco .false. 
    1103     set_namelist namelist_cfg ln_hpg_zps .true.  
    1104     set_namelist namelist_cfg nn_fwb 0 
    1105     set_namelist namelist_cfg jpni 1 
    1106     set_namelist namelist_cfg jpnj 2 
    1107     set_namelist namelist_cfg jpnij 2 
    1108     set_namelist 1_namelist_cfg nn_it000 1 
    1109     set_namelist 1_namelist_cfg nn_itend 150 
    1110     set_namelist 1_namelist_cfg ln_ctl .false. 
    1111     set_namelist 1_namelist_cfg ln_clobber .true. 
    1112     set_namelist 1_namelist_cfg ln_read_cfg .true. 
    1113     set_namelist 1_namelist_cfg ln_linssh .true. 
    1114     set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1115     set_namelist 1_namelist_cfg ln_hpg_zps .true.  
    1116     if [ ${USING_MPMD} == "yes" ] ; then 
    1117        set_xio_using_server iodef.xml true 
    1118     else 
    1119        set_xio_using_server iodef.xml false 
    1120     fi 
    1121     cd ${SETTE_DIR} 
    1122     . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    1123     cd ${SETTE_DIR} 
    1124     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1125  
    1126  
    1127 # test code corruption with AGRIF 
    1128 # Compile and run with or without AGRIF ORCA2_LIM3 
    1129     # First run same as 15 but without zoom 
    1130     export TEST_NAME="SHORT_NOZOOM" 
    1131     cd ${CONFIG_DIR0} 
    1132     cd ${SETTE_DIR} 
    1133     . ./param.cfg 
    1134     . ./all_functions.sh 
    1135     . ./prepare_exe_dir.sh 
    1136     JOB_FILE=${EXE_DIR}/run_job.sh 
    1137     NPROC=4 
    1138     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    1139     cd ${EXE_DIR} 
    1140     set_namelist namelist_cfg nn_it000 1 
    1141     set_namelist namelist_cfg nn_itend 75 
    1142     set_namelist namelist_cfg ln_ctl .false. 
    1143     set_namelist namelist_cfg ln_clobber .true. 
    1144     set_namelist namelist_cfg ln_read_cfg .true. 
    1145     set_namelist namelist_cfg ln_linssh .true. 
    1146     set_namelist namelist_cfg ln_hpg_sco .false. 
    1147     set_namelist namelist_cfg ln_hpg_zps .true.  
    1148     set_namelist namelist_cfg nn_fwb 0 
    1149     set_namelist namelist_cfg jpni 2 
    1150     set_namelist namelist_cfg jpnj 2 
    1151     set_namelist namelist_cfg jpnij 4 
    1152 #  
    1153 #   Set the number of fine grids to zero:     
    1154     sed -i "1s/.*/0/" ${EXE_DIR}/AGRIF_FixedGrids.in 
    1155  
    1156     if [ ${USING_MPMD} == "yes" ] ; then 
    1157        set_xio_using_server iodef.xml true 
    1158     else 
    1159        set_xio_using_server iodef.xml false 
    1160     fi 
    1161     cd ${SETTE_DIR} 
    1162     . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    1163     cd ${SETTE_DIR} 
    1164     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1165  
    1166     export TEST_NAME="SHORT_NOAGRIF" 
    1167     cd ${CONFIG_DIR0} 
    1168     cd ${SETTE_DIR} 
    1169     . ./param.cfg 
    1170     . ./all_functions.sh 
    1171     . ./prepare_exe_dir.sh 
    1172     JOB_FILE=${EXE_DIR}/run_job.sh 
    1173     NPROC=4 
    1174     if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
    1175     cd ${EXE_DIR} 
    1176     set_namelist namelist_cfg nn_it000 1 
    1177     set_namelist namelist_cfg nn_itend 75 
    1178     set_namelist namelist_cfg ln_ctl .false. 
    1179     set_namelist namelist_cfg ln_clobber .true. 
    1180     set_namelist namelist_cfg ln_read_cfg .true. 
    1181     set_namelist namelist_cfg ln_linssh .true. 
    1182     set_namelist namelist_cfg ln_hpg_sco .false. 
    1183     set_namelist namelist_cfg ln_hpg_zps .true.  
    1184     set_namelist namelist_cfg nn_fwb 0 
    1185     set_namelist namelist_cfg jpni 2 
    1186     set_namelist namelist_cfg jpnj 2 
    1187     set_namelist namelist_cfg jpnij 4 
    1188 # 
    1189     if [ ${USING_MPMD} == "yes" ] ; then 
    1190        set_xio_using_server iodef.xml true 
    1191     else 
    1192        set_xio_using_server iodef.xml false 
    1193     fi 
    1194     cd ${SETTE_DIR} 
    1195     . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    1196     cd ${SETTE_DIR} 
    1197     . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
    1198  
    1199  
    1200  
    1201 ## Restartability tests for ORCA2_LIM3_AGRIF  
     1087## Restartability tests 
    12021088    export TEST_NAME="LONG" 
    12031089    cd ${CONFIG_DIR0} 
     1090    . ./makenemo -m ${CMP_NAM} -n ORCA2AGR_ST -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif key_zdftmx" del_key "key_zdftmx_new key_top" 
    12041091    cd ${SETTE_DIR} 
    12051092    . ./param.cfg 
     
    12181105    set_namelist namelist_cfg ln_linssh .true. 
    12191106    set_namelist namelist_cfg ln_hpg_sco .false. 
    1220     set_namelist namelist_cfg ln_hpg_zps .true.  
     1107    set_namelist namelist_cfg ln_hpg_zps .true. 
    12211108    set_namelist namelist_cfg nn_fwb 0 
    12221109    set_namelist namelist_cfg jpni 2 
     
    12331120    set_namelist 1_namelist_cfg ln_linssh .true. 
    12341121    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1235     set_namelist 1_namelist_cfg ln_hpg_zps .true.  
     1122    set_namelist 1_namelist_cfg ln_hpg_zps .true. 
    12361123# 
    12371124    if [ ${USING_MPMD} == "yes" ] ; then 
     
    12421129    cd ${SETTE_DIR} 
    12431130    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
    1244      
     1131 
    12451132    cd ${SETTE_DIR} 
    12461133    export TEST_NAME="SHORT" 
     
    12571144    set_namelist namelist_cfg ln_linssh .true. 
    12581145    set_namelist namelist_cfg ln_hpg_sco .false. 
    1259     set_namelist namelist_cfg ln_hpg_zps .true.  
     1146    set_namelist namelist_cfg ln_hpg_zps .true. 
    12601147    set_namelist namelist_cfg nn_fwb 0 
    12611148    set_namelist namelist_cfg jpni 2 
     
    12731160    set_namelist 1_namelist_cfg ln_linssh .true. 
    12741161    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1275     set_namelist 1_namelist_cfg ln_hpg_zps .true.  
     1162    set_namelist 1_namelist_cfg ln_hpg_zps .true. 
    12761163    set_namelist namelist_cfg cn_ocerst_in \"O2LP_LONG_00000075_restart\" 
    12771164    set_namelist namelist_ice_cfg cn_icerst_in \"O2LP_LONG_00000075_restart_ice\" 
    12781165    set_namelist 1_namelist_cfg cn_ocerst_in \"O2LP_LONG_00000150_restart\" 
    12791166    set_namelist 1_namelist_ice_cfg cn_icerst_in \"O2LP_LONG_00000150_restart_ice\" 
    1280  
    12811167    for (( i=1; i<=$NPROC; i++)) ; do 
    12821168        L_NPROC=$(( $i - 1 )) 
     
    13161202    set_namelist namelist_cfg ln_linssh .true. 
    13171203    set_namelist namelist_cfg ln_hpg_sco .false. 
    1318     set_namelist namelist_cfg ln_hpg_zps .true.  
     1204    set_namelist namelist_cfg ln_hpg_zps .true. 
    13191205    set_namelist namelist_cfg nn_fwb 0 
    13201206    set_namelist namelist_cfg jpni 4 
     
    13291215    set_namelist 1_namelist_cfg ln_linssh .true. 
    13301216    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1331     set_namelist 1_namelist_cfg ln_hpg_zps .true.  
     1217    set_namelist 1_namelist_cfg ln_hpg_zps .true. 
    13321218 
    13331219    if [ ${USING_MPMD} == "yes" ] ; then 
     
    13551241    set_namelist namelist_cfg ln_linssh .true. 
    13561242    set_namelist namelist_cfg ln_hpg_sco .false. 
    1357     set_namelist namelist_cfg ln_hpg_zps .true.  
     1243    set_namelist namelist_cfg ln_hpg_zps .true. 
    13581244    set_namelist namelist_cfg nn_fwb 0 
    13591245    set_namelist namelist_cfg jpni 2 
     
    13681254    set_namelist 1_namelist_cfg ln_linssh .true. 
    13691255    set_namelist 1_namelist_cfg ln_hpg_sco .false. 
    1370     set_namelist 1_namelist_cfg ln_hpg_zps .true.  
     1256    set_namelist 1_namelist_cfg ln_hpg_zps .true. 
    13711257 
    13721258    if [ ${USING_MPMD} == "yes" ] ; then 
     
    13811267fi 
    13821268 
     1269# test code corruption with AGRIF 
     1270if [ ${config} -eq 9 ] ;  then 
     1271 
     1272# Compile with AGRIF but run with no zoom 
     1273    export TEST_NAME="AGRIFNOZ" 
     1274    cd ${CONFIG_DIR0} 
     1275    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_NOZOOM_ST -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 add_key "key_agrif" del_key "key_zdftmx key_top" 
     1276    cd ${SETTE_DIR} 
     1277    . ./param.cfg 
     1278    . ./all_functions.sh 
     1279    . ./prepare_exe_dir.sh 
     1280    JOB_FILE=${EXE_DIR}/run_job.sh 
     1281    NPROC=4 
     1282    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     1283    cd ${EXE_DIR} 
     1284    set_namelist namelist_cfg nn_it000 1 
     1285    set_namelist namelist_cfg nn_itend 75 
     1286    set_namelist namelist_cfg ln_ctl .false. 
     1287    set_namelist namelist_cfg ln_clobber .true. 
     1288    set_namelist namelist_cfg ln_read_cfg .true. 
     1289    set_namelist namelist_cfg ln_linssh .true. 
     1290    set_namelist namelist_cfg ln_hpg_sco .false. 
     1291    set_namelist namelist_cfg ln_hpg_zps .true.  
     1292    set_namelist namelist_cfg nn_fwb 0 
     1293    set_namelist namelist_cfg jpni 2 
     1294    set_namelist namelist_cfg jpnj 2 
     1295    set_namelist namelist_cfg jpnij 4 
     1296#  
     1297#   Set the number of fine grids to zero:     
     1298    sed -i "1s/.*/0/" ${EXE_DIR}/AGRIF_FixedGrids.in 
     1299 
     1300    if [ ${USING_MPMD} == "yes" ] ; then 
     1301       set_xio_using_server iodef.xml true 
     1302    else 
     1303       set_xio_using_server iodef.xml false 
     1304    fi 
     1305    cd ${SETTE_DIR} 
     1306    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1307    cd ${SETTE_DIR} 
     1308    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     1309 
     1310fi 
     1311 
     1312if [ ${config} -eq 10 ] ;  then 
     1313# Compile with same option as 9 = ORCA2AGUL_NOZOOM, except ne key_agrif to check AGRIF does not hurt... 
     1314    export TEST_NAME="AGRIFNO" 
     1315    cd ${CONFIG_DIR0} 
     1316    . ./makenemo -m ${CMP_NAM} -n ORCA2AGUL_NOAGR_ST -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3 NST_SRC" -j 8 del_key "key_zdftmx key_top" 
     1317    cd ${SETTE_DIR} 
     1318    . ./param.cfg 
     1319    . ./all_functions.sh 
     1320    . ./prepare_exe_dir.sh 
     1321    JOB_FILE=${EXE_DIR}/run_job.sh 
     1322    NPROC=4 
     1323    if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 
     1324    cd ${EXE_DIR} 
     1325    set_namelist namelist_cfg nn_it000 1 
     1326    set_namelist namelist_cfg nn_itend 75 
     1327    set_namelist namelist_cfg ln_ctl .false. 
     1328    set_namelist namelist_cfg ln_clobber .true. 
     1329    set_namelist namelist_cfg ln_read_cfg .true. 
     1330    set_namelist namelist_cfg ln_linssh .true. 
     1331    set_namelist namelist_cfg ln_hpg_sco .false. 
     1332    set_namelist namelist_cfg ln_hpg_zps .true.  
     1333    set_namelist namelist_cfg nn_fwb 0 
     1334    set_namelist namelist_cfg jpni 2 
     1335    set_namelist namelist_cfg jpnj 2 
     1336    set_namelist namelist_cfg jpnij 4 
     1337# 
     1338    if [ ${USING_MPMD} == "yes" ] ; then 
     1339       set_xio_using_server iodef.xml true 
     1340    else 
     1341       set_xio_using_server iodef.xml false 
     1342    fi 
     1343    cd ${SETTE_DIR} 
     1344    . ./prepare_job.sh input_ORCA2_LIM3_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 
     1345    cd ${SETTE_DIR} 
     1346    . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 
     1347 
     1348fi 
     1349 
    13831350done 
  • trunk/NEMOGCM/SETTE/new_sette_rpt.sh

    r8827 r8839  
    3232    cd ${TOOLS_DIR}/REBUILD_NEMO 
    3333    #SF echo "REBUILD LONG restart SAS files, without standard output" 
    34     ./rebuild_nemo -t 4 ../../CONFIG/SAS_SETTETESTS/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
     34    ./rebuild_nemo -t 4 ../../CONFIG/SAS_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
    3535    #SF echo "REBUILD SHORT restart SAS files, without standard output" 
    36     ./rebuild_nemo -t 4 ../../CONFIG/SAS_SETTETESTS/SHORT/SAS_00000240_restart_ice $NPROC >&- 
     36    ./rebuild_nemo -t 4 ../../CONFIG/SAS_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 
    3737    cd ${SAS_RESTART_DIR}/LONG 
    3838    #SF echo "COPY rebuild restart files" 
     
    170170  fi 
    171171} 
    172  
    173172function reprotest(){ 
    174173# 
     
    194193    if  [ ! -f $f1s ] && [ ! -f $f1t ] ; then  
    195194      printf "%-20s %s\n" $nam " incomplete test"; 
    196       return;  
     195      return; 
    197196    fi 
    198197    if  [ ! -f $f2s ] && [ ! -f $f2t ] ; then  
    199198      printf "%-20s %s\n" $nam " incomplete test"; 
    200       return;  
     199      return; 
    201200    fi 
    202201# 
     
    205204    if  [ -f $f1s ] && [ -f $f2s ] ; then 
    206205      cmp -s $f1s $f2s 
    207       if [ $? == 0 ]; then 
    208         if [ $pass == 0 ]; then  
     206      if [ $? == 0 ]; then  
     207        if [ $pass == 0 ]; then   
    209208          printf "%-20s %s %s\n" $nam  " solver.stat reproducibility passed : " $dorv 
    210209        fi 
    211210      else 
    212         printf "%-20s %s %s\n" $nam  " solver.stat reproducibility FAILED : " $dorv  
     211        printf "%-20s %s %s\n" $nam  " solver.stat reproducibility FAILED : " $dorv 
    213212# 
    214213# Offer view of differences on the second pass 
     
    232231    if  [ -f $f1t ] && [ -f $f2t ] ; then 
    233232      cmp -s $f1t $f2t 
    234       if [ $? == 0 ]; then 
     233      if [ $? == 0 ]; then  
    235234        if [ $pass == 0 ]; then           printf "%-20s %s %s\n" $nam  " tracer.stat reproducibility passed : " $dorv 
    236235        fi 
     
    257256      fi 
    258257    fi 
     258  fi 
     259} 
     260 
     261function identictest(){ 
     262# 
     263#  checks AGRIF does not corrupe results with no AGRIF zoom. Expects ORCA2AGUL/AGRIFNOZ and ORCA2AGUL_NAGR/AGRIFNO  run directories 
     264# Compares solver.stat files for each 
     265# 
     266  vdir=$1 
     267  dir1=$2 
     268  dir2=$3 
     269  pass=$4 
     270# 
     271  if [ -d $vdir/$dir1 ] && [ -d $vdir/$dir2 ]; then 
     272    dorv1=`ls -1rt $vdir/$dir1/$mach/ | tail -1l ` 
     273    dorv1=`echo $dorv1 | sed -e 's:.*/::'` 
     274    dorv2=`ls -1rt $vdir/$dir2/$mach/ | tail -1l ` 
     275    dorv2=`echo $dorv2 | sed -e 's:.*/::'` 
     276 
     277    rep1=`ls -1rt $vdir/$dir1/$mach/$dorv1/ |  tail -2l | head -1 ` 
     278    rep2=`ls -1rt $vdir/$dir2/$mach/$dorv2/ |  tail -1l` 
     279    f1s=$vdir/$dir1/$mach/$dorv1/$rep1/solver.stat 
     280    f2s=$vdir/$dir2/$mach/$dorv2/$rep2/solver.stat 
     281 
     282    if  [ ! -f $f1s ] && [ ! -f $f2s ] ; then  
     283      printf "%-20s %s\n" $dir1 $dir2 " incomplete test"; 
     284      return;  
     285    fi 
     286# 
     287    done_oce=0 
     288 
     289    if  [ -f $f1s ] && [ -f $f2s ] ; then 
     290      cmp -s $f1s $f2s 
     291      if [ $? == 0 ]; then 
     292        if [ $pass == 0 ]; then  
     293          printf "%-20s %s %s %s %s\n" $rep1 $rep2  " AGRIF: solver.stat unchanged - test  passed : " $dorv1 $dorv2 
     294        fi 
     295      else 
     296        printf "%-20s %s %s %s %s\n" $rep1 $rep2  " for AGRIF, solver.stat test FAILED : " $dorv1 $dorv2 
     297# 
     298# Offer view of differences on the second pass 
     299# 
     300        if [ $pass == 1 ]; then 
     301          echo "<return> to view solver.stat differences" 
     302          read y 
     303          sdiff $f1s $f2s 
     304          done_oce=1 
     305          echo "<return> to continue" 
     306          read y 
     307        fi 
     308      fi 
     309    fi 
     310  else 
     311    printf "%-20s %s\n" $dir1 $dir2 " incomplete test"; 
    259312  fi 
    260313} 
     
    275328 NPROC=32 
    276329 
    277   SAS_RESTART_DIR=${CONFIG_DIR0}/SAS_SETTETESTS 
     330  SAS_RESTART_DIR=${CONFIG_DIR0}/SAS_ST 
    278331# 
    279332  if [ ! -d $NEMO_VALID ]; then 
     
    293346# Rebuild and restartability test for SAS 
    294347# 
    295  for restart_file in WSAS_SETTETESTS 
     348 for restart_file in WSAS_ST 
    296349 do 
    297  #  restfile $SAS_RESTART_DIR LONG $pass 
    298350   restfile $NEMO_VALID $restart_file $pass 
    299351 done 
     
    301353# Restartability test 
    302354# 
    303  for restart_test in WGYREPIS_SETTETESTS WORCA2LIM3PIS_SETTETESTS WORCA2OFFPIS_SETTETESTS WAMM12_SETTETESTS WISOMIP_SETTETESTS WORCA2AGUL_SETTETESTS 
     355 for restart_test in WGYREPIS_ST WORCA2LIM3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2AGR_ST 
    304356 do 
    305357   resttest $NEMO_VALID $restart_test $pass 
     
    308360# Reproducibility tests 
    309361# 
    310  for repro_test in WGYREPIS_SETTETESTS WORCA2LIM3PIS_SETTETESTS WORCA2OFFPIS_SETTETESTS WAMM12_SETTETESTS WISOMIP_SETTETESTS WORCA2_LIM3_OBSSETTETESTS_ WORCA2AGUL_1_2 WORCA2AGUL_SETTETESTS 
     362 for repro_test in WGYREPIS_ST WORCA2LIM3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_LIM3_OBS_ST WORCA2AGR_ST 
    311363 do 
    312364   reprotest $NEMO_VALID $repro_test $pass 
    313365 done 
    314 # 
     366 
     367 
     368 
     369# AGRIF special check 
     370 dir1=WORCA2AGUL_NOZOOM_ST 
     371 dir2=WORCA2AGUL_NOAGR_ST 
     372 identictest $NEMO_VALID $dir1 $dir2 $pass  
     373 
     374 
    315375done 
     376# 
     377## Additional checks for ORCA2AGUL/FIRST standalone AGRIF test 
     378## still to be added 
     379 
     380 
     381 
    316382exit 
Note: See TracChangeset for help on using the changeset viewer.