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 12184 for NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step_oce.F90 – NEMO

Ignore:
Timestamp:
2019-12-11T14:35:26+01:00 (4 years ago)
Author:
smueller
Message:

Merging of the developments in /NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis@12122 with respect to /NEMO/trunk@12072 into /NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (tickets #2175 and #2194)

Location:
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019

    • Property svn:externals
      •  

        old new  
        22^/utils/build/makenemo@HEAD   makenemo 
        33^/utils/build/mk@HEAD         mk 
        4 ^/utils/tools@HEAD            tools 
         4^/utils/tools_dev_r11751_ENHANCE-05_SimonM-Harmonic_Analysis@HEAD tools 
        55^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step_oce.F90

    r12166 r12184  
    1919   USE sbccpl          ! surface boundary condition: coupled formulation (call send at end of step) 
    2020   USE sbcapr          ! surface boundary condition: atmospheric pressure 
    21    USE sbctide         ! Tide initialisation 
     21   USE tide_mod, ONLY : ln_tide, tide_update 
    2222   USE sbcwave         ! Wave intialisation 
    2323 
     
    8383   USE diahth          ! thermocline depth                (dia_hth routine) 
    8484   USE diahsb          ! heat, salt and volume budgets    (dia_hsb routine) 
    85    USE diaharm 
    8685   USE diacfl 
    8786   USE diaobs          ! Observation operator 
     87   USE diadetide       ! Weights computation for daily detiding of model diagnostics 
     88   USE diamlr          ! IOM context management for multiple-linear-regression analysis 
    8889   USE flo_oce         ! floats variables 
    8990   USE floats          ! floats computation               (flo_stp routine) 
Note: See TracChangeset for help on using the changeset viewer.