Changeset 1242 for trunk/libIGCM

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

Location:

trunk/libIGCM

Files:

• ins_job (modified) (5 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (9 diffs)
• libIGCM_sys/libIGCM_sys_ada.ksh (modified) (1 diff)

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}

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -22 +22 @@
 
   # config.card path
-  configPath=$1
+  configCardPath=$1
 
   #==================================
@@ -29 +29 @@
   #==================================
   # Read libIGCM compatibility version in config.card
-  IGCM_card_DefineVariableFromOption ${configPath} Compatibility libIGCM
+  IGCM_card_DefineVariableFromOption ${configCardPath} Compatibility libIGCM
   CompatibilityTag=${config_Compatibility_libIGCM}
 
@@ -41 +41 @@
   IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices"
 
-  IGCM_card_DefineArrayFromSection ${configPath} UserChoices
+  IGCM_card_DefineArrayFromSection ${configCardPath} UserChoices
   for option in ${config_UserChoices[*]} ; do
-    IGCM_card_DefineVariableFromOption ${configPath} UserChoices ${option}
+    IGCM_card_DefineVariableFromOption ${configCardPath} UserChoices ${option}
     eval auxprint=\${config_UserChoices_${option}}
     IGCM_debug_Print 3 "${option} : ${auxprint}"
@@ -53 +53 @@
   IGCM_debug_Print 1 "DefineArrayFromOption  : config_Ensemble"
 
-  IGCM_card_DefineArrayFromSection ${configPath} Ensemble
+  IGCM_card_DefineArrayFromSection ${configCardPath} Ensemble
   for option in ${config_Ensemble[*]} ; do
-    IGCM_card_DefineVariableFromOption ${configPath} Ensemble ${option}
+    IGCM_card_DefineVariableFromOption ${configCardPath} Ensemble ${option}
     eval auxprint=\${config_Ensemble_${option}}
     IGCM_debug_Print 3 "${option} : ${auxprint}"
@@ -65 +65 @@
   IGCM_debug_Print 1 "DefineArrayFromOption : config_Post"
 
-  IGCM_card_DefineArrayFromSection ${configPath} Post
+  IGCM_card_DefineArrayFromSection ${configCardPath} Post
   for option in ${config_Post[*]} ; do
-    IGCM_card_DefineVariableFromOption ${configPath} Post ${option}
+    IGCM_card_DefineVariableFromOption ${configCardPath} Post ${option}
     eval auxprint=\${config_Post_${option}}
     IGCM_debug_Print 3 "${option} : ${auxprint}"
@@ -571 +571 @@
 
 #===================================
-function IGCM_config_ConfigureExexution
+function IGCM_config_ConfigureExecution
 {
-  IGCM_debug_PushStack " IGCM_config_ConfigureExexution"
-
-  echo
-  IGCM_debug_Print 1 " IGCM_config_ConfigureExexution"
-  echo
-
-  typeset ExeNameIn ExeNameFirst CompNameFirst comp i
+  IGCM_debug_PushStack " IGCM_config_ConfigureExecution"
+
+  echo
+  IGCM_debug_Print 1 " IGCM_config_ConfigureExecution"
+  echo
+
+  typeset ExeNameIn ExeNameFirst CompNameFirst configCardPath comp i
   typeset tempvar tempvarMPI tempvarNOD NbElts NbExec
+
+  # config.card path
+  configCardPath=$1
 
   coreNumber=0
@@ -595 +598 @@
 
     IGCM_debug_Print 1 ${comp}
+
+    # Manage component executable
+    IGCM_card_DefineArrayFromOption ${configCardPath} Executable ${comp}
 
     eval ExeNameIn=\${config_Executable_${comp}[0]}
@@ -722 +728 @@
 
   IGCM_debug_Print 1 "MPI/OMP treatment coreNumber = ${coreNumber}"
-
-  IGCM_debug_PopStack "IGCM_config_ConfigureExexution"
+  IGCM_debug_Print 1 "MPI/OMP treatment mpiTasks = ${mpiTasks}"
+  IGCM_debug_Print 1 "MPI/OMP treatment openMPthreads = ${openMPthreads}"
+  IGCM_debug_Print 1 "MPI/OMP treatment executionType = ${executionType}"
+
+  IGCM_debug_PopStack "IGCM_config_ConfigureExecution"
 }
 
@@ -958 +967 @@
   if [ ${Period} -eq 1 ]; then
     # Define the execution context (MPMD, SPMD, MPI/OMP ...)
-    IGCM_config_ConfigureExexution
+    IGCM_config_ConfigureExecution ${SUBMIT_DIR}/config.card
     # Create the execution script for the current context
     IGCM_sys_build_execution_scripts

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -939 +939 @@
     # MPMD + MPI + OMP
     sed -e "s/::openMPthreads::/${openMPthreads}/" \
-        -e "s/::JobNumProcTot::/${coreNumber}/"    \
+        -e "s/::JobNumProcTot::/${mpiTasks}/"    \
       ${file} > ${file}.tmp