Changeset 8220


Ignore:
Timestamp:
2017-06-26T18:17:34+02:00 (5 months ago)
Author:
Tomas Lovato
Message:

3.6 stable: reinstate substitute variables in diaar5.F90 to compute tnpeo (#1884)

The substitute variables were replaced with the static ones in r8077,
but it produces a compilation error when key_vvl is not used.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90

    r8187 r8220  
    212212                  DO ji = 1, jpi 
    213213                     IF( rn2(ji,jj,jk) > 0._wp ) THEN 
    214                         zrw =   ( gdepw_n(ji,jj,jk  ) - gdept_n(ji,jj,jk) )   & 
    215                            &  / ( gdept_n(ji,jj,jk-1) - gdept_n(ji,jj,jk) ) 
     214                        zrw =   ( fsdepw(ji,jj,jk  ) - fsdept(ji,jj,jk) )   & 
     215                           &  / ( fsdept(ji,jj,jk-1) - fsdept(ji,jj,jk) ) 
    216216                        ! 
    217217                        zaw = rab_n(ji,jj,jk,jp_tem) * (1. - zrw) + rab_n(ji,jj,jk-1,jp_tem)* zrw 
     
    229229               DO ji = 1, jpi 
    230230                  DO jj = 1, jpj 
    231                      zpe(ji,jj) = zpe(ji,jj) + avt(ji, jj, jk) * MIN(0._wp,rn2(ji, jj, jk)) * rau0 * e3w_n(ji, jj, jk) 
     231                     zpe(ji,jj) = zpe(ji,jj) + avt(ji, jj, jk) * MIN(0._wp,rn2(ji, jj, jk)) * rau0 * fse3w(ji, jj, jk) 
    232232                  END DO 
    233233               END DO 
Note: See TracChangeset for help on using the changeset viewer.