Changeset 1248

Timestamp:

10/15/15 22:23:49 (9 years ago)

Author:

sdipsl

Message:

• Fix an issue impacting opa9.driver

Location:

trunk/libIGCM

Files:

• libIGCM_comp/libIGCM_comp.ksh (modified) (1 diff)
• libIGCM_config/libIGCM_config.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -775 +775 @@
               done
 
-              if [ X${NUM_PROC_OCE} != X ] ; then
-                if [ ${NUM_PROC_OCE} -ne ${nb_restart_file} ] ; then
+              # OCE SPECIFIC TO REBUILD RESTART WHEN NUMBER OF RESTART FILES DONT MATCH MPI PROCESS
+              if [ X${OCE_PROC_MPI} != X ] ; then
+                if [ ${OCE_PROC_MPI} -ne ${nb_restart_file} ] ; then
                   IGCM_sys_rebuild ${generic_restart_file_name_out}.${extension_out} ${generic_restart_file_name_out}_????.${extension_out}
                   IGCM_sys_Rm ${generic_restart_file_name_out}_????.${extension_out}

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -688 +688 @@
   done
 
+  # MANDATORY FOR THE OPA9.DRIVER. USED TO EDIT OPA NAMELIST
+  # WE SHOULD PLANIFY NUM_PROC_??? DEPRECATION
+  NUM_PROC_CPL=${CPL_PROC_MPI}
+  NUM_PROC_OCE=${OCE_PROC_MPI}
+  NUM_PROC_ATM=${ATM_PROC_MPI}
+
   # set MPMD mode if more than 2 executable names.
   [ ${NbExec} -ge 2 ] && OK_PARA_MPMD=true