Changeset 374 for branches

Timestamp:

03/17/23 18:49:28 (14 months ago)

Author:

dumas

Message:

Update go_ant40_cycle.sh with on general grisli.run.lsce for sequential and parallel runs

Location:

branches/GRISLIv3/lauching_area

Files:

• Master-files/grisli.run.lsce (added)
• Master-files/grisli.run.openmp_ant40 (modified) (1 diff)
• Master-files/grisli.run_ant40 (modified) (2 diffs)
• go_ant40_cycle.sh (modified) (3 diffs)

branches/GRISLIv3/lauching_area/Master-files/grisli.run.openmp_ant40

@@ -23 +23 @@
 EXEDIR="EXEREP"
 
-
+rm Ant-40
 echo "Grisli is being compiled..."
 cd $MODEL

branches/GRISLIv3/lauching_area/Master-files/grisli.run_ant40

@@ -4 +4 @@
 #PBS -N RUNNAME
 # Specify batch queue
-#PBS -q medium
+#PBS -q longp
+#PBS -v BATCH_NUM_PROC_TOT=4
+#PBS -l nodes=1:ppn=4
 # Specify execution shell
 ##PBS -S /bin/bash
@@ -12 +14 @@
 #PBS -m e -M christophe.dumas@lsce.ipsl.fr
 
+export MKL_NUM_THREADS=4
+export OMP_NUM_THREADS=4
+export KMP_STACKSIZE=16000000 #2048000000 # KMP_STACKSIZE remplace OMP_STACKSIZE avec ifort
+
 module load netcdf/4
-
 
 MODEL="SOURCESREP"
 EXEDIR="EXEREP"
 
-
+rm Ant-40
 echo "Grisli is being compiled..."
 cd $MODEL

branches/GRISLIv3/lauching_area/go_ant40_cycle.sh

@@ -15 +15 @@
 
 parallel="no" # "yes or no?"
+proc_number="4" # number of processor used
+ppn_number=$proc_number # number of cpus (ppn)
+exename="Ant-40"
+
+queue="long"  # specify queue used : short, medium, long, xlong...
+
+# Files used
+grisli_run_file="Master-files/grisli.run.lsce"                        # grisli.run
+param_tsai_file="../Param/anteis1_param_list_Cyc-Tsai.dat"            # param file Tsai
+param_schoof_file="../Param/anteis1_param_list_Cyc-Scho.dat"          # param file Schoof
+TEMPS_NETCDF_file="Master-files/anteis1_TEMPS-NETCDF-cycle.dat"       # TEMPS-NETCDF.dat
+module_choix_file="Master-files/module_choix-antar40-0.4-cycles.f90"  # module choix
+
 
 #Revision number :
-rev=`svn info | grep "Révision : " | awk '{print $2}'`
+rev=`svn info | grep "vision : " | awk '{print $2}'`
 echo "Code revision svn "$rev
 
@@ -113 +126 @@
 echo $MODEL
 
-#cp "../Master-files/Makefile" $MODEL"/Makefile"
-#cp "../Master-files/anteis1_param_list.dat" $RUNDIR"/bin/anteis1_param_list.dat"
-cp "Master-files/anteis1_TEMPS-NETCDF-cycle.dat" $MODEL"/Fichiers-parametres/TEMPS-NETCDF.dat"
-cp "Master-files/module_choix-antar40-0.4-cycles.f90" $MODEL"/Ant40_files/module_choix-antar40-0.4.f90"
+
+cp $TEMPS_NETCDF_file $MODEL"/Fichiers-parametres/TEMPS-NETCDF.dat"
+cp $module_choix_file $MODEL"/Ant40_files/module_choix-antar40-0.4.f90"
 if [ $gr_select = "1" ] ; then
-  cp "../Param/anteis1_param_list_Cyc-Tsai.dat" $RUNDIR"/bin/anteis1_param_list.dat"
+  cp $param_tsai_file $RUNDIR"/bin/anteis1_param_list.dat"
 elif [ $gr_select = "2" ] ; then
-  cp "../Param/anteis1_param_list_Cyc-Scho.dat" $RUNDIR"/bin/anteis1_param_list.dat"
-fi
-
-if [ $parallel = "yes" ]; then
-  cp "Master-files/grisli.run.openmp_ant40" $RUNDIR"/bin/grisli.run"
-else
-  cp "Master-files/grisli.run_ant40" $RUNDIR"/bin/grisli.run"
-fi
+  cp $param_schoof_file $RUNDIR"/bin/anteis1_param_list.dat"
+fi
+
+cp $grisli_run_file $RUNDIR"/bin/grisli.run"
 
 cd $RUNDIR"/INPUT"
@@ -147 +155 @@
 sed -i "s|EXEREP|$RUNDIR\/bin|" $RUNDIR"/bin/grisli.run"
 sed -i "s/RUNNAME/$namerun/" $RUNDIR"/bin/grisli.run"
+sed -i "s/EXE_NAME/$exename/g" $RUNDIR"/bin/grisli.run"
+
+if [ $parallel = "yes" ]; then
+    sed -i "s/QUEUE/${queue}p/" $RUNDIR"/bin/grisli.run"
+    sed -i "s/PROC_NUMBER/$proc_number/" $RUNDIR"/bin/grisli.run"
+    sed -i "s/PPN_NUMBER/$ppn_number/" $RUNDIR"/bin/grisli.run"
+else
+    sed -i "s/QUEUE/$queue/" $RUNDIR"/bin/grisli.run"
+    sed -i "s/PROC_NUMBER/1/" $RUNDIR"/bin/grisli.run"
+    sed -i "s/PPN_NUMBER/1/" $RUNDIR"/bin/grisli.run"
+    sed -i "/export\ MKL_NUM_THREADS/d" $RUNDIR"/bin/grisli.run"
+    sed -i "/export\ OMP_NUM_THREADS/d" $RUNDIR"/bin/grisli.run"
+    sed -i "/export\ KMP_STACKSIZE/d" $RUNDIR"/bin/grisli.run"
+fi
 
 # Makefile: