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 6140 for trunk/DOC/TexFiles/Namelist/namsbc_apr – NEMO

Ignore:
Timestamp:
2015-12-21T12:35:23+01:00 (8 years ago)
Author:
timgraham
Message:

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

In working copy run:
svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/DOC/TexFiles/Namelist/namsbc_apr

    r4230 r6140  
    11!----------------------------------------------------------------------- 
    2 &namsbc_apr    !   Atmospheric pressure used as ocean forcing or in bulk 
     2&namsbc_apr    !   Atmospheric pressure forcing (in ocean or bulk)      (ln_apr_dyn=T) 
    33!----------------------------------------------------------------------- 
    4 !              ! file name ! frequency (hours) ! variable ! time interpol. !  clim   ! 'yearly'/ ! weights  ! rotation ! land/sea mask ! 
    5 !              !           !  (if <0  months)  !   name   !    (logical)   !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      ! 
    6    sn_apr      = 'patm'    ,         -1        ,'somslpre',    .true.      , .true. , 'yearly'  ,  ''      ,   ''     , '' 
     4!              !  file name ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask ! 
     5!              !            !  (if <0  months)  !   name    !  (logical)   !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      ! 
     6   sn_apr      = 'patm'     ,         -1        ,'somslpre',    .true.     , .true. , 'yearly'  ,  ''      ,   ''     , '' 
    77 
    88   cn_dir      = './'       !  root directory for the location of the bulk files 
    9    rn_pref     = 101000._wp !  reference atmospheric pressure   [N/m2]/ 
     9   rn_pref     = 101000.    !  reference atmospheric pressure   [N/m2]/ 
    1010   ln_ref_apr  = .false.    !  ref. pressure: global mean Patm (T) or a constant (F) 
    1111   ln_apr_obc  = .false.    !  inverse barometer added to OBC ssh data 
Note: See TracChangeset for help on using the changeset viewer.