Changeset 3480 for branches/2012/dev_3352_UKMO8_CICE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

Timestamp:

2012-10-02T11:28:15+02:00 (12 years ago)

Author:

charris

Message:

#953 Removing salinity dependence of freezing point for the moment (will be implemented more completely in NEMO3.6).
Reversed r3356 of /branches/2012/dev_3352_UKMO8_CICE/NEMOGCM

File:

• branches/2012/dev_3352_UKMO8_CICE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) (3 diffs)

branches/2012/dev_3352_UKMO8_CICE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

@@ -678 +678 @@
 
 
-   FUNCTION tfreez( psal, ppress ) RESULT( ptf )
+   FUNCTION tfreez( psal ) RESULT( ptf )
       !!----------------------------------------------------------------------
       !!                 ***  ROUTINE eos_init  ***
@@ -691 +691 @@
       !!----------------------------------------------------------------------
       REAL(wp), DIMENSION(jpi,jpj), INTENT(in   ) ::   psal   ! salinity             [psu]
-      REAL(wp), DIMENSION(jpi,jpj), INTENT(in   ), OPTIONAL ::   ppress ! pressure             [dBar]
       ! Leave result array automatic rather than making explicitly allocated
       REAL(wp), DIMENSION(jpi,jpj)                ::   ptf    ! freezing temperature [Celcius]
@@ -698 +697 @@
       ptf(:,:) = ( - 0.0575_wp + 1.710523e-3_wp * SQRT( psal(:,:) )   &
          &                     - 2.154996e-4_wp *       psal(:,:)   ) * psal(:,:)
-
-      IF( PRESENT(ppress) ) THEN
-         ptf(:,:) = ptf(:,:) - 7.53e-4_wp * ppress(:,:)
-      ENDIF
-
       !
    END FUNCTION tfreez