Changeset 5055


Ignore:
Timestamp:
04/07/20 11:57:35 (8 months ago)
Author:
cetlod
Message:

NEMOv6.5 : minor corrections

Location:
CONFIG/UNIFORM/v6/NEMO_v6.5
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/NEMO_v6.5/EXPERIMENTS/ORCA2_ICE_PISCES/core/clim/COMP/pisces.card

    r5027 r5055  
    3131            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/Dust_inca_LOI/weights_LMD144142_ORCA2_bilinear.nc , weights_lmd144142_bilin.nc ), \ 
    3232            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/Ndep_input4MIPs/weights_CMIP_NCAR-CCMI_ORCA2_bilinear.nc, weights_2d_bilin.nc), \ 
    33             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_pmarge_etopo.nc                    , bathy.orca.nc      ), \ 
    34             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_river_global_news.nc               , river.orca.nc      ), \ 
    35             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_par_fraction_gewex_clim90s00s.nc   , par.orca.nc        ), \ 
    36             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_Solubility_T62_Mahowald.nc         , solubility.orca.nc ), \ 
     33            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/pmarge_etopo_ORCA2.nc                    , bathy.orca.nc      ), \ 
     34            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/river_global_news_ORCA2.nc               , river.orca.nc      ), \ 
     35            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/par_fraction_gewex_clim90s00s_ORCA2.nc   , par.orca.nc        ), \ 
     36            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/Solubility_T62_Mahowald_ORCA2.nc         , solubility.orca.nc ), \ 
    3737            (${R_IN}/OCE/NEMO/FORCINGS/GHG/CFCs_CDIAC.dat                      , CFCs_CDIAC.dat     ), \ 
    3838            (${R_IN}/OCE/NEMO/FORCINGS/GHG/CO2_OMIP6_1600_2014.txt             , atcco2.txt         ) 
  • CONFIG/UNIFORM/v6/NEMO_v6.5/EXPERIMENTS/ORCA2_ICE_PISCES/core/ia/COMP/pisces.card

    r5027 r5055  
    3030            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/Dust_inca_LOI/weights_LMD144142_ORCA2_bilinear.nc , weights_lmd144142_bilin.nc ), \ 
    3131            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/Ndep_input4MIPs/weights_CMIP_NCAR-CCMI_ORCA2_bilinear.nc, weights_2d_bilin.nc), \ 
    32             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_pmarge_etopo.nc                    , bathy.orca.nc      ), \ 
    33             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_river_global_news.nc               , river.orca.nc      ), \ 
    34             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_par_fraction_gewex_clim90s00s.nc   , par.orca.nc        ), \ 
    35             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_Solubility_T62_Mahowald.nc         , solubility.orca.nc ), \ 
     32            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/pmarge_etopo_ORCA2.nc                    , bathy.orca.nc      ), \ 
     33            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/river_global_news_ORCA2.nc               , river.orca.nc      ), \ 
     34            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/par_fraction_gewex_clim90s00s_ORCA2.nc   , par.orca.nc        ), \ 
     35            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/Solubility_T62_Mahowald_ORCA2.nc         , solubility.orca.nc ), \ 
    3636            (${R_IN}/OCE/NEMO/FORCINGS/GHG/CFCs_CDIAC.dat                      , CFCs_CDIAC.dat     ), \ 
    3737            (${R_IN}/OCE/NEMO/FORCINGS/GHG/CO2_OMIP6_1600_2014.txt             , atcco2.txt         ) 
  • CONFIG/UNIFORM/v6/NEMO_v6.5/EXPERIMENTS/ORCA2_ICE_PISCES/jra/ia/COMP/pisces.card

    r5027 r5055  
    3030            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/Dust_inca_LOI/weights_LMD144142_ORCA2_bilinear.nc , weights_lmd144142_bilin.nc ), \ 
    3131            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/Ndep_input4MIPs/weights_CMIP_NCAR-CCMI_ORCA2_bilinear.nc, weights_2d_bilin.nc), \ 
    32             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_pmarge_etopo.nc                    , bathy.orca.nc      ), \ 
    33             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_river_global_news.nc               , river.orca.nc      ), \ 
    34             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_par_fraction_gewex_clim90s00s.nc   , par.orca.nc        ), \ 
    35             (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/${ORCAGRID}_Solubility_T62_Mahowald.nc         , solubility.orca.nc ), \ 
     32            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/pmarge_etopo_ORCA2.nc                    , bathy.orca.nc      ), \ 
     33            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/river_global_news_ORCA2.nc               , river.orca.nc      ), \ 
     34            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/par_fraction_gewex_clim90s00s_ORCA2.nc   , par.orca.nc        ), \ 
     35            (${R_IN}/OCE/NEMO/${opa9_UserChoices_ORCA_version}/PISCES/Solubility_T62_Mahowald_ORCA2.nc         , solubility.orca.nc ), \ 
    3636            (${R_IN}/OCE/NEMO/FORCINGS/GHG/CFCs_CDIAC.dat                      , CFCs_CDIAC.dat     ), \ 
    3737            (${R_IN}/OCE/NEMO/FORCINGS/GHG/CO2_OMIP6_1600_2014.txt             , atcco2.txt         ) 
  • CONFIG/UNIFORM/v6/NEMO_v6.5/compile_nemo.sh

    r5026 r5055  
    195195 
    196196# Copy of specfic source files 
    197 if [ -f $mysrc_path/*.*90 ] ;  then  
    198    echo >> $outfile ; echo cp $mysrc_path/*.*90  $nemo_root/cfgs/$cfg_wrk/MY_SRC/.   >> $outfile 
    199    echo >> $outfile 
    200    cp $mysrc_path/*.*90  $nemo_root/cfgs/$cfg_wrk/MY_SRC/. 
    201 fi 
     197echo >> $outfile ; echo cp $mysrc_path/*.*90  $nemo_root/cfgs/$cfg_wrk/MY_SRC/.   >> $outfile 
     198echo >> $outfile 
     199cp $mysrc_path/*.*90  $nemo_root/cfgs/$cfg_wrk/MY_SRC/. 
    202200 
    203201if [ $full_nemo == y ] ; then 
Note: See TracChangeset for help on using the changeset viewer.