Changeset 2601


Ignore:
Timestamp:
06/30/15 11:05:38 (6 years ago)
Author:
jgipsl
Message:
  • Corrected error introduced in rev 2995.
  • Deactivate NMC as default
  • Better error handeling
Location:
CONFIG/UNIFORM/v6/LMDZOR_v6
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

    r2598 r2601  
    5252 
    5353# Set NMC Outputs frequency (monthly, daily, HF) = y/n 
    54 LMDZ_NMC_monthly=y 
     54LMDZ_NMC_monthly=n 
    5555LMDZ_NMC_daily=n 
    5656LMDZ_NMC_hf=n 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim/COMP/lmdz.card

    r2600 r2601  
    5252 
    5353# Set NMC Outputs frequency (monthly, daily, HF) = y/n 
    54 LMDZ_NMC_monthly=y 
     54LMDZ_NMC_monthly=n 
    5555LMDZ_NMC_daily=n 
    5656LMDZ_NMC_hf=n 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/orchidee.driver

    r2599 r2601  
    5555                sechiba1_freq=${NbMonths}mo ;; 
    5656            *D|*d) 
    57                 NbDayss=$( echo ${frequency} | awk -F '[dD]' '{print $1}' ) 
     57                NbDays=$( echo ${frequency} | awk -F '[dD]' '{print $1}' ) 
    5858                sechiba1_enabled=.TRUE. 
    5959                sechiba1_freq=${NbDays}d ;; 
     
    6363                sechiba1_freq=${WriteInSeconds}s ;; 
    6464            HF|hf)  
    65                 SRF_ok_hf=y  
    6665                sechiba2_enabled=.TRUE. ;; 
    6766            *)  
    68                 IGCM_debug_Exit "SRF_Update " ${frequency} " invalid WriteFrequency : choose in xY, xM, xD, xs and HF"  
    69                 IGCM_debug_Verif_Exit ;; 
     67                IGCM_debug_Exit "SRF WriteFrequency=${frequency} is invalid. Choose between xY, xM, xD, xs and HF for Sechiba." ;; 
    7068        esac 
    7169    done 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/stomate.driver

    r2595 r2601  
    2525    # Only one choice can be set as WriteFrequency. The same choice will be used for  
    2626    # both stomate_history and stomate_ipcc_history files.  
    27     case ${config_SBG_WriteFrequency} in 
    28         *Y|*y)  
    29             NbYears=$( echo ${config_SBG_WriteFrequency} | awk -F '[yY]' '{print $1}' ) 
    30             NbDaysYear=$( IGCM_date_DaysInYear ${year} ) 
    31             stomate_enabled=.TRUE. 
    32             stomate_freq=${NbYears}y ;; 
    33         *M|*m)  
    34             NbMonths=$( echo ${config_SBG_WriteFrequency} | awk -F '[mM]' '{print $1}' ) 
    35             stomate_enabled=.TRUE. 
    36             stomate_freq=${NbMonths}mo ;; 
    37         *D|*d) 
    38             NbDays=$( echo ${frequency} | awk -F '[dD]' '{print $1}' ) 
    39             stomate_enabled=.TRUE. 
    40             stomate_freq=${NbDays}d ;; 
    41         *)  
    42             IGCM_debug_Exit "SBG_Update " ${config_SBG_WriteFrequency} " invalid WriteFrequency : choose between xY, xM, xD"  
    43             IGCM_debug_Verif_Exit ;; 
    44     esac 
     27    for frequency in ${config_SBG_WriteFrequency} ; do 
     28        case ${frequency} in 
     29            *Y|*y)  
     30                NbYears=$( echo ${frequency} | awk -F '[yY]' '{print $1}' ) 
     31                NbDaysYear=$( IGCM_date_DaysInYear ${year} ) 
     32                stomate_enabled=.TRUE. 
     33                stomate_freq=${NbYears}y ;; 
     34            *M|*m)  
     35                NbMonths=$( echo ${frequency} | awk -F '[mM]' '{print $1}' ) 
     36                stomate_enabled=.TRUE. 
     37                stomate_freq=${NbMonths}mo ;; 
     38            *D|*d) 
     39                NbDays=$( echo ${frequency} | awk -F '[dD]' '{print $1}' ) 
     40                stomate_enabled=.TRUE. 
     41                stomate_freq=${NbDays}d ;; 
     42            *)  
     43                IGCM_debug_Exit "SBG WriteFrequency=${frequency} is invalid. Choose between xY, xM and xD for Stomate." ;; 
     44        esac 
     45    done 
    4546 
    4647    # Modify file_def_orchidee.xml 
Note: See TracChangeset for help on using the changeset viewer.