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 5845 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90 – NEMO

Ignore:
Timestamp:
2015-10-31T08:40:45+01:00 (8 years ago)
Author:
gm
Message:

#1613: vvl by default: suppression of domzgr_substitute.h90

File:
1 edited

Legend:

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

    r5836 r5845  
    4040   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   sn0          ! initial salinity 
    4141       
    42    !! * Substitutions 
    43 #  include "domzgr_substitute.h90" 
    4442   !!---------------------------------------------------------------------- 
    4543   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
     
    9997      ztsn(:,:,:,jp_tem) = tsn(:,:,:,jp_tem)                    ! thermosteric ssh 
    10098      ztsn(:,:,:,jp_sal) = sn0(:,:,:) 
    101       CALL eos( ztsn, zrhd, fsdept_n(:,:,:) )                       ! now in situ density using initial salinity 
     99      CALL eos( ztsn, zrhd, gdept_n(:,:,:) )                       ! now in situ density using initial salinity 
    102100      ! 
    103101      zbotpres(:,:) = 0._wp                        ! no atmospheric surface pressure, levitating sea-ice 
    104102      DO jk = 1, jpkm1 
    105          zbotpres(:,:) = zbotpres(:,:) + fse3t(:,:,jk) * zrhd(:,:,jk) 
     103         zbotpres(:,:) = zbotpres(:,:) + e3t_n(:,:,jk) * zrhd(:,:,jk) 
    106104      END DO 
    107105      IF( .NOT.lk_vvl ) THEN 
     
    123121       
    124122      !                                         ! steric sea surface height 
    125       CALL eos( tsn, zrhd, zrhop, fsdept_n(:,:,:) )                 ! now in situ and potential density 
     123      CALL eos( tsn, zrhd, zrhop, gdept_n(:,:,:) )                 ! now in situ and potential density 
    126124      zrhop(:,:,jpk) = 0._wp 
    127125      CALL iom_put( 'rhop', zrhop ) 
     
    129127      zbotpres(:,:) = 0._wp                        ! no atmospheric surface pressure, levitating sea-ice 
    130128      DO jk = 1, jpkm1 
    131          zbotpres(:,:) = zbotpres(:,:) + fse3t(:,:,jk) * zrhd(:,:,jk) 
     129         zbotpres(:,:) = zbotpres(:,:) + e3t_n(:,:,jk) * zrhd(:,:,jk) 
    132130      END DO 
    133131      IF( .NOT.lk_vvl ) THEN 
     
    159157         DO jj = 1, jpj 
    160158            DO ji = 1, jpi 
    161                zztmp = area(ji,jj) * fse3t(ji,jj,jk) 
     159               zztmp = area(ji,jj) * e3t_n(ji,jj,jk) 
    162160               ztemp = ztemp + zztmp * tsn(ji,jj,jk,jp_tem) 
    163161               zsal  = zsal  + zztmp * tsn(ji,jj,jk,jp_sal) 
Note: See TracChangeset for help on using the changeset viewer.