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/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90 – 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/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_mfs.F90

    r5836 r6140  
    88 
    99   !!---------------------------------------------------------------------- 
    10    !!   sbc_blk_mfs  : bulk formulation as ocean surface boundary condition 
     10   !!   sbc_blk_mfs   : bulk formulation as ocean surface boundary condition 
    1111   !!                   (forced mode, mfs bulk formulae) 
    12    !!   blk_oce_mfs  : ocean: computes momentum, heat and freshwater fluxes 
     12   !!   blk_oce_mfs   : ocean: computes momentum, heat and freshwater fluxes 
    1313   !!---------------------------------------------------------------------- 
    14    USE oce             ! ocean dynamics and tracers 
    15    USE dom_oce         ! ocean space and time domain 
    16    USE phycst          ! physical constants 
    17    USE fldread         ! read input fields 
    18    USE sbc_oce         ! Surface boundary condition: ocean fields 
    19    USE iom             ! I/O manager library 
    20    USE in_out_manager  ! I/O manager 
    21    USE lib_mpp         ! distribued memory computing library 
    22    USE wrk_nemo        ! work arrays 
    23    USE timing          ! Timing 
    24    USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
    25    USE prtctl          ! Print control 
    26    USE sbcwave,ONLY : cdn_wave !wave module 
     14   USE oce            ! ocean dynamics and tracers 
     15   USE dom_oce        ! ocean space and time domain 
     16   USE phycst         ! physical constants 
     17   USE fldread        ! read input fields 
     18   USE sbc_oce        ! Surface boundary condition: ocean fields 
     19   USE sbcwave  ,ONLY :   cdn_wave !wave module 
     20   ! 
     21   USE iom            ! I/O manager library 
     22   USE in_out_manager ! I/O manager 
     23   USE lib_mpp        ! distribued memory computing library 
     24   USE wrk_nemo       ! work arrays 
     25   USE timing         ! Timing 
     26   USE lbclnk         ! ocean lateral boundary conditions (or mpp link) 
     27   USE prtctl         ! Print control 
    2728 
    2829   IMPLICIT NONE 
    … …  
    4243          
    4344   !! * Substitutions 
    44 #  include "domzgr_substitute.h90" 
    4545#  include "vectopt_loop_substitute.h90" 
    4646   !!---------------------------------------------------------------------- 
    … …  
    4949   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    5050   !!---------------------------------------------------------------------- 
    51  
    5251CONTAINS 
    53  
    5452 
    5553   SUBROUTINE sbc_blk_mfs( kt ) 
Note: See TracChangeset for help on using the changeset viewer.