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 6504 – NEMO

Changeset 6504


Ignore:
Timestamp:
2016-05-01T16:19:48+02:00 (7 years ago)
Author:
gm
Message:

#1687 - trunk: correct an error in the EOS-80 freezing point

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

    r6489 r6504  
    678678   END SUBROUTINE rab_3d 
    679679 
     680 
    680681   SUBROUTINE rab_2d( pts, pdep, pab ) 
    681682      !!---------------------------------------------------------------------- 
     
    10201021      SELECT CASE ( neos ) 
    10211022      ! 
    1022       CASE ( np_teos10, np_eos80 )                !==  CT,SA (TEOS-10 formulation) ==! 
     1023      CASE ( np_teos10, np_seos )      !==  CT,SA (TEOS-10 and S-EOS formulations) ==! 
    10231024         ! 
    10241025         DO jj = 1, jpj 
     
    10331034         IF( PRESENT( pdep ) )   ptf(:,:) = ptf(:,:) - 7.53e-4 * pdep(:,:) 
    10341035         ! 
    1035       CASE ( np_seos )                     !==  PT,SP (UNESCO formulation)  ==! 
     1036      CASE ( np_eos80 )                !==  PT,SP (UNESCO formulation)  ==! 
    10361037         ! 
    10371038         ptf(:,:) = ( - 0.0575_wp + 1.710523e-3_wp * SQRT( psal(:,:) )   & 
     
    10491050  END SUBROUTINE eos_fzp_2d 
    10501051 
     1052 
    10511053  SUBROUTINE eos_fzp_0d( psal, ptf, pdep ) 
    10521054      !!---------------------------------------------------------------------- 
     
    10701072      SELECT CASE ( neos ) 
    10711073      ! 
    1072       CASE ( np_teos10, np_eos80 )                !==  CT,SA (TEOS-10 formulation) ==! 
     1074      CASE ( np_teos10, np_seos )      !==  CT,SA (TEOS-10 and S-EOS formulations) ==! 
    10731075         ! 
    10741076         zs  = SQRT( ABS( psal ) * r1_S0 )           ! square root salinity 
     
    10791081         IF( PRESENT( pdep ) )   ptf = ptf - 7.53e-4 * pdep 
    10801082         ! 
    1081       CASE ( np_seos )                     !==  PT,SP (UNESCO formulation)  ==! 
     1083      CASE ( np_eos80 )                !==  PT,SP (UNESCO formulation)  ==! 
    10821084         ! 
    10831085         ptf = ( - 0.0575_wp + 1.710523e-3_wp * SQRT( psal )   & 
Note: See TracChangeset for help on using the changeset viewer.