Changeset 6791


Ignore:
Timestamp:
04/05/24 15:18:20 (3 months ago)
Author:
aclsce
Message:

Merge ICOLMDZORINCA_v7_work into IPSLCM7_work

  • Added LAM experiments into ICOLMDZ and ICOLMDZOR experiment directory
  • Use of guided_type variable (instead of ok_guide) into dynamico.card
  • Added create_etat0_limit_unstruct_mod.F90 into SOURCES/LMDZ to fix bad termination in case of create_etat0 with DYNAMICO.
Location:
CONFIG/UNIFORM/v7/IPSLCM7
Files:
92 added
16 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZ/CREATE_amip/COMP/dynamico.card

    r6789 r6791  
    88# create_etat0_limit=n is used for normal GCM run 
    99create_etat0_limit = y 
     10etat0=database 
    1011 
    1112# iflag_phys=1 is used for normal GCM run with continents (not aquaplanet)  
    … …  
    2526 
    2627[ParametersFiles] 
    27 List=   \ 
    28         (${SUBMIT_DIR}/PARAM/DYNAMICO/earth_const.def, .),\ 
     28List=   (${SUBMIT_DIR}/PARAM/DYNAMICO/earth_const.def, .),\ 
    2929        (${SUBMIT_DIR}/PARAM/DYNAMICO/run_dynamico.def_nbp${RESOL_NBP}, run_dynamico.def),\ 
    3030        (${MODIPSL}/modeles/DYNAMICO/xml/sponge_dynamico.xml, .),\ 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZ/CREATE_hadisst/COMP/dynamico.card

    r6789 r6791  
    88# create_etat0_limit=n is used for normal GCM run 
    99create_etat0_limit = y 
     10etat0=database 
    1011 
    1112# iflag_phys=1 is used for normal GCM run with continents (not aquaplanet)  
    … …  
    2526 
    2627[ParametersFiles] 
    27 List=   \ 
    28         (${SUBMIT_DIR}/PARAM/DYNAMICO/earth_const.def, .),\ 
     28List=   (${SUBMIT_DIR}/PARAM/DYNAMICO/earth_const.def, .),\ 
    2929        (${SUBMIT_DIR}/PARAM/DYNAMICO/run_dynamico.def_nbp${RESOL_NBP}, run_dynamico.def),\ 
    3030        (${MODIPSL}/modeles/DYNAMICO/xml/sponge_dynamico.xml, .),\ 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZ/aquaplanet/CREATE_aquaplanet/COMP/dynamico.card

    r6789 r6791  
    88# create_etat0_limit=n is used for normal GCM run 
    99create_etat0_limit = y 
     10etat0=database 
    1011 
    1112# iflag_phys=1 is used for normal GCM run with continents (not aquaplanet)  

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZ/clim_noleap/COMP/dynamico.card

    r6656 r6791  
    1313iflag_phys=1 
    1414 
    15 # Nugding : ok_guide=y/n 
    16 # If ok_guide=y, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below  
    17 ok_guide=n 
     15# Nugding : guided_type=none or nudging 
     16# If guided_type=nudging, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
     17guided_type=none 
    1818 
    1919 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/clim_pdControl.orch4/COMP/dynamico.card

    r6656 r6791  
    1313iflag_phys=1 
    1414 
    15 # Nugding : ok_guide=y/n 
    16 # If ok_guide=y, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below  
    17 ok_guide=n 
     15# Nugding : guided_type=none or nudging 
     16# If guided_type=nudging, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
     17guided_type=none 
    1818 
    1919 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/clim_pdControl/COMP/dynamico.card

    r6656 r6791  
    1313iflag_phys=1 
    1414 
    15 # Nugding : ok_guide=y/n 
    16 # If ok_guide=y, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below  
    17 ok_guide=n 
     15# Nugding : guided_type=none or nudging 
     16# If guided_type=nudging, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
     17guided_type=none 
    1818 
    1919 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/highresmip/COMP/dynamico.card

    r6656 r6791  
    1313iflag_phys=1 
    1414 
    15 # Nugding : ok_guide=y/n 
    16 # If ok_guide=y, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below  
    17 ok_guide=n 
     15# Nugding : guided_type=none or nudging 
     16# If guided_type=nudging, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
     17guided_type=none 
    1818 
    1919 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/highresmip_CMIP6/COMP/dynamico.card

    r6656 r6791  
    1313iflag_phys=1 
    1414 
    15 # Nugding : ok_guide=y/n 
    16 # If ok_guide=y, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below  
    17 ok_guide=n 
     15# Nugding : guided_type=none or nudging 
     16# If guided_type=nudging, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
     17guided_type=none 
    1818 
    1919 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZORINCA/AER/COMP/dynamico.card

    r6656 r6791  
    1313iflag_phys=1 
    1414 
    15 # Nugding : ok_guide=y/n 
    16 # If ok_guide=y, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below. 
    17 ok_guide=n 
     15# Nugding : guided_type=none or nudging 
     16# If guided_type=nudging, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
     17guided_type=none 
    1818 
    1919[InitialStateFiles] 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZORINCA/CREATE_etat0/COMP/dynamico.card

    r6789 r6791  
    88# create_etat0_limit=n is used for normal GCM run 
    99create_etat0_limit = y 
     10etat0=database 
    1011 
    1112# iflag_phys=1 is used for normal GCM run with continents (not aquaplanet)  

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZORINCA/GES/COMP/dynamico.card

    r6656 r6791  
    1313iflag_phys=1 
    1414 
    15 # Nugding : ok_guide=y/n 
    16 # If ok_guide=y, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
    17 # If ok_guide=y, add copy of nudging_dynamico.xml file in ParametersFiles section below 
    18 ok_guide=n 
     15# Nugding : guided_type=none or nudging 
     16# If guided_type=nudging, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
     17# If guided_type=nudging, add copy of nudging_dynamico.xml file in ParametersFiles section below 
     18guided_type=none 
    1919 
    2020 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZORINCA/NMHC_AER_S/COMP/dynamico.card

    r6656 r6791  
    1313iflag_phys=1 
    1414 
    15 # Nugding : ok_guide=y/n 
    16 # If ok_guide=y, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below. 
    17 ok_guide=n 
     15# Nugding : guided_type=none or nudging 
     16# If guided_type=nudging, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
     17guided_type=none 
    1818 
    1919[InitialStateFiles] 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/IPSLCM-ico/piControl_TEST.orch4/COMP/dynamico.card

    r6656 r6791  
    1313iflag_phys=1 
    1414 
    15 # Nugding : ok_guide=y/n 
    16 # If ok_guide=y, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
    17 ok_guide=n 
    18  
     15# Nugding : guided_type=none or nudging 
     16# If guided_type=nudging, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
     17guided_type=none 
    1918 
    2019[InitialStateFiles] 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/IPSLCM-ico/piControl_TEST/COMP/dynamico.card

    r6656 r6791  
    1313iflag_phys=1 
    1414 
    15 # Nugding : ok_guide=y/n 
    16 # If ok_guide=y, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
    17 ok_guide=n 
     15# Nugding : guided_type=none or nudging 
     16# If guided_type=nudging, add nudging files(u.nc, v.nc, hur.nc,...) in BoundaryFiles section below 
     17guided_type=none 
    1818 
    1919 

  • CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/DRIVER/dynamico.driver

    r6789 r6791  
    5959 
    6060    #  Activate nudging if ok_guide=y set in dynamico.card 
    61     if [  X${dynamico_UserChoices_ok_guide} = Xy ] ; then 
    62         IGCM_comp_modifyDefFile nonblocker run_dynamico.def guided_type  nudging 
     61    if [ X${dynamico_UserChoices_guided_type} != X ] ; then 
     62        IGCM_comp_modifyDefFile nonblocker run_dynamico.def guided_type ${dynamico_UserChoices_guided_type}  
    6363    else 
    6464        IGCM_comp_modifyDefFile nonblocker run_dynamico.def guided_type  none 
    … …  
    7676        if [ X${dynamico_UserChoices_iflag_phys} = X ] || [ X${dynamico_UserChoices_iflag_phys} = X1 ]; then  
    7777            # iflag_phys is not set or iflag_phys=1 => run is not an aquaplanet 
    78             IGCM_comp_modifyDefFile nonblocker run_dynamico.def etat0              database 
     78            IGCM_comp_modifyDefFile nonblocker run_dynamico.def etat0              ${dynamico_UserChoices_etat0} 
    7979            IGCM_comp_modifyDefFile nonblocker run_dynamico.def iflag_phys         1 
    8080        else 
    … …  
    124124    fi 
    125125 
    126     if [  X${dynamico_UserChoices_ok_guide} = Xy ] ; then 
     126    if [ X${dynamico_UserChoices_guided_type} = Xnudging_forcing ] || [ X${dynamico_UserChoices_guided_type} = Xnudging ] ; then 
    127127        if [ -f nudging_dynamico.xml ] ; then 
    128128            echo '<context id="icosagcm" src="./nudging_dynamico.xml" />'  >> add.tmp 
    129129        else 
    130             IGCM_debug_Exit "you choose ok_guide=y and forget to add the copy of nudging_dynamico.xml file in dynamico.card" 
     130            IGCM_debug_Exit "you choose to activate guided mode and forget to add the copy of nudging_dynamico.xml file in dynamico.card" 
    131131            IGCM_debug_Verif_Exit 
    132132        fi 

  • CONFIG/UNIFORM/v7/IPSLCM7/compile_ipslcm7.sh

    r6789 r6791  
    461461cd $modipsl/modeles/LMDZ 
    462462 
     463# Temporary use of SOURCES/LMDZ to handle modifications needed by IPSLCM7 for LMDZ 4876 
     464# To be removed for newer versions of LMDZ 
     465ln -sf $mysrc_path/LMDZ/phylmd/*.*90  libf/phylmd/. 
    463466 
    464467# Compile LMDZ as library to couple to DYNAMICO 
Note: See TracChangeset for help on using the changeset viewer.