Changeset 1041 for configs

Timestamp:

08/12/20 16:17:53 (4 years ago)

Author:

dubos

Message:

testing : allow different arch for XIOS and DYNAMICO

Location:

configs/testing

Files:

• bash/build.sh (modified) (1 diff)
• bash/create_runs.sh (modified) (2 diffs)
• setup.sh (modified) (2 diffs)

configs/testing/bash/build.sh

@@ -21 +21 @@
     echo "./make_xios --arch $arch $other_XIOS --job $job"
     echo "Watch logfile $LOGFILE"
-    ./make_xios --arch $arch $other_XIOS --job $job > $LOGFILE 2>&1 || ( tail $LOGFILE ; exit 1 )    
+    ./make_xios --arch $arch_XIOS $other_XIOS --job $job > $LOGFILE 2>&1 || ( tail $LOGFILE ; exit 1 )    
     cd $ROOT
     # compile all variants in parallel

configs/testing/bash/create_runs.sh

@@ -137 +137 @@
 #    setvar dysl .TRUE.
 #    setvar hydrostatic .FALSE.
-    setvar diagflux .TRUE.
+#    setvar diagflux .TRUE.
     setvar omega 7.292e-5 llm 30 disvert ncarl30 nqtot 2 itau_adv 3
     setvar tau_graddiv $TAU tau_gradrot $TAU tau_divgrad $TAU
@@ -229 +229 @@
     create_exp mpi_omp DCMIP31 two_degree 60s 40 90000 .FALSE. # nbp tau hydro 
     create_exp mpi_omp DCMIP41 two_degree 24h 40 10000 # nbp tau 
+    create_exp mpi DCMIP41 two_degree 24h 40 10000 # nbp tau 
 #    create_exp mpi DCMIP51 one_degree 2h  80 10000 # nbp tau 
 # Other

configs/testing/setup.sh

@@ -25 +25 @@
 EOF
           exit;;
-      "-arch")
-          arch=$2 ; arch_defined="TRUE"; shift ; shift ;;
-      "-job")
+      "--arch")
+          arch=$2 ; arch_XIOS=$2 ; arch_defined="TRUE"; shift ; shift ;;
+      "--arch-XIOS")
+          arch_XIOS=$2 ; shift ; shift ;;
+      "--job")
           job=$2 ; shift ; shift;;
-      "-project")
+      "--project")
           project=$2 ; proj_defined="TRUE"; shift; shift;;
-      "-full")
+      "--full")
           full_defined="TRUE" ; shift ;;
       *)
@@ -47 +49 @@
 ROOT="$ROOT"
 arch="$arch"
+arch_XIOS="$arch_XIOS"
 job="$job"
 project="$project"