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 3396 for branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 – NEMO

Ignore:
Timestamp:
2012-05-17T18:33:12+02:00 (12 years ago)
Author:
acc
Message:

Branch: dev_r3385_NOCS04_HAMF; #665. Stage 1 of 2012 development: porting of changes on old development branch (2011/DEV_r1837_mass_heat_salt_fluxes) into new branch. Corrected a few errors on the way. This branch now compiles but is incomplete. Still missing LIM3 changes which must reside on a certain persons laptop somewhere

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

    r3294 r3396  
    121121      REAL(wp) ::   zd , zc , zaw, za    !   -      - 
    122122      REAL(wp) ::   zb1, za1, zkw, zk0   !   -      - 
    123       REAL(wp) ::   zrau0r               !   -      - 
    124123      REAL(wp), POINTER, DIMENSION(:,:,:) :: zws 
    125124      !!---------------------------------------------------------------------- 
     
    133132      ! 
    134133      CASE( 0 )                !==  Jackett and McDougall (1994) formulation  ==! 
    135          zrau0r = 1.e0 / rau0 
    136134!CDIR NOVERRCHK 
    137135         zws(:,:,:) = SQRT( ABS( pts(:,:,:,jp_sal) ) ) 
     
    174172                  ! masked in situ density anomaly 
    175173                  prd(ji,jj,jk) = (  zrhop / (  1.0_wp - zh / ( zk0 - zh * ( za - zh * zb ) )  )    & 
    176                      &             - rau0  ) * zrau0r * tmask(ji,jj,jk) 
     174                     &             - rau0  ) * r1_rau0 * tmask(ji,jj,jk) 
    177175               END DO 
    178176            END DO 
     
    254252      INTEGER  ::   ji, jj, jk   ! dummy loop indices 
    255253      REAL(wp) ::   zt, zs, zh, zsr, zr1, zr2, zr3, zr4, zrhop, ze, zbw   ! local scalars 
    256       REAL(wp) ::   zb, zd, zc, zaw, za, zb1, za1, zkw, zk0, zrau0r       !   -      - 
     254      REAL(wp) ::   zb, zd, zc, zaw, za, zb1, za1, zkw, zk0               !   -      - 
    257255      REAL(wp), POINTER, DIMENSION(:,:,:) :: zws 
    258256      !!---------------------------------------------------------------------- 
     
    265263      ! 
    266264      CASE( 0 )                !==  Jackett and McDougall (1994) formulation  ==! 
    267          zrau0r = 1.e0 / rau0 
    268265!CDIR NOVERRCHK 
    269266         zws(:,:,:) = SQRT( ABS( pts(:,:,:,jp_sal) ) ) 
     
    309306                  ! masked in situ density anomaly 
    310307                  prd(ji,jj,jk) = (  zrhop / (  1.0_wp - zh / ( zk0 - zh * ( za - zh * zb ) )  )    & 
    311                      &             - rau0  ) * zrau0r * tmask(ji,jj,jk) 
     308                     &             - rau0  ) * r1_rau0 * tmask(ji,jj,jk) 
    312309               END DO 
    313310            END DO 
Note: See TracChangeset for help on using the changeset viewer.