Changeset 2004 for branches/DEV_r1784_mid_year_merge_2010/NEMO/OFF_SRC/DOM/phycst.F90

Timestamp:

2010-07-09T14:40:45+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 8: Add in changes from the trunk between revisions 1879 and the 3.2.1 tag (rev 1986)

File:

• branches/DEV_r1784_mid_year_merge_2010/NEMO/OFF_SRC/DOM/phycst.F90 (modified) (2 diffs)

branches/DEV_r1784_mid_year_merge_2010/NEMO/OFF_SRC/DOM/phycst.F90

@@ -37 +37 @@
       rtt      = 273.16_wp  ,  &  !: triple point of temperature (Kelvin)
       rt0      = 273.15_wp  ,  &  !: freezing point of water (Kelvin)
-      rau0     = 1020._wp   ,  &  !: volumic mass of reference (kg/m3)
-      rauw     = 1000._wp   ,  &  !: density of pure water (kg/m3)
+      rau0     = 1035._wp   ,  &  !: volumic mass of reference (kg/m3)
       rcp      =    4.e+3_wp,  &  !: ocean specific heat
       ro0cpr                      !: = 1. / ( rau0 * rcp )
@@ -127 +126 @@
       ro0cpr = 1. / ( rau0 * rcp )
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) '          volumic mass of pure water         rauw   = ', rauw, ' kg/m^3'
       IF(lwp) WRITE(numout,*) '          volumic mass of reference          rau0   = ', rau0, ' kg/m^3'
       IF(lwp) WRITE(numout,*) '          ocean specific heat                rcp    = ', rcp