Changeset 1242 for trunk/libIGCM/ins_job

Timestamp:

10/06/15 09:34:04 (9 years ago)

Author:

sdipsl

Message:

• IGCM_config_ConfigureExecution was buggy
• Fix Ada headers edition
• typo
• has been tested

File:

• trunk/libIGCM/ins_job (modified) (5 diffs)

trunk/libIGCM/ins_job

@@ -108 +108 @@
 . ${libIGCM}/libIGCM_date/libIGCM_date.ksh
 . ${libIGCM}/libIGCM_sys/libIGCM_sys.ksh
+. ${libIGCM}/libIGCM_config/libIGCM_config.ksh
 if [ $x_e = 'true' ] ; then
   . ${libIGCM}/libIGCM_ensemble/libIGCM_ensemble.ksh
@@ -161 +162 @@
 F_CFG_ENS='ensemble.card';
 SUBMIT_DIR_ENS=$( pwd )
-for i in $(find ${d_n}/.. -name ${F_CFG} -print)
+#for i in $(find ${d_n}/.. -name ${F_CFG} -print)
+for i in $(find $( pwd ) -name ${F_CFG} -print)
 do
   j=$(cd ${i%/*};/bin/pwd;)
@@ -189 +191 @@
   IGCM_card_DefineArrayFromSection ${j}'/'${F_CFG} UserChoices
   # Set default values
-  config_UserChoices_JobNumProcTot=1
   config_UserChoices_ExpType=""
   RESOL_ATM_3D=this_is_a_test_string
@@ -257 +258 @@
     \cp ${F_RCI} ${j};
    }
-  
+
+  #==================================
+  # Read ListOfComponents section:
+  #echo
+  #IGCM_debug_Print 1 "DefineArrayFromSection : ListOfComponents"
+
+  IGCM_card_DefineArrayFromSection  ${j}'/'${F_CFG} ListOfComponents
+  for comp in ${config_ListOfComponents[*]} ; do
+    IGCM_card_DefineArrayFromOption  ${j}'/'${F_CFG} ListOfComponents ${comp}
+  done
+  #IGCM_debug_Print 3 ${config_ListOfComponents[*]}
+
   #==================================
   # Read Executable section:
-  IGCM_card_DefineArrayFromSection ${j}'/'${F_CFG} Executable  
+  IGCM_card_DefineArrayFromSection ${j}'/'${F_CFG} Executable
 
   # Define the execution context (MPMD, SPMD, MPI/OMP ...)
-  IGCM_config_ConfigureExexution
+  IGCM_config_ConfigureExecution ${j}'/'${F_CFG}
 
   # coreNumber    : TOTAL NUMBER OF CORES
@@ -277 +289 @@
       -e "s%::modipsl::%${F_MOD}%" \
       -e "s/::Jobname::/${JobName}/" \
-      -e "s/::JobNumProcTot::/${config_UserChoices_JobNumProcTot}/" \
       -e "s/::default_project::/${ProjectID}/" \
       ${F_JOB} > ${j}'/'${n_f}