Changeset 2302


Ignore:
Timestamp:
07/23/14 17:22:11 (7 years ago)
Author:
aclsce
Message:
  • Use of ORCA2 by default (instead of ORCA1)
  • Modified cpl_oasis3 NEMO subroutine in order to have a "clean" crash in coupled mode.
Location:
CONFIG/UNIFORM/v6/IPSLCM6
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card

    r2300 r2302  
    3030# Number of periods where to set parameter adjust=y before switching to adjust=n 
    3131# For adjust=n, set LMDZ_NbPeriod_ajust=0.  
    32 LMDZ_NbPeriod_adjust=0 
     32LMDZ_NbPeriod_adjust=3 
    3333 
    3434# To force usage of specific Bands file, set LMDZ_NbPeriod_adjust=0 and replace XXXXXXX by Restart experiment 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card

    r2300 r2302  
    33 
    44[UserChoices] 
    5 ORCA_version=ORCA1.0 
     5ORCA_version=ORCA2.3 
    66io_xml=y 
    77mesh_mask=n 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/lmdz.driver

    r2300 r2302  
    348348 
    349349    # XIOS XML definition 
    350     if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then 
    351350    # Default init : files are desactivated 
    352351        LMDZ_sed_xml file_def_histmth_lmdz.xml histmth enabled .FALSE.  
     
    359358        LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC enabled .FALSE. 
    360359        LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC enabled .FALSE. 
     360        if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then 
    361361    # Default output level : 5 
    362         LMDZ_sed_xml file_def_histmth_lmdz.xml histmth output_level 5  
    363         LMDZ_sed_xml file_def_histday_lmdz.xml histday output_level 5  
    364         LMDZ_sed_xml file_def_histhf_lmdz.xml histhf output_level 5 
    365         LMDZ_sed_xml file_def_histfh3h_lmdz.xml histfh3h output_level 5 
    366         LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histfh3hm output_level 5 
    367         LMDZ_sed_xml file_def_histstn_lmdz.xml histstn output_level 5 
    368         LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC output_level 5 
    369         LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC output_level 5 
    370         LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC output_level 5 
     362            LMDZ_sed_xml file_def_histmth_lmdz.xml histmth output_level 5  
     363            LMDZ_sed_xml file_def_histday_lmdz.xml histday output_level 5  
     364            LMDZ_sed_xml file_def_histhf_lmdz.xml histhf output_level 5 
     365            LMDZ_sed_xml file_def_histfh3h_lmdz.xml histfh3h output_level 5 
     366            LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histfh3hm output_level 5 
     367            LMDZ_sed_xml file_def_histstn_lmdz.xml histstn output_level 5 
     368            LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC output_level 5 
     369            LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC output_level 5 
     370            LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC output_level 5 
    371371     # Filling of XML files  
    372372        if [ X${ok_mensuel} = Xy ] ; then 
  • CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/cpl_oasis3.F90

    r2201 r2302  
    345345      ! 
    346346      DEALLOCATE( exfld ) 
    347       CALL prism_terminate_proto( nerror )          
     347      IF (nstop == 0) THEN 
     348          CALL prism_terminate_proto( nerror )          
     349      ELSE 
     350          CALL prism_abort_proto(ncomp_id, "nemo crash", "nemo crash") 
     351      ENDIF 
    348352      ! 
    349353   END SUBROUTINE cpl_prism_finalize 
Note: See TracChangeset for help on using the changeset viewer.