New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 5353 for branches/2015 – NEMO

Changeset 5353 for branches/2015


Ignore:
Timestamp:
2015-06-04T17:09:43+02:00 (9 years ago)
Author:
smasson
Message:

dev_r5218_CNRS17_coupling: remove some changes made in previous commit

Location:
branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/ARCH/arch-macport_osx.fcm

    r5352 r5353  
    5252%CPP               cpp-mp-4.8 
    5353%FC                mpif90  
    54 ###%FCFLAGS             -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer  
    55 %FCFLAGS             -fdefault-real-8 -O0 -g -fbacktrace -fbounds-check -funroll-all-loops -fcray-pointer  
     54%FCFLAGS             -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer  
    5655%FFLAGS              %FCFLAGS 
    5756%LD                  %FC 
  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/iodef.xml

    r5352 r5353  
    2121    --> 
    2222     
    23     <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4"> 
    24      
    25       <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."> <!-- 1 time step files --> 
    26     
    27    <file id="file11" name_suffix="_grid_T" description="ocean T grid variables" > 
    28      <field_group  prec="8"  operation="instant" > 
    29        <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       /> 
    30        <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          /> 
    31        <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                /> 
    32        <field field_ref="saltflx"      /> 
    33        <field field_ref="taum"         name="taum" /> 
    34        <field field_ref="wspd"         name="windsp"  /> 
    35        <field field_ref="precip"       name="precip" /> 
    36        <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                     /> 
    37        <field field_ref="qsr"          name="rsntds"   long_name="surface_net_downward_shortwave_flux"           /> 
    38        <field field_ref="qt"           name="tohfls"   long_name="surface_net_downward_total_heat_flux"          /> 
    39             <field field_ref="sst_m"  /> 
    40             <field field_ref="sss_m"  /> 
    41             <field field_ref="ssu_m"  /> 
    42             <field field_ref="ssv_m"  /> 
    43             <field field_ref="ssh_m"  /> 
    44             <field field_ref="e3t_m"  /> 
    45             <field field_ref="frq_m"  /> 
    46             <field field_ref="qsr_oce"  /> 
    47             <field field_ref="qsr_ice"  /> 
    48             <field field_ref="qns_oce"  /> 
    49             <field field_ref="qns_ice"  /> 
    50             <field field_ref="sfxbri"  /> 
    51             <field field_ref="sfxdyn"  /> 
    52             <field field_ref="sfxres"  /> 
    53             <field field_ref="sfxbog"  /> 
    54             <field field_ref="sfxbom"  /> 
    55             <field field_ref="sfxsum"  /> 
    56             <field field_ref="sfxsni"  /> 
    57             <field field_ref="sfxopw"  /> 
    58             <field field_ref="sfx"  /> 
    59  
    60      </field_group> 
    61    </file> 
    62     
    63       </file_group> 
     23    <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4"> 
     24     
     25      <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files --> 
    6426 
    6527      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files --> 
  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_cfg

    r5352 r5353  
    66&namrun        !   parameters of the run 
    77!----------------------------------------------------------------------- 
    8    nn_it000    =       1   !  first time step 
    9    nn_itend    =     24    !  last  time step (std 5475) 
    10    ln_clobber  =  .true.   !  clobber (overwrite) an existing file 
    118/ 
    129!----------------------------------------------------------------------- 
     
    3128&namdom        !   space and time domain (bathymetry, mesh, timestep) 
    3229!----------------------------------------------------------------------- 
    33    rn_rdt      = 3600.     !  time step for the dynamics (and tracer if nn_acc=0) 
    3430   jphgr_msh   =       0               !  type of horizontal mesh 
    3531   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1) 
     
    6763&namsbc        !   Surface Boundary Condition (surface module) 
    6864!----------------------------------------------------------------------- 
    69    nn_fsbc     = 1         !  frequency of surface boundary condition computation 
    70                            !     (also = the frequency of sea-ice model call) 
    71    ln_ana      = .false.   !  analytical formulation                    (T => fill namsbc_ana ) 
    72    ln_flx      = .false.   !  flux formulation                          (T => fill namsbc_flx ) 
    73    ln_blk_clio = .false.   !  CLIO bulk formulation                     (T => fill namsbc_clio) 
    74    ln_blk_core = .true.    !  CORE bulk formulation                     (T => fill namsbc_core) 
    75    ln_blk_mfs  = .false.   !  MFS bulk formulation                      (T => fill namsbc_mfs ) 
    76    ln_cpl      = .false.   !  atmosphere coupled   formulation          ( requires key_oasis3 ) 
    77    ln_mixcpl   = .false.   !  forced-coupled mixed formulation          ( requires key_oasis3 ) 
    78    nn_components = 0       !  configuration of the opa-sas OASIS coupling 
    79                            !  =0 no opa-sas OASIS coupling: default single executable configuration 
    80                            !  =1 opa-sas OASIS coupling: multi executable configuration, OPA component 
    81                            !  =2 opa-sas OASIS coupling: multi executable configuration, SAS component  
    82    ln_apr_dyn  = .false.   !  Patm gradient added in ocean & ice Eqs.   (T => fill namsbc_apr ) 
    83    nn_ice      = 2         !  =0 no ice boundary condition   , 
    84                            !  =1 use observed ice-cover      , 
    85                            !  =2 ice-model used                         ("key_lim3" or "key_lim2") 
    86    nn_ice_embd = 1         !  =0 levitating ice (no mass exchange, concentration/dilution effect) 
    87                            !  =1 levitating ice with mass and salt exchange but no presure effect 
    88                            !  =2 embedded sea-ice (full salt and mass exchanges and pressure) 
    89    ln_dm2dc    = .false.   !  daily mean to diurnal cycle on short wave 
    90    ln_rnf      = .false.   !  runoffs                                   (T   => fill namsbc_rnf) 
    91    nn_isf      = 0         !  ice shelf melting/freezing                (/=0 => fill namsbc_isf) 
    92                            !  0 =no isf                  1 = presence of ISF  
    93                            !  2 = bg03 parametrisation   3 = rnf file for isf    
    94                            !  4 = ISF fwf specified 
    95                            !  option 1 and 4 need ln_isfcav = .true. (domzgr) 
    96    ln_ssr      = .flase.   !  Sea Surface Restoring on T and/or S       (T => fill namsbc_ssr) 
    97    nn_fwb      = 2         !  FreshWater Budget: =0 unchecked 
    98                            !     =1 global mean of e-p-r set to zero at each time step 
    99                            !     =2 annual global mean of e-p-r set to zero 
    100    ln_wave = .false.       !  Activate coupling with wave (either Stokes Drift or Drag coefficient, or both)  (T => fill namsbc_wave) 
    101    ln_cdgw = .false.       !  Neutral drag coefficient read from wave model (T => fill namsbc_wave) 
    102    ln_sdw  = .false.       !  Computation of 3D stokes drift                (T => fill namsbc_wave) 
    103    nn_lsm  = 0             !  =0 land/sea mask for input fields is not applied (keep empty land/sea mask filename field) , 
    104                            !  =1:n number of iterations of land/sea mask application for input fields (fill land/sea mask filename field) 
    105    nn_limflx = -1          !  LIM3 Multi-category heat flux formulation (use -1 if LIM3 is not used) 
    106                            !  =-1  Use per-category fluxes, bypass redistributor, forced mode only, not yet implemented coupled 
    107                            !  = 0  Average per-category fluxes (forced and coupled mode) 
    108                            !  = 1  Average and redistribute per-category fluxes, forced mode only, not yet implemented coupled 
    109                            !  = 2  Redistribute a single flux over categories (coupled mode only) 
    11065/ 
    11166!----------------------------------------------------------------------- 
     
    11671&namtra_qsr    !   penetrative solar radiation 
    11772!----------------------------------------------------------------------- 
    118    ln_qsr_ice  = .true.    !  light penetration for ice-model LIM3 
    11973/ 
    12074!----------------------------------------------------------------------- 
     
    157111&nameos        !   ocean physical parameters 
    158112!----------------------------------------------------------------------- 
    159    ln_useCT    = .false.  ! use of Conservative Temp. ==> surface CT converted in Pot. Temp. in sbcssm 
    160113/ 
    161114!----------------------------------------------------------------------- 
     
    174127&namtra_dmp    !   tracer: T & S newtonian damping 
    175128!----------------------------------------------------------------------- 
    176    ln_tradmp   =  .false.  !  add a damping termn (T) or not (F) 
    177    nn_zdmp     =    0      !  vertical   shape =0    damping throughout the water column 
    178                            !                   =1 no damping in the mixing layer (kz  criteria) 
    179                            !                   =2 no damping in the mixed  layer (rho crieria) 
    180    cn_resto    = 'resto.nc' ! Name of file containing restoration coefficient field (use dmp_tools to create this) 
    181129/ 
    182130!----------------------------------------------------------------------- 
     
    197145   ln_hpg_prj  = .true.    !  s-coordinate (Pressure Jacobian scheme) 
    198146   ln_dynhpg_imp = .false. !  time stepping: semi-implicit time scheme  (T) 
    199                            !           centered      time scheme  (F) 
     147                                 !           centered      time scheme  (F) 
    200148/ 
    201149!----------------------------------------------------------------------- 
  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/CONFIG/ORCA2_LIM3/EXP00/namelist_ice_cfg

    r5352 r5353  
    1010&namiceini     !   ice initialisation 
    1111!----------------------------------------------------------------------- 
    12    ln_iceini      = .true.         !  activate ice initialization (T) or not (F) 
    1312/ 
    1413!----------------------------------------------------------------------- 
  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm

    r5352 r5353  
    1  bld::tool::fppkeys key_trabbl key_lim3 key_vvl key_dynspg_ts key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_diaobs key_asminc key_nosignedzero 
     1 bld::tool::fppkeys key_trabbl key_lim3 key_vvl key_dynspg_ts key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_diaobs key_asminc 
  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/CONFIG/cfg.txt

    r5352 r5353  
    1010ISOMIP OPA_SRC 
    1111GYRE OPA_SRC 
     12ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC 
    1213ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC 
    13 ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC 
    14 ORCA2_SAS_LIM3 OPA_SRC SAS_SRC LIM_SRC_3 NST_SRC 
Note: See TracChangeset for help on using the changeset viewer.