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 1221 – NEMO

Changeset 1221


Ignore:
Timestamp:
2008-10-31T14:48:31+01:00 (15 years ago)
Author:
ctlod
Message:

correct compilation errors when using key_c1d cpp key, see ticket: #274

Location:
trunk/NEMO
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMO/C1D_SRC/diawri_c1d.F90

    r1146 r1221  
    229229         CALL histdef( nid_T, "votkeend", "TKE: Turbulent kinetic energy"       , "m2/s"   ,   &  ! TKE 
    230230            &          jpi, jpj, nh_T, ipk, 1, ipk, nz_T, 32, clop, zsto, zout ) 
     231         CALL histdef( nid_T, "sotkehlc", "TKE: Langmuir Circulation depth"     , "m"      ,   &  ! hlc 
     232            &          jpi, jpj, nh_T, 1  , 1, 1  , -99 , 32, clop, zsto, zout ) 
    231233#endif 
    232234#if defined key_zdfkpp 
     
    322324      CALL histwrite( nid_T, "votlsric", it, e_ric         , ndim_T , ndex_T )    ! local Richardson number 
    323325      CALL histwrite( nid_T, "votkeend", it, en            , ndim_T , ndex_T )    ! TKE 
     326      CALL histwrite( nid_T, "sotkehlc", it, hlc           , ndim_hT, ndex_hT )   ! TKE Langmuir Circulation depth 
    324327#endif 
    325328#if defined key_zdfkpp 
  • trunk/NEMO/C1D_SRC/step_c1d.F90

    r1164 r1221  
    3838   USE eosbn2          ! equation of state                (eos_bn2 routine) 
    3939 
    40    USE dyncor1d        ! Coriolis term (c1d case)         (dyn_cor_1d     ) 
     40   USE dyncor_c1d      ! Coriolis term (c1d case)         (dyn_cor_1d     ) 
    4141   USE dynzdf          ! vertical diffusion               (dyn_zdf routine) 
    42    USE dynnxt1d        ! time-stepping                    (dyn_nxt routine) 
     42   USE dynnxt_c1d      ! time-stepping                    (dyn_nxt routine) 
     43   USE diawri_c1d      ! write outputs                (dia_wri_c1d routine) 
    4344 
    4445   USE zdfbfr          ! bottom friction                  (zdf_bfr routine) 
     
    165166                             CALL tra_sbc    ( kstp )        ! surface boundary condition 
    166167      IF( ln_traqsr      )   CALL tra_qsr    ( kstp )        ! penetrative solar radiation qsr 
    167                              CALL tra_adv    ( kstp )        ! horizontal & vertical advection 
    168168      IF( lk_zdfkpp )        CALL tra_kpp    ( kstp )        ! KPP non-local tracer fluxes 
    169169                             CALL tra_zdf    ( kstp )        ! vertical mixing 
     
    180180                               va(:,:,:) = 0.e0 
    181181 
    182                                CALL dyn_vor_c1d( kstp )       ! vorticity term including Coriolis 
     182                               CALL dyn_cor_c1d( kstp )       ! vorticity term including Coriolis 
    183183                               CALL dyn_zdf    ( kstp )       ! vertical diffusion 
    184184                               CALL dyn_nxt_c1d( kstp )       ! lateral velocity at next time step 
  • trunk/NEMO/OPA_SRC/ZDF/zdftke.F90

    r1201 r1221  
    6262   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   e_dis, e_mix        !: dissipation and mixing turbulent lengh scales 
    6363   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   e_pdl, e_ric        !: prandl and local Richardson numbers 
     64   REAL(wp), PUBLIC, DIMENSION(jpi,jpj)     ::   hlc                 !: save finite Langmuir Circulation depth 
    6465#endif 
    6566 
Note: See TracChangeset for help on using the changeset viewer.