Changeset 6504 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

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:

• trunk/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) (6 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

@@ -678 +678 @@
    END SUBROUTINE rab_3d
 
+
    SUBROUTINE rab_2d( pts, pdep, pab )
       !!----------------------------------------------------------------------
@@ -1020 +1021 @@
       SELECT CASE ( neos )
       !
-      CASE ( np_teos10, np_eos80 )                !==  CT,SA (TEOS-10 formulation) ==!
+      CASE ( np_teos10, np_seos )      !==  CT,SA (TEOS-10 and S-EOS formulations) ==!
          !
          DO jj = 1, jpj
@@ -1033 +1034 @@
          IF( PRESENT( pdep ) )   ptf(:,:) = ptf(:,:) - 7.53e-4 * pdep(:,:)
          !
-      CASE ( np_seos )                     !==  PT,SP (UNESCO formulation)  ==!
+      CASE ( np_eos80 )                !==  PT,SP (UNESCO formulation)  ==!
          !
          ptf(:,:) = ( - 0.0575_wp + 1.710523e-3_wp * SQRT( psal(:,:) )   &
@@ -1049 +1050 @@
   END SUBROUTINE eos_fzp_2d
 
+
   SUBROUTINE eos_fzp_0d( psal, ptf, pdep )
       !!----------------------------------------------------------------------
@@ -1070 +1072 @@
       SELECT CASE ( neos )
       !
-      CASE ( np_teos10, np_eos80 )                !==  CT,SA (TEOS-10 formulation) ==!
+      CASE ( np_teos10, np_seos )      !==  CT,SA (TEOS-10 and S-EOS formulations) ==!
          !
          zs  = SQRT( ABS( psal ) * r1_S0 )           ! square root salinity
@@ -1079 +1081 @@
          IF( PRESENT( pdep ) )   ptf = ptf - 7.53e-4 * pdep
          !
-      CASE ( np_seos )                     !==  PT,SP (UNESCO formulation)  ==!
+      CASE ( np_eos80 )                !==  PT,SP (UNESCO formulation)  ==!
          !
          ptf = ( - 0.0575_wp + 1.710523e-3_wp * SQRT( psal )   &