Changeset 1028


Ignore:
Timestamp:
07/25/14 17:41:55 (10 years ago)
Author:
sdipsl
Message:

Remove OldPrefix? from run.card to ease REDO process when needed. see #168

Location:
trunk/libIGCM
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/AA_SE_Checker

    r908 r1028  
    1717# Check that everything went well during seasonal average production 
    1818# Display a short report 
    19 # Launch what's missing 
    20 # For use during a run (not on the end : PeriodState=Completed), it will complete 
    21 # all TS to last PeriodDateEnd value, give by run.card->Configuration->OldPrefix string. 
     19# Launch what's missing when a simulation has been completed PeriodState=Completed 
    2220 
    2321#D- Path to libIGCM 

  • trunk/libIGCM/AA_TimeSeries_Checker

    r1019 r1028  
    1919# Launch what's missing 
    2020# For use during a run (not on the end : PeriodState=Completed), it will complete 
    21 # all TS to last PeriodDateEnd value, give by run.card->Configuration->OldPrefix string. 
     21# all TS to last PeriodDateEnd value, give by run.card->Configuration->(PeriodDateBegin - 1). 
    2222 
    2323#D- Path to libIGCM 
    … …  
    103103 
    104104if [ -f ${CARD_DIR}/run.card ] ; then 
    105   IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card Configuration OldPrefix 
    106105  IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card Configuration PeriodState 
     106  IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card Configuration PeriodDateBegin 
    107107  IGCM_card_DefineVariableFromOption ${CARD_DIR}/run.card PostProcessing TimeSeriesCompleted 
    108108  IGCM_debug_Print 1 "DefineVariableFromOption  : run_Configuration" 
    109   IGCM_debug_PrintVariables 3 run_Configuration_OldPrefix 
    110109  IGCM_debug_PrintVariables 3 run_Configuration_PeriodState 
    111110  IGCM_debug_Print 1 "DefineVariableFromOption  : run_PostProcessing" 
    112111  IGCM_debug_PrintVariables 3 run_PostProcessing_TimeSeriesCompleted 
    113112  if [ X${run_Configuration_PeriodState} != X"Completed" ] ; then 
    114     DateEnd=$( IGCM_date_ConvertFormatToGregorian $( echo ${run_Configuration_OldPrefix} | awk -F'_' '{print $2}' ) ) 
     113    DateEnd=$( IGCM_date_AddDaysToGregorianDate $( IGCM_date_ConvertFormatToGregorian ${PeriodDateBegin} ) -1 ) 
    115114  else 
    116115    DateEnd=$( IGCM_date_ConvertFormatToGregorian ${config_UserChoices_DateEnd} ) 

  • trunk/libIGCM/AA_clean_month

    r906 r1028  
    9090  #===================================# 
    9191  IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration PeriodState 
    92   IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration OldPrefix 
    9392  IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration PeriodDateBegin 
    9493  IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration PeriodDateEnd 

  • trunk/libIGCM/AA_clean_year

    r986 r1028  
    9292#===================================# 
    9393IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration PeriodState 
    94 IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration OldPrefix 
    9594IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration PeriodDateBegin 
    9695IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration PeriodDateEnd 
    … …  
    247246  printf "${Green}Your run.card and Job_${config_UserChoices_JobName} will now be updated\n" 
    248247  printf " - PeriodState = OnQueue ;\n" 
    249   printf " - PeriodDateBegin, PeriodDateEnd, CumulPeriod and OldPrefix ;\n" 
    250   printf "   %-10s       %-10s          %6i     %s\n" \ 
     248  printf " - PeriodDateBegin, PeriodDateEnd and CumulPeriod ;\n" 
     249  printf "   %-10s       %-10s          %6i\n" \ 
    251250         $( IGCM_date_HumanDigit ${PeriodDateBegin} ) \ 
    252251         $( IGCM_date_HumanDigit ${PeriodDateEnd} ) \ 
    253          ${NewCumulPeriod} \ 
    254          ${config_UserChoices_JobName}_${PreviousPeriodDateEnd} 
     252         ${NewCumulPeriod} 
    255253  printf " - ScriptOutput = %s" \ 
    256254         "Script_Output_${config_UserChoices_JobName}.${Suffix}" 
    … …  
    272270        IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodDateEnd \ 
    273271                              $( IGCM_date_HumanDigit ${PeriodDateEnd} ) 
    274         IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration OldPrefix \ 
    275                               ${config_UserChoices_JobName}_${PreviousPeriodDateEnd} 
    276272        # Update job 
    277273        cp Job_${config_UserChoices_JobName} Job_${config_UserChoices_JobName}.old 

  • trunk/libIGCM/AA_move-and-rename

    r906 r1028  
    182182 
    183183if [ -f ${SUBMIT_DIR}/run.card ] ; then 
    184   IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration OldPrefix 
    185   IGCM_debug_PrintVariables 2 run_Configuration_OldPrefix 
     184  IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration PeriodDateBegin 
     185  IGCM_debug_PrintVariables 2 run_Configuration_PeriodDateBegin 
    186186  if [ X${old_run_Configuration_PeriodState} != X"Completed" ] ; then 
    187     DateEnd=$( IGCM_date_ConvertFormatToGregorian $( echo ${run_Configuration_OldPrefix} | awk -F'_' '{print $2}' ) ) 
     187    DateEnd=$( IGCM_date_AddDaysToGregorianDate $( IGCM_date_ConvertFormatToGregorian ${PeriodDateBegin} ) -1 ) 
    188188  else 
    189189    DateEnd=$( IGCM_date_ConvertFormatToGregorian ${config_UserChoices_DateEnd} ) 

  • trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

    r1022 r1028  
    816816          eval file_out=${file_out_} 
    817817 
    818           file_in_Name=${run_Configuration_OldPrefix}_${file_in} 
     818          file_in_Name=${config_UserChoices_JobName}_${LastPeriodDateEnd}_${file_in} 
    819819 
    820820          extension_in=$( echo ${file_in_Name##*.} ) 

  • trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

    r1009 r1028  
    611611    #===================================# 
    612612 
    613     IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration OldPrefix 
    614613    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration PeriodDateBegin 
    615614    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/run.card Configuration PeriodDateEnd 
    … …  
    620619    CumulPeriod=${run_Configuration_CumulPeriod} 
    621620 
    622     LastPeriodDateEnd=$( echo ${run_Configuration_OldPrefix} | sed -e "s/${config_UserChoices_JobName}_//" ) 
     621    LastPeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate $( IGCM_date_ConvertFormatToGregorian ${PeriodDateBegin} ) -1 ) 
    623622 
    624623    if [ ${Period} = 1 ]; then 
    … …  
    660659    IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodState "Running" 
    661660  fi 
    662  
    663   # Save for futur use 
    664   OldPrefix=${config_UserChoices_JobName}_${PeriodDateEnd} 
    665661 
    666662  # BEGIN: SHOULD GO IN A FUNCTION FROM libIGCM_date.ksh 
    … …  
    12281224  #=================================================# 
    12291225 
    1230   IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration OldPrefix ${OldPrefix} 
    12311226  IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodDateBegin ${PeriodDateBegin} 
    12321227  IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodDateEnd ${PeriodDateEnd} 

  • trunk/libIGCM/run.card.init

    r477 r1028  
    77#======================================================================== 
    88[Configuration] 
    9 #last PREFIX 
    10 OldPrefix= 
    119#Compute date of loop 
    1210PeriodDateBegin= 
Note: See TracChangeset for help on using the changeset viewer.