Changeset 9602


Ignore:
Timestamp:
2018-05-16T12:26:25+02:00 (2 years ago)
Author:
nicolasmartin
Message:

Changes to comply with the new structure of the trunk

Location:
utils/CI/sette
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • utils/CI/sette/sette.sh

    r9577 r9602  
    124124SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    125125MAIN_DIR=$(dirname $SETTE_DIR) 
    126 CONFIG_DIR0=${MAIN_DIR}/CONFIG 
    127 TOOLS_DIR=${MAIN_DIR}/TOOLS 
    128 COMPIL_DIR=${TOOLS_DIR}/COMPILE 
     126CONFIG_DIR0=${MAIN_DIR}/cfgs 
     127TOOLS_DIR=${MAIN_DIR}/tools 
     128COMPIL_DIR=${TOOLS_DIR}/mk 
    129129 
    130130CMP_NAM=${1:-$COMPILER} 
  • utils/CI/sette/sette_beginner.sh

    r9576 r9602  
    123123SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    124124MAIN_DIR=${SETTE_DIR%/SETTE} 
    125 CONFIG_DIR=${MAIN_DIR}/CONFIG 
     125CONFIG_DIR=${MAIN_DIR}/cfgs 
    126126TOOLS_DIR=${MAIN_DIR}/TOOLS 
    127127COMPIL_DIR=${TOOLS_DIR}/COMPILE 
  • utils/CI/sette/sette_chk_result.sh

    r9576 r9602  
    55# This version should be run in the SETTE directory.  
    66# The machine name will be picked up from the sette.sh script but the location of the 
    7 # validation directory needs to be set here (currently assumed to reside in the ../CONFIG directory) 
     7# validation directory needs to be set here (currently assumed to reside in the ../cfgs directory) 
    88# 
    99######################################################################################### 
     
    3535    cd ${TOOLS_DIR}/REBUILD_NEMO 
    3636    #SF echo "REBUILD LONG restart SAS files, without standard output" 
    37     ./rebuild_nemo -t 4 ../../CONFIG/SAS_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
     37    ./rebuild_nemo -t 4 ../../cfgs/SAS_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
    3838    #SF echo "REBUILD SHORT restart SAS files, without standard output" 
    39     ./rebuild_nemo -t 4 ../../CONFIG/SAS_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 
     39    ./rebuild_nemo -t 4 ../../cfgs/SAS_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 
    4040    cd ${SAS_RESTART_DIR}/LONG 
    4141    #SF echo "COPY rebuild restart files" 
     
    457457  SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    458458  MAIN_DIR=$(dirname $SETTE_DIR) 
    459   CONFIG_DIR0=${MAIN_DIR}/CONFIG 
     459  CONFIG_DIR0=${MAIN_DIR}/cfgs 
    460460  TOOLS_DIR=${MAIN_DIR}/TOOLS 
    461461  COMPIL_DIR=${TOOLS_DIR}/COMPILE 
  • utils/CI/sette/sette_rpt.SAS.sh

    r9576 r9602  
    66# This version should be run in the SETTE directory.  
    77# The machine name will be picked up from the sette.sh script but the location of the 
    8 # validation directory needs to be set here (currently assumed to reside in the ../CONFIG directory) 
     8# validation directory needs to be set here (currently assumed to reside in the ../cfgs directory) 
    99# 
    1010######################################################################################### 
     
    3232    cd ${TOOLS_DIR}/REBUILD_NEMO 
    3333    #SF echo "REBUILD LONG restart SAS files, without standard output" 
    34     ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/LONG/SAS_00000100_restart_ice  $NPROC > /dev/null 2>&1 
     34    ./rebuild_nemo -t 4 ../../cfgs/SAS_LONG/LONG/SAS_00000100_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_LONG/SHORT/SAS_00000100_restart_ice $NPROC >&- 
     36    ./rebuild_nemo -t 4 ../../cfgs/SAS_LONG/SHORT/SAS_00000100_restart_ice $NPROC >&- 
    3737    cd ${SAS_RESTART_DIR}/LONG 
    3838    #SF echo "COPY rebuild restart files" 
     
    271271 SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    272272 MAIN_DIR=$(dirname $SETTE_DIR) 
    273  CONFIG_DIR0=${MAIN_DIR}/CONFIG 
     273 CONFIG_DIR0=${MAIN_DIR}/cfgs 
    274274 TOOLS_DIR=${MAIN_DIR}/TOOLS 
    275275 COMPIL_DIR=${TOOLS_DIR}/COMPILE 
  • utils/CI/sette/sette_rpt.sh

    r9576 r9602  
    55# This version should be run in the SETTE directory.  
    66# The machine name will be picked up from the sette.sh script but the location of the 
    7 # validation directory needs to be set here (currently assumed to reside in the ../CONFIG directory) 
     7# validation directory needs to be set here (currently assumed to reside in the ../cfgs directory) 
    88# 
    99######################################################################################### 
     
    3535    cd ${TOOLS_DIR}/REBUILD_NEMO 
    3636    #SF echo "REBUILD LONG restart SAS files, without standard output" 
    37     ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_SI3_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
     37    ./rebuild_nemo -t 4 ../../cfgs/ORCA2_SAS_SI3_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1 
    3838    #SF echo "REBUILD SHORT restart SAS files, without standard output" 
    39     ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_SI3_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 
     39    ./rebuild_nemo -t 4 ../../cfgs/ORCA2_SAS_SI3_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 
    4040    cd ${SAS_RESTART_DIR}/LONG 
    4141    #SF echo "COPY rebuild restart files" 
     
    383383  SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    384384  MAIN_DIR=$SETTE_DIR/../.. 
    385   CONFIG_DIR0=${MAIN_DIR}/CONFIG 
     385  CONFIG_DIR0=${MAIN_DIR}/cfgs 
    386386  TOOLS_DIR=${MAIN_DIR}/TOOLS 
    387387  COMPIL_DIR=${TOOLS_DIR}/COMPILE 
  • utils/CI/sette/sette_test-cases.sh

    r9576 r9602  
    127127SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    128128MAIN_DIR=$(dirname $SETTE_DIR) 
    129 CONFIG_DIR0=${MAIN_DIR}/CONFIG 
     129CONFIG_DIR0=${MAIN_DIR}/cfgs 
    130130TOOLS_DIR=${MAIN_DIR}/TOOLS 
    131131COMPIL_DIR=${TOOLS_DIR}/COMPILE 
  • utils/CI/sette/sette_xios.sh

    r9576 r9602  
    9494SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    9595MAIN_DIR=${SETTE_DIR%/SETTE} 
    96 CONFIG_DIR=${MAIN_DIR}/CONFIG 
     96CONFIG_DIR=${MAIN_DIR}/cfgs 
    9797TOOLS_DIR=${MAIN_DIR}/TOOLS 
    9898COMPIL_DIR=${TOOLS_DIR}/COMPILE 
     
    132132 
    133133    cd ${SETTE_DIR} 
    134     . ../CONFIG/makenemo -m ${CMP_NAM} -n GYRE_XIOS_LR -r GYRE_XIOS -j 8  
     134    . ../cfgs/makenemo -m ${CMP_NAM} -n GYRE_XIOS_LR -r GYRE_XIOS -j 8  
    135135    cd ${SETTE_DIR} 
    136136    . ./param.cfg 
     
    290290 
    291291    cd ${SETTE_DIR} 
    292     . ../CONFIG/makenemo -m ${CMP_NAM} -n GYRE_XIOS_HR -r GYRE_XIOS -j 8 
     292    . ../cfgs/makenemo -m ${CMP_NAM} -n GYRE_XIOS_HR -r GYRE_XIOS -j 8 
    293293    cd ${SETTE_DIR} 
    294294# 
Note: See TracChangeset for help on using the changeset viewer.