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 719 for trunk/NEMO/OPA_SRC/ZDF – NEMO

Changeset 719 for trunk/NEMO/OPA_SRC/ZDF


Ignore:
Timestamp:
2007-10-16T16:59:56+02:00 (17 years ago)
Author:
ctlod
Message:

get back to the nemo_v2_3 version for trunk

Location:
trunk/NEMO/OPA_SRC/ZDF
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMO/OPA_SRC/ZDF/zdf.matrixsolver.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    2525!!---------------------------------------------------------------------- 
    2626!!  OPA 9.0 , LOCEAN-IPSL (2005)  
    27 !! $Id$ 
     27!! $Header$  
    2828!! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    2929!!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/ZDF/zdf_oce.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    66   !!---------------------------------------------------------------------- 
    77   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    8    !! $Id$ 
     8   !! $Header$  
    99   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1010   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/ZDF/zdfbfr.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3737   !!---------------------------------------------------------------------- 
    3838   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    39    !! $Id$ 
     39   !! $Header$  
    4040   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4141   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/ZDF/zdfddm.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    4040   !!---------------------------------------------------------------------- 
    4141   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    42    !! $Id$ 
     42   !! $Header$  
    4343   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4444   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/ZDF/zdfddm_substitute.h90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    77   !!---------------------------------------------------------------------- 
    88   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    9    !! $Id$ 
     9   !! $Header$  
    1010   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    1111   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    2929   !!---------------------------------------------------------------------- 
    3030   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    31    !! $Id$ 
     31   !! $Header$  
    3232   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    3333   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/ZDF/zdfini.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3131   !!---------------------------------------------------------------------- 
    3232   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    33    !! $Id$ 
    34    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    3533   !!---------------------------------------------------------------------- 
    3634    
  • trunk/NEMO/OPA_SRC/ZDF/zdfkpp.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r714 r719  
    2121   USE dom_oce         ! ocean space and time domain 
    2222   USE zdf_oce         ! ocean vertical physics 
    23    USE sbc_oce         ! surface boundary condition: ocean 
    2423   USE phycst          ! physical constants 
     24   USE taumod          ! surface stress 
    2525   USE eosbn2          ! equation of state 
     26   USE ocesbc          ! thermohaline fluxes 
    2627   USE zdfddm          ! double diffusion mixing 
    2728   USE in_out_manager  ! I/O manager 
     
    147148   !!---------------------------------------------------------------------- 
    148149   !!   OPA 9.0 , LOCEAN-IPSL   (2005) 
    149    !! $Id$ 
     150   !! $Header$  
    150151   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    151152   !!---------------------------------------------------------------------- 
     
    459460            zBosol(ji,jj) = grav * zthermal * qsr(ji,jj) 
    460461            ! Non radiative surface buoyancy force 
    461             zBo   (ji,jj) = grav * zthermal * qns(ji,jj) -  grav * zhalin * emp(ji,jj) 
     462            zBo   (ji,jj) = grav * zthermal * ( qt(ji,jj) - qsr(ji,jj) ) -  grav * zhalin * emp(ji,jj) 
    462463            ! Surface Temperature flux for non-local term 
    463             wt0(ji,jj) = - ( qsr(ji,jj) + qns(ji,jj) )* ro0cpr * tmask(ji,jj,1) 
     464            wt0(ji,jj) = - qt(ji,jj) * ro0cpr * tmask(ji,jj,1) 
    464465            ! Surface salinity flux for non-local term 
    465466            ws0(ji,jj) = - ( emp(ji,jj) * sn(ji,jj,1) * rcs ) * tmask(ji,jj,1) 
     
    475476            zrhos         = rhop(ji,jj,1) + zflageos * rau0 * ( 1. - tmask(ji,jj,1) )   
    476477            ! Friction velocity (zustar), at T-point : LMD94 eq. 2 
    477             ztx           = 0.5 * ( utau(ji,jj) + utau(ji - 1, jj    ) ) 
    478             zty           = 0.5 * ( vtau(ji,jj) + vtau(ji    , jj - 1) ) 
     478            ztx           = 0.5 * ( taux(ji,jj) + taux(ji - 1, jj    ) ) 
     479            zty           = 0.5 * ( tauy(ji,jj) + tauy(ji    , jj - 1) ) 
    479480            ztau          = SQRT( ztx * ztx + zty * zty ) 
    480481            zustar(ji,jj) = SQRT( ztau / ( zrhos +  epsln ) ) 
  • trunk/NEMO/OPA_SRC/ZDF/zdfmxl.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    3939   !!---------------------------------------------------------------------- 
    4040   !!   OPA 9.0 , LOCEAN-IPSL (2005)  
    41    !! $Id$ 
     41   !! $Header$  
    4242   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4343   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/ZDF/zdfric.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r699 r719  
    4444   !!---------------------------------------------------------------------- 
    4545   !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    46    !! $Id$ 
     46   !! $Header$  
    4747   !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 
    4848   !!---------------------------------------------------------------------- 
  • trunk/NEMO/OPA_SRC/ZDF/zdftke.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r710 r719  
    3131   USE dom_oce         ! ocean space and time domain 
    3232   USE zdf_oce         ! ocean vertical physics 
    33    USE sbc_oce         ! surface boundary condition: ocean 
    3433   USE phycst          ! physical constants 
     34   USE taumod          ! surface stress 
    3535   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
    3636   USE prtctl          ! Print control 
     
    8181   !!---------------------------------------------------------------------- 
    8282   !!   OPA 9.0 , LOCEAN-IPSL (2006)  
    83    !! $Id$ 
     83   !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/ZDF/zdftke.F90,v 1.16 2007/06/05 10:39:27 opalod Exp $  
    8484   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
    8585   !!---------------------------------------------------------------------- 
     
    101101      !!                  - ediss / emxl en**(2/3)        ! dissipation 
    102102      !!      with the boundary conditions: 
    103       !!         surface: en = max( emin0,ebb sqrt(utau^2 + vtau^2) ) 
     103      !!         surface: en = max( emin0,ebb sqrt(taux^2 + tauy^2) ) 
    104104      !!         bottom : en = emin 
    105105      !!      -1- The dissipation and mixing turbulent lengh scales are computed 
     
    301301      ! 2. Surface boundary condition on tke and its eddy viscosity (zmxlm) 
    302302      ! ------------------------------------------------- 
    303       ! en(1)   = ebb sqrt(utau^2+vtau^2) / rau0  (min value emin0) 
     303      ! en(1)   = ebb sqrt(taux^2+tauy^2) / rau0  (min value emin0) 
    304304      ! zmxlm(1) = avmb(1) and zmxlm(jpk) = 0. 
    305305!CDIR NOVERRCHK 
     
    307307!CDIR NOVERRCHK 
    308308         DO ji = fs_2, fs_jpim1   ! vector opt. 
    309             ztx2 = utau(ji-1,jj  ) + utau(ji,jj) 
    310             zty2 = vtau(ji  ,jj-1) + vtau(ji,jj) 
     309            ztx2 = taux(ji-1,jj  ) + taux(ji,jj) 
     310            zty2 = tauy(ji  ,jj-1) + tauy(ji,jj) 
    311311            zesurf = zbbrau * SQRT( ztx2 * ztx2 + zty2 * zty2 ) 
    312312            en (ji,jj,1) = MAX( zesurf, emin0 ) * tmask(ji,jj,1) 
  • trunk/NEMO/OPA_SRC/ZDF/zdftke_jki.F90

    • Property svn:keywords changed from Id to Author Date Id Revision
    r710 r719  
    2020   USE dom_oce         ! ocean space and time domain 
    2121   USE zdf_oce         ! ocean vertical physics 
    22    USE sbc_oce         ! surface boundary condition: ocean 
    2322   USE zdftke          ! ??? 
    24    USE phycst          ! physical constants 
    2523   USE in_out_manager  ! I/O manager 
    2624   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
     25   USE phycst          ! physical constants 
     26   USE taumod          ! surface stress 
    2727   USE prtctl          ! Print control 
    2828   USE restart         ! only for lrst_oce 
     
    5757      !!                  - ediss / emxl en**(2/3)        ! dissipation 
    5858      !!      with the boundary conditions: 
    59       !!         surface: en = max( emin0,ebb sqrt(utau^2 + vtau^2) ) 
     59      !!         surface: en = max( emin0,ebb sqrt(taux^2 + tauy^2) ) 
    6060      !!         bottom : en = emin 
    6161      !!      -1- The dissipation and mixing turbulent lengh scales are computed 
     
    124124      !!-------------------------------------------------------------------- 
    125125      !!  OPA 9.0 , LOCEAN-IPSL (2005)  
    126       !! $Id$ 
     126      !! $Header$  
    127127      !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    128128      !!-------------------------------------------------------------------- 
     
    253253         ! 2. Surface boundary condition on tke and its eddy viscosity (zmxlm) 
    254254         ! ------------------------------------------------- 
    255          ! en(1)   = ebb sqrt(utau^2+vtau^2) / rau0  (min value emin0) 
     255         ! en(1)   = ebb sqrt(taux^2+tauy^2) / rau0  (min value emin0) 
    256256         ! zmxlm(1) = avmb(1) and zmxlm(jpk) = 0. 
    257257!CDIR NOVERRCHK 
    258258         DO ji = 2, jpim1 
    259             ztx2 = utau(ji-1,jj  ) + utau(ji,jj) 
    260             zty2 = vtau(ji  ,jj-1) + vtau(ji,jj) 
     259            ztx2 = taux(ji-1,jj  ) + taux(ji,jj) 
     260            zty2 = tauy(ji  ,jj-1) + tauy(ji,jj) 
    261261            zesurf = zbbrau * SQRT( ztx2 * ztx2 + zty2 * zty2 ) 
    262262            en (ji,jj,1) = MAX( zesurf, emin0 ) * tmask(ji,jj,1) 
Note: See TracChangeset for help on using the changeset viewer.