Changeset 661

Timestamp:

04/25/12 14:34:21 (12 years ago)

Author:

acosce

Message:

BugFix? for inca config

1- management of two executable with only one launch (inca individual case)
2- refine restart list and will find restart with different extension (.nc, .txt etc...)

Location:

tags/libIGCM_v2.0_beta1

Files:

• libIGCM_comp/libIGCM_comp.ksh (modified) (4 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (1 diff)
• libIGCM_sys/libIGCM_sys_titane.ksh (modified) (1 diff)

tags/libIGCM_v2.0_beta1/libIGCM_comp/libIGCM_comp.ksh

@@ -726 +726 @@
           file_in_Name=${run_Configuration_OldPrefix}_${file_in}
 
-          generic_restart_file_name_in=$( basename ${file_in_Name} .nc )
-          generic_restart_file_name_out=$( basename ${file_out} .nc )
+          
+          extension_in=$( echo ${file_in_Name##*.} )
+          extension_out=$( echo ${file_out##*.} )
+
+
+          generic_restart_file_name_in=$( basename ${file_in_Name} .${extension_in} )
+          generic_restart_file_name_out=$( basename ${file_out} .${extension_out} )
 
           eval Path_BUF=\${R_BUF_${comp}_R}/${generic_restart_file_name_in}
@@ -733 +738 @@
 
           #if [ -f ${Path_BUF}*.nc ] ; then
-          if [ $( IGCM_sys_TestFileBuffer ${Path_BUF}*.nc ; echo $? ) = 0 ] ; then
+          if [ $( IGCM_sys_TestFileBuffer ${Path_BUF}*.${extension_in} ; echo $? ) = 0 ] ; then
             IGCM_debug_Print 3 "Buffered restart"
             Buffered=true
             Archived=false
             Tared=false
-            nb_restart_file=$(IGCM_sys_CountFileBuffer ${Path_BUF}_????.nc)
+            nb_restart_file=$(IGCM_sys_CountFileBuffer ${Path_BUF}_????.${extension_in})
           #elif [ -f ${Path_OUT}*.nc ] ; then
-          elif [ $( IGCM_sys_TestFileArchive ${Path_OUT}*.nc ; echo $? ) = 0 ] ; then
+          elif [ $( IGCM_sys_TestFileArchive ${Path_OUT}*.${extension_out} ; echo $? ) = 0 ] ; then
             IGCM_debug_Print 3 "Archived restart"
             Buffered=false
             Archived=true
             Tared=false
-            nb_restart_file=$(IGCM_sys_CountFileArchive ${Path_OUT}_????.nc)
+            nb_restart_file=$(IGCM_sys_CountFileArchive ${Path_OUT}_????.${extension_out})
           else
             IGCM_debug_Print 3 "Tared restart"
@@ -761 +766 @@
               done
             fi
-            tar xvf ${TarFileFound} ${comp}_${generic_restart_file_name_in}*.nc
-            nb_restart_file=$( IGCM_sys_CountFileBuffer ${comp}_${generic_restart_file_name_in}_????.nc )
+            tar xvf ${TarFileFound} ${comp}_${generic_restart_file_name_in}*.${extension_in}
+            nb_restart_file=$( IGCM_sys_CountFileBuffer ${comp}_${generic_restart_file_name_in}_????.${extension_in} )
           fi
 
@@ -770 +775 @@
               j4=${j}
               if [ X${Buffered} = Xtrue ] ; then
-                IGCM_sys_GetBuffer ${Path_BUF}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
+                IGCM_sys_GetBuffer ${Path_BUF}_${j4}.${extension_in} ${generic_restart_file_name_out}_${j4}.${extension_out}
               elif [ X${Archived} = Xtrue ] ; then
-                IGCM_sys_Get ${Path_OUT}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
+                IGCM_sys_Get ${Path_OUT}_${j4}.${extension_out} ${generic_restart_file_name_out}_${j4}.${extension_out}
               elif [ X${Tared} = Xtrue ] ; then
-                IGCM_sys_Mv ${comp}_${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
+                IGCM_sys_Mv ${comp}_${generic_restart_file_name_in}_${j4}.${extension_in} ${generic_restart_file_name_out}_${j4}.${extension_out}
               fi
               (( j=j+1 ))

tags/libIGCM_v2.0_beta1/libIGCM_config/libIGCM_config.ksh

@@ -650 +650 @@
 
     # Only if we really have an executable for the component :
-    if [ X${ExeNameIn} != X\"\" ] ; then
+###    if [ X${ExeNameIn} != X\"\" ] ; then
+    if ( [ "X${ExeNameIn}" != X\"\" ] && [ "X${ExeNameIn}" != "Xinca.dat" ] ) ; then
 
       # Keep the first executable found and the first CompName

tags/libIGCM_v2.0_beta1/libIGCM_sys/libIGCM_sys_titane.ksh

@@ -1934 +1934 @@
           # Only if we really have an executable for the component :
           eval ExeNameOut=\${config_Executable_${comp}[1]}
-          if ( [ "X${ExeNameOut}" != X\"\" ] ) ; then
+###          if ( [ "X${ExeNameOut}" != X\"\" ] ) ; then
+          if ( [ "X${ExeNameOut}" != X\"\" ] && [ "X${ExeNameOut}" != "Xinca.dat" ] ) ; then
 
               echo "#!/bin/ksh" > script_${ExeNameOut}.ksh