Changeset 1036

Timestamp:

08/05/20 14:27:08 (4 years ago)

Author:

dubos

Message:

testing : porting to Jean Zay

Location:

configs/testing

Files:

• arch (added)
• arch/arch-X64_CURIE.sh (moved) (moved from configs/testing/bash/X64_CURIE.sh)
• arch/arch-X64_IRENE.sh (moved) (moved from configs/testing/bash/X64_IRENE.sh)
• arch/arch-X64_JEANZAY.sh (added)
• arch/arch-ifort_CICLAD.sh (moved) (moved from configs/testing/bash/ifort_CICLAD.sh)
• bash/create_runs.sh (modified) (3 diffs)
• bash/submit.sh (modified) (1 diff)
• bash/svn_add_RUNS.sh (added)
• bash/xml.sh (modified) (4 diffs)
• setup.sh (modified) (1 diff)

configs/testing/bash/create_runs.sh

@@ -20 +20 @@
     sort tmp.def | cut -c 7- > run.def
     rm -f tmp.def
-    xml_iodef > iodef.xml
-    xml_icosa > icosa.xml
-    xml_field_def > field_def.xml
-    xml_dcmip $EXP $OUTPUT_GRID $OUTPUT_FREQ > filedef_dcmip2016.xml
+    
+    #    xml_iodef > iodef.xml
+    #    xml_icosa > icosa.xml
+    #    xml_field_def > field_def.xml
+    ln -s build/xml/*.xml .
+    rm -f file_def_dynamico_regular.xml
+    xml_dcmip_regular $EXP $OUTPUT_GRID $OUTPUT_FREQ > file_def_dynamico_regular.xml
     job_${EXP} ${EXEC} $* > job.sh
     cd ..
@@ -211 +214 @@
 function basic()
 {
-    rm -rf RUNS
-    mkdir RUNS
+    rm -rf RUNS_arch/${arch}
+    mkdir -p RUNS_arch/${arch}
+    rm -f RUNS
+    ln -sf RUNS_arch/${arch} RUNS
     cd RUNS
+    
 # Williamson 1991
 #    create_exp serial W91 two_degree 24h 40 5000 # nbp tau
@@ -245 +251 @@
 
 source current_args
-source bash/${arch}.sh
+source arch/arch-${arch}.sh
 source bash/xml.sh
 ROOT=$PWD

configs/testing/bash/submit.sh

@@ -2 +2 @@
 
 source current_args
-source bash/${arch}.sh
+source arch/arch-${arch}.sh
 
 ROOT=$PWD

configs/testing/bash/xml.sh

@@ -276 +276 @@
 
 function xml_dcmip() { # EXPNAME OUTPUT_GRID OUTPUT_FREQ
+    echo '<file_definition >' 
+    xml_dcmip_native $*
+    xml_dcmip_regular $*
+    echo '</file_definition>'
+}
+
+function xml_dcmip_native() {
 EXPNAME=$1
 OUTPUT_GRID=$2
@@ -282 +289 @@
 LLM=10 # FIXME
 cat <<EOF
-<file_definition > 
-
   <file id="output_dcmip2016_native" convention="CF" enabled="false" output_freq="$OUTPUT_FREQ" sync_freq="$OUTPUT_FREQ" output_level="10" timeseries="none" description="$EXPNAME" > 
 
@@ -364 +369 @@
   </file>
 
+EOF
+}
+
+function xml_dcmip_regular() { # EXPNAME OUTPUT_GRID OUTPUT_FREQ
+EXPNAME=$1
+OUTPUT_GRID=$2
+OUTPUT_FREQ=$3
+NBP=80 # FIXME
+LLM=10 # FIXME
+cat <<EOF
+<file_definition > 
 
   <file id="output_dcmip2016_regular" enabled="true" output_freq="$OUTPUT_FREQ" sync_freq="$OUTPUT_FREQ" output_level="10" description="$EXPNAME" timeseries="none" > 
     
-<!-- FIXME
     <field_group group_ref="dcmip2016_output_field_once"/>
--->
+
+    <field_group group_ref="dcmip2016_output_field" domain_ref="regular_$OUTPUT_GRID" />
+
+<!-- 
+
     <field_group group_ref="init_fields" domain_ref="regular_$OUTPUT_GRID" />
     
-    <field_group group_ref="dcmip2016_output_field" domain_ref="regular_$OUTPUT_GRID" />
-
     <field_group id="transport" ts_enabled="true" grid_ref="grid_q_regular" >
           <field field_ref="q" name="q"  />
@@ -380 +397 @@
           <field field_ref="qflux_lat" name="qflux_lat"  long_name="Time-averaged tracer mass flux, meridional"   unit="kg/m/s"/>
     </field_group>
+-->
 
     <variable name="model" type="string" > dynamico </variable>

configs/testing/setup.sh

@@ -61 +61 @@
   mkdir -p $BUILD
   cd $ROOT/DYNAMICO
-  for NAME in arch build compile make_icosa src bld.cfg  clean doc tools ; do
+  for NAME in arch build compile make_icosa src bld.cfg  clean doc tools xml ; do
       ln -s $ROOT/DYNAMICO/$NAME $BUILD/
   done