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 4292 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/LDF – NEMO

Ignore:
Timestamp:
2013-11-20T17:28:04+01:00 (10 years ago)
Author:
cetlod
Message:

dev_MERGE_2013 : 1st step of the merge, see ticket #1185

Location:
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/LDF
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90

    r4147 r4292  
    191191      !!---------------------------------------------------------------------- 
    192192 
    193       zm00 = TANH( ( pdam - gdept_0(1    ) ) / pwam ) 
    194       zm01 = TANH( ( pdam - gdept_0(jpkm1) ) / pwam ) 
     193      zm00 = TANH( ( pdam - gdept_1d(1    ) ) / pwam ) 
     194      zm01 = TANH( ( pdam - gdept_1d(jpkm1) ) / pwam ) 
    195195      zmhs = zm00 / zm01 
    196196      zmhb = ( 1.e0 - pbot ) / ( 1.e0 - zmhs ) / zm01 
    … …  
    232232      !!---------------------------------------------------------------------- 
    233233 
    234       zm00 = TANH( ( pdam - gdept_0(1    ) ) / pwam ) 
    235       zm01 = TANH( ( pdam - gdept_0(jpkm1) ) / pwam ) 
     234      zm00 = TANH( ( pdam - gdept_1d(1    ) ) / pwam ) 
     235      zm01 = TANH( ( pdam - gdept_1d(jpkm1) ) / pwam ) 
    236236      zmhs = zm00 / zm01 
    237237      zmhb = ( 1.e0 - pbot ) / ( 1.e0 - zmhs ) / zm01 
    … …  
    274274      !!---------------------------------------------------------------------- 
    275275 
    276       zm00 = TANH( ( pdam - gdept_0(1    ) ) / pwam )    
    277       zm01 = TANH( ( pdam - gdept_0(jpkm1) ) / pwam ) 
     276      zm00 = TANH( ( pdam - gdept_1d(1    ) ) / pwam )    
     277      zm01 = TANH( ( pdam - gdept_1d(jpkm1) ) / pwam ) 
    278278      zmhs = zm00 / zm01 
    279279      zmhb = ( 1.e0 - pbot ) / ( 1.e0 - zmhs ) / zm01 

  • branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90

    r3294 r4292  
    386386 
    387387      DO jk=1, jpk 
    388          zcoef(jk) = 1.0_wp + NINT(9.0_wp*(gdept_0(jk)-800.0_wp)/(3000.0_wp-800.0_wp)) 
     388         zcoef(jk) = 1.0_wp + NINT(9.0_wp*(gdept_1d(jk)-800.0_wp)/(3000.0_wp-800.0_wp)) 
    389389         zcoef(jk) = MIN(10.0_wp, MAX(1.0_wp, zcoef(jk))) 
    390390         IF(lwp) WRITE(numout,'(4x,i3,6x,f7.3)') jk,zcoef(jk) 
Note: See TracChangeset for help on using the changeset viewer.