Changeset 151
- Timestamp:
- 08/13/09 19:22:53 (15 years ago)
- Location:
- trunk/libIGCM
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh
r149 r151 433 433 eval compname=\${config_ListOfComponents_${comp}[0]} > /dev/null 2>&1 434 434 eval comptagname=\${config_ListOfComponents_${comp}[1]} > /dev/null 2>&1 435 # 436 card=${SUBMIT_DIR}/COMP/${compname}.card 437 # 438 IGCM_card_DefineArrayFromOption ${card} RestartFiles List 439 ListFilesName=${compname}_RestartFiles_List 440 eval FileName0=\${${ListFilesName}[0]} > /dev/null 2>&1 435 441 436 442 # Debug Print : 437 443 IGCM_debug_Print 3 "restart ${compname}" 438 439 card=${SUBMIT_DIR}/COMP/${compname}.card440 444 441 445 if ( ${FirstInitialize} ) ; then … … 471 475 if [ "${do_start}" = "y" ] ; then 472 476 473 IGCM_card_DefineArrayFromOption ${card} RestartFiles List474 ListFilesName=${compname}_RestartFiles_List475 eval FileName0=\${${ListFilesName}[0]} > /dev/null 2>&1476 477 477 if ( [ X${FileName0} != X${NULL_STR} ] && [ X${FileName0} != XNONE ] ) ; then 478 478 eval NbFiles=\${#${ListFilesName}[@]} > /dev/null 2>&1 … … 503 503 j4=${j} 504 504 eval IGCM_sys_Get ${Path_r}/${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc 505 IGCM_comp_PrepareDeletedFiles ${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc506 eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${generic_restart_file_name_out}_${j4}.nc" > /dev/null 2>&1505 #IGCM_comp_PrepareDeletedFiles ${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc 506 #eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${generic_restart_file_name_out}_${j4}.nc" > /dev/null 2>&1 507 507 (( j=j+1 )) 508 508 done 509 509 else 510 510 eval IGCM_sys_Get ${Path_r}/${file_in_Name} ${file_out} 511 IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}511 #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out} 512 512 fi 513 513 … … 522 522 fi 523 523 fi 524 el se525 # if not FirstInitialize 524 elif [ ${Period} -eq 1 ] ; then 525 # if not FirstInitialize and first loop of this job 526 526 527 527 # Restore Restarts files 528 528 #----------------------- 529 IGCM_card_DefineArrayFromOption ${card} RestartFiles List530 ListFilesName=${compname}_RestartFiles_List531 eval FileName0=\${${ListFilesName}[0]} > /dev/null 2>&1532 533 529 if ( [ X${FileName0} != X${NULL_STR} ] && [ X${FileName0} != XNONE ] ) ; then 534 530 eval NbFiles=\${#${ListFilesName}[@]} > /dev/null 2>&1 … … 555 551 j4=${j} 556 552 eval IGCM_sys_Get \${R_OUT_${comp}_R}/${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc 557 IGCM_comp_PrepareDeletedFiles ${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc558 eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${generic_restart_file_name_out}_${j4}.nc" > /dev/null 2>&1553 #IGCM_comp_PrepareDeletedFiles ${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc 554 #eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${generic_restart_file_name_out}_${j4}.nc" > /dev/null 2>&1 559 555 560 556 (( j=j+1 )) … … 562 558 else 563 559 eval IGCM_sys_Get \${R_OUT_${comp}_R}/${file_in_Name} ${file_out} 564 IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}560 #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out} 565 561 fi 566 562 … … 601 597 eval ExeNameIn=\${config_Executable_${comp}[0]} 602 598 eval ExeNameOut=\${config_Executable_${comp}[1]} 603 if [ -f ${R_EXE}/${ExeNameIn} ] ; then 599 600 if [ ${Period} -eq 1 ] && [ -f ${R_EXE}/${ExeNameIn} ] ; then 604 601 eval IGCM_sys_Cp ${R_EXE}/${ExeNameIn} ${ExeNameOut} 605 602 if [ -f ${RUN_DIR}/${ExeNameOut} ] ; then 606 603 eval IGCM_sys_Chmod +rx ${RUN_DIR}/${ExeNameOut} 607 fi 604 fi 605 elif [ -f ${R_EXE}/${ExeNameIn} ] && [ ! -f ${RUN_DIR}/${ExeNameOut} ] ; then 606 eval IGCM_sys_Cp ${R_EXE}/${ExeNameIn} ${ExeNameOut} 607 if [ -f ${RUN_DIR}/${ExeNameOut} ] ; then 608 eval IGCM_sys_Chmod +rx ${RUN_DIR}/${ExeNameOut} 609 fi 608 610 fi 609 611 … … 630 632 typeset ListTextName TextName0 631 633 typeset comp compname comptagname card ListFilesName FileName0 NbFiles SaveOnArchive 632 typeset i i_ file_in file_in_ file_out file_out_ generic_file_name nb_rebuild_file634 typeset i i_ file_in file_in_ file_out file_out_ file_outin file_outin_ generic_file_name nb_rebuild_file 633 635 typeset -Z4 j4 634 636 for comp in ${config_ListOfComponents[*]} ; do … … 661 663 eval file_out_=\${${ListFilesName}[$i_]} > /dev/null 2>&1 662 664 eval file_out=${file_out_} 663 664 generic_restart_file_name_in=$( basename ${file_in} .nc ) 665 generic_restart_file_name_out=$( basename ${config_UserChoices_JobName}_${PeriodDateEnd}_${file_out} .nc ) 665 666 (( i_ = i+2 )) 667 eval file_outin_=\${${ListFilesName}[$i_]} > /dev/null 2>&1 668 eval file_outin=${file_outin_} 669 670 generic_restart_file_name_in=$( basename ${file_in} .nc ) 671 generic_restart_file_name_out=$( basename ${config_UserChoices_JobName}_${PeriodDateEnd}_${file_out} .nc ) 672 generic_restart_file_name_outin=$( basename ${file_outin} .nc ) 666 673 667 674 nb_restart_file=$( ls ${generic_restart_file_name_in}_????.nc 2>/dev/null | wc -l ) … … 671 678 j4=${j} 672 679 eval IGCM_sys_Put_Rest ${generic_restart_file_name_in}_${j4}.nc \${R_OUT_${comp}_R}/${generic_restart_file_name_out}_${j4}.nc 673 eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${generic_restart_file_name_in}_${j4}.nc" > /dev/null 2>&1 680 [ ! ${file_in} = ${file_outin} ] && IGCM_sys_Mv ${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_outin}_${j4}.nc 681 #eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${generic_restart_file_name_in}_${j4}.nc" > /dev/null 2>&1 674 682 (( j=j+1 )) 675 683 done 676 684 else 677 685 eval IGCM_sys_Put_Rest ${file_in} \${R_OUT_${comp}_R}/${config_UserChoices_JobName}_${PeriodDateEnd}_${file_out} 678 eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${file_in}" > /dev/null 2>&1 686 [ ! ${file_in} = ${file_outin} ] && IGCM_sys_Mv ${file_in} ${file_outin} 687 #eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${file_in}" > /dev/null 2>&1 679 688 fi 680 689 -
trunk/libIGCM/libIGCM_config/libIGCM_config.ksh
r146 r151 486 486 fi 487 487 ExeDate=${ExeDate}_${LS_comp[7]} 488 489 eval FileToBeDeleted[${#FileToBeDeleted[@]}]=${ExeNameOut}490 488 fi 491 489 … … 499 497 (( i=i+1 )) 500 498 501 if [ ${ExeSize} -ne ${LastCompExeSize} ] ; then 499 if [ ${ExeSize} -ne ${LastCompExeSize} ] ; then 502 500 if ( ${FirstInitialize} ) ; then 503 501 IGCM_debug_Print 1 "Put first ${ExeNameIn} in ${R_OUT_EXE} !" 504 502 else 505 503 IGCM_debug_Print 1 "${ExeNameIn} has changed in ${R_EXE} !" 504 eval FileToBeDeleted[${#FileToBeDeleted[@]}]=${ExeNameOut} 506 505 fi 507 506 eval IGCM_sys_Put_Out ${ExeNameOut} ${R_OUT_EXE}/${PREFIX}_${ExeNameIn} 507 IGCM_sys_Chmod u+xw ${ExeNameOut} 508 508 fi 509 509 done
Note: See TracChangeset
for help on using the changeset viewer.