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 3046 for branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO – NEMO

Ignore:
Timestamp:
2011-11-07T10:25:44+01:00 (13 years ago)
Author:
cbricaud
Message:

add changes from dev_r2787_MERCATOR2_tidalharm in dev_MERCATOR_2011_MERGE

Location:
branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited
4 copied

Legend:

Unmodified
Added
Removed

  • branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step.F90

    r2715 r3046  
    165165      IF( ln_diaptr  )   CALL dia_ptr( kstp )         ! Poleward TRansports diagnostics 
    166166      IF( lk_diaar5  )   CALL dia_ar5( kstp )         ! ar5 diag 
     167      IF( lk_diaharm )   CALL dia_harm( kstp )        ! Tidal harmonic analysis 
    167168                         CALL dia_wri( kstp )         ! ocean model: outputs 
    168169 

  • branches/2011/dev_MERCATOR_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

    r2528 r3046  
    8585   USE diafwb           ! freshwater budget                (dia_fwb routine) 
    8686   USE diahsb           ! heat, salt and volume budgets    (dia_hsb routine) 
     87   USE diaharm 
    8788   USE flo_oce          ! floats variables 
    8889   USE floats           ! floats computation               (flo_stp routine) 
Note: See TracChangeset for help on using the changeset viewer.