Changeset 9602

Timestamp:

2018-05-16T12:26:25+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Changes to comply with the new structure of the trunk

Location:

utils/CI/sette

Files:

• sette.sh (modified) (1 diff)
• sette_beginner.sh (modified) (1 diff)
• sette_chk_result.sh (modified) (3 diffs)
• sette_rpt.SAS.sh (modified) (3 diffs)
• sette_rpt.sh (modified) (3 diffs)
• sette_test-cases.sh (modified) (1 diff)
• sette_xios.sh (modified) (3 diffs)

utils/CI/sette/sette.sh

@@ -124 +124 @@
 SETTE_DIR=$(cd $(dirname "$0"); pwd)
 MAIN_DIR=$(dirname $SETTE_DIR)
-CONFIG_DIR0=${MAIN_DIR}/CONFIG
-TOOLS_DIR=${MAIN_DIR}/TOOLS
-COMPIL_DIR=${TOOLS_DIR}/COMPILE
+CONFIG_DIR0=${MAIN_DIR}/cfgs
+TOOLS_DIR=${MAIN_DIR}/tools
+COMPIL_DIR=${TOOLS_DIR}/mk
 
 CMP_NAM=${1:-$COMPILER}

utils/CI/sette/sette_beginner.sh

@@ -123 +123 @@
 SETTE_DIR=$(cd $(dirname "$0"); pwd)
 MAIN_DIR=${SETTE_DIR%/SETTE}
-CONFIG_DIR=${MAIN_DIR}/CONFIG
+CONFIG_DIR=${MAIN_DIR}/cfgs
 TOOLS_DIR=${MAIN_DIR}/TOOLS
 COMPIL_DIR=${TOOLS_DIR}/COMPILE

utils/CI/sette/sette_chk_result.sh

@@ -5 +5 @@
 # This version should be run in the SETTE directory. 
 # The machine name will be picked up from the sette.sh script but the location of the
-# validation directory needs to be set here (currently assumed to reside in the ../CONFIG directory)
+# validation directory needs to be set here (currently assumed to reside in the ../cfgs directory)
 #
 #########################################################################################
@@ -35 +35 @@
     cd ${TOOLS_DIR}/REBUILD_NEMO
     #SF echo "REBUILD LONG restart SAS files, without standard output"
-    ./rebuild_nemo -t 4 ../../CONFIG/SAS_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1
+    ./rebuild_nemo -t 4 ../../cfgs/SAS_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1
     #SF echo "REBUILD SHORT restart SAS files, without standard output"
-    ./rebuild_nemo -t 4 ../../CONFIG/SAS_ST/SHORT/SAS_00000240_restart_ice $NPROC >&-
+    ./rebuild_nemo -t 4 ../../cfgs/SAS_ST/SHORT/SAS_00000240_restart_ice $NPROC >&-
     cd ${SAS_RESTART_DIR}/LONG
     #SF echo "COPY rebuild restart files"
@@ -457 +457 @@
   SETTE_DIR=$(cd $(dirname "$0"); pwd)
   MAIN_DIR=$(dirname $SETTE_DIR)
-  CONFIG_DIR0=${MAIN_DIR}/CONFIG
+  CONFIG_DIR0=${MAIN_DIR}/cfgs
   TOOLS_DIR=${MAIN_DIR}/TOOLS
   COMPIL_DIR=${TOOLS_DIR}/COMPILE

utils/CI/sette/sette_rpt.SAS.sh

@@ -6 +6 @@
 # This version should be run in the SETTE directory. 
 # The machine name will be picked up from the sette.sh script but the location of the
-# validation directory needs to be set here (currently assumed to reside in the ../CONFIG directory)
+# validation directory needs to be set here (currently assumed to reside in the ../cfgs directory)
 #
 #########################################################################################
@@ -32 +32 @@
     cd ${TOOLS_DIR}/REBUILD_NEMO
     #SF echo "REBUILD LONG restart SAS files, without standard output"
-    ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/LONG/SAS_00000100_restart_ice  $NPROC > /dev/null 2>&1
+    ./rebuild_nemo -t 4 ../../cfgs/SAS_LONG/LONG/SAS_00000100_restart_ice  $NPROC > /dev/null 2>&1
     #SF echo "REBUILD SHORT restart SAS files, without standard output"
-    ./rebuild_nemo -t 4 ../../CONFIG/SAS_LONG/SHORT/SAS_00000100_restart_ice $NPROC >&-
+    ./rebuild_nemo -t 4 ../../cfgs/SAS_LONG/SHORT/SAS_00000100_restart_ice $NPROC >&-
     cd ${SAS_RESTART_DIR}/LONG
     #SF echo "COPY rebuild restart files"
@@ -271 +271 @@
  SETTE_DIR=$(cd $(dirname "$0"); pwd)
  MAIN_DIR=$(dirname $SETTE_DIR)
- CONFIG_DIR0=${MAIN_DIR}/CONFIG
+ CONFIG_DIR0=${MAIN_DIR}/cfgs
  TOOLS_DIR=${MAIN_DIR}/TOOLS
  COMPIL_DIR=${TOOLS_DIR}/COMPILE

utils/CI/sette/sette_rpt.sh

@@ -5 +5 @@
 # This version should be run in the SETTE directory. 
 # The machine name will be picked up from the sette.sh script but the location of the
-# validation directory needs to be set here (currently assumed to reside in the ../CONFIG directory)
+# validation directory needs to be set here (currently assumed to reside in the ../cfgs directory)
 #
 #########################################################################################
@@ -35 +35 @@
     cd ${TOOLS_DIR}/REBUILD_NEMO
     #SF echo "REBUILD LONG restart SAS files, without standard output"
-    ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_SI3_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1
+    ./rebuild_nemo -t 4 ../../cfgs/ORCA2_SAS_SI3_ST/LONG/SAS_00000240_restart_ice  $NPROC > /dev/null 2>&1
     #SF echo "REBUILD SHORT restart SAS files, without standard output"
-    ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_SI3_ST/SHORT/SAS_00000240_restart_ice $NPROC >&-
+    ./rebuild_nemo -t 4 ../../cfgs/ORCA2_SAS_SI3_ST/SHORT/SAS_00000240_restart_ice $NPROC >&-
     cd ${SAS_RESTART_DIR}/LONG
     #SF echo "COPY rebuild restart files"
@@ -383 +383 @@
   SETTE_DIR=$(cd $(dirname "$0"); pwd)
   MAIN_DIR=$SETTE_DIR/../..
-  CONFIG_DIR0=${MAIN_DIR}/CONFIG
+  CONFIG_DIR0=${MAIN_DIR}/cfgs
   TOOLS_DIR=${MAIN_DIR}/TOOLS
   COMPIL_DIR=${TOOLS_DIR}/COMPILE

utils/CI/sette/sette_test-cases.sh

@@ -127 +127 @@
 SETTE_DIR=$(cd $(dirname "$0"); pwd)
 MAIN_DIR=$(dirname $SETTE_DIR)
-CONFIG_DIR0=${MAIN_DIR}/CONFIG
+CONFIG_DIR0=${MAIN_DIR}/cfgs
 TOOLS_DIR=${MAIN_DIR}/TOOLS
 COMPIL_DIR=${TOOLS_DIR}/COMPILE

utils/CI/sette/sette_xios.sh

@@ -94 +94 @@
 SETTE_DIR=$(cd $(dirname "$0"); pwd)
 MAIN_DIR=${SETTE_DIR%/SETTE}
-CONFIG_DIR=${MAIN_DIR}/CONFIG
+CONFIG_DIR=${MAIN_DIR}/cfgs
 TOOLS_DIR=${MAIN_DIR}/TOOLS
 COMPIL_DIR=${TOOLS_DIR}/COMPILE
@@ -132 +132 @@
 
     cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -m ${CMP_NAM} -n GYRE_XIOS_LR -r GYRE_XIOS -j 8 
+    . ../cfgs/makenemo -m ${CMP_NAM} -n GYRE_XIOS_LR -r GYRE_XIOS -j 8 
     cd ${SETTE_DIR}
     . ./param.cfg
@@ -290 +290 @@
 
     cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -m ${CMP_NAM} -n GYRE_XIOS_HR -r GYRE_XIOS -j 8
+    . ../cfgs/makenemo -m ${CMP_NAM} -n GYRE_XIOS_HR -r GYRE_XIOS -j 8
     cd ${SETTE_DIR}
 #