Changeset 828 for branches/dev_002_LIM/NEMO/OPA_SRC/phycst.F90

Timestamp:

2008-03-06T17:16:27+01:00 (16 years ago)

Author:

rblod

Message:

Complete previous commit in correcting a few compilation bugs, see ticket #71

File:

• branches/dev_002_LIM/NEMO/OPA_SRC/phycst.F90 (modified) (3 diffs)

branches/dev_002_LIM/NEMO/OPA_SRC/phycst.F90

@@ -49 +49 @@
       rt0_snow = 273.16_wp  ,  &  !: melting point of snow  (Kelvin)
       rt0_ice  = 273.16_wp  ,  &  !: melting point of ice   (Kelvin)
-#elif defined key_lim2
+#else
       rt0_snow = 273.15_wp  ,  &  !: melting point of snow  (Kelvin)
       rt0_ice  = 273.05_wp  ,  &  !: melting point of ice   (Kelvin)
@@ -68 +68 @@
       rhoic   = 917._wp       ,   &  !: density of sea ice (kg/m3)
       tmut    =   0.054       ,   &  !: decrease of seawater meltpoint with salinity
-#elif defined key_lim2
+#else
       rcdsn   =   0.22_wp     ,   &  !: conductivity of the snow
       rcdic   =   2.034396_wp ,   &  !: conductivity of the ice
@@ -189 +189 @@
          WRITE(numout,*) '          latent heat of fusion of fresh ice / snow = ', lfus    , ' J/kg'
          WRITE(numout,*) '          latent heat of subl.  of fresh ice / snow = ', lsub    , ' J/kg'
-#elif defined key_lim2
+#else
          WRITE(numout,*) '          density times specific heat for snow      = ', rcpsn   , ' J/m^3/K' 
          WRITE(numout,*) '          density times specific heat for ice       = ', rcpic   , ' J/m^3/K'