Changeset 1171

Timestamp:

2008-09-10T17:30:28+02:00 (16 years ago)

Author:

ctlod

Message:

now input air temperature data for CORE & CLIO bulks must be in Kelvin, see ticket: #242

Location:

trunk/NEMO

Files:

• LIM_SRC_3/limthd.F90 (modified) (1 diff)
• LIM_SRC_3/limthd_dh.F90 (modified) (1 diff)
• OPA_SRC/SBC/sbcblk_clio.F90 (modified) (4 diffs)

trunk/NEMO/LIM_SRC_3/limthd.F90

@@ -123 +123 @@
       !------------------------------------------------------------------------------!
       zeps = 1.0e-10
-      tatm_ice(:,:) = tatm_ice(:,:) + 273.15 ! convert C to K
 
       !--------------------

trunk/NEMO/LIM_SRC_3/limthd_dh.F90

@@ -275 +275 @@
          qt_s_in(ji,jl) =  qt_s_in(ji,jl) + zqprec(ji) * zdh_s_pre(ji)
          zqt_s(ji)      =  zqt_s(ji) + zqprec(ji) * zdh_s_pre(ji)
-      END DO
-
-      ! Update total snow heat content
-      zqt_s(ji)         =  MAX ( zqt_s(ji) - zqfont_su(ji) , 0.0 ) 
-      IF( lk_mpp ) CALL mpp_max(zqt_s(ji), kcom = ncomm_ice ) 
+         zqt_s(ji)      =  MAX ( zqt_s(ji) - zqfont_su(ji) , 0.0 ) 
+      END DO
+
 
       ! Snow melt due to surface heat imbalance

trunk/NEMO/OPA_SRC/SBC/sbcblk_clio.F90

@@ -295 +295 @@
          DO ji = 1, jpi
             !
-            zsst  = pst(ji,jj)              + rt0           ! converte Celcius to Kelvin the SST and Tair
-            ztatm = sf(jp_tair)%fnow(ji,jj) + rt0           ! and set minimum value far above 0 K (=rt0 over land)
+            zsst  = pst(ji,jj)              + rt0           ! converte Celcius to Kelvin the SST
+            ztatm = sf(jp_tair)%fnow(ji,jj)                 ! and set minimum value far above 0 K (=rt0 over land)
             zcco1 = 1.0 - sf(jp_ccov)%fnow(ji,jj)           ! fraction of clear sky ( 1 - cloud cover)
             zrhoa = zpatm / ( 287.04 * ztatm )              ! air density (equation of state for dry air) 
@@ -495 +495 @@
 !CDIR NOVERRCHK
          DO ji = 1, jpi
-            ztatm (ji,jj) = sf(jp_tair)%fnow(ji,jj) + rt0            ! air temperature in Kelvins 
+            ztatm (ji,jj) = sf(jp_tair)%fnow(ji,jj)                  ! air temperature in Kelvins 
       
             zrhoa(ji,jj) = zpatm / ( 287.04 * ztatm(ji,jj) )         ! air density (equation of state for dry air) 
@@ -703 +703 @@
 !CDIR NOVERRCHK
          DO ji = 1, jpi
-            ztamr = sf(jp_tair)%fnow(ji,jj) + rt0 - rtt
+            ztamr = sf(jp_tair)%fnow(ji,jj) - rtt
             zmt1  = SIGN( 17.269,  ztamr )
             zmt2  = SIGN( 21.875,  ztamr )
             zmt3  = SIGN( 28.200, -ztamr )
             zes = 611.0 * EXP(  ABS( ztamr ) * MIN ( zmt1, zmt2 )   &              ! Saturation water vapour
-               &                     / ( sf(jp_tair)%fnow(ji,jj) + rt0 - 35.86  + MAX( 0.e0, zmt3 ) )  )
+               &                     / ( sf(jp_tair)%fnow(ji,jj) - 35.86  + MAX( 0.e0, zmt3 ) )  )
             zev(ji,jj) = sf(jp_humi)%fnow(ji,jj) * zes * 1.0e-05                   ! vapour pressure  
          END DO
@@ -833 +833 @@
 !CDIR NOVERRCHK
          DO ji = 1, jpi           
-            ztamr = sf(jp_tair)%fnow(ji,jj) + rt0 - rtt           
+            ztamr = sf(jp_tair)%fnow(ji,jj) - rtt           
             zmt1  = SIGN( 17.269,  ztamr )
             zmt2  = SIGN( 21.875,  ztamr )
             zmt3  = SIGN( 28.200, -ztamr )
             zes = 611.0 * EXP(  ABS( ztamr ) * MIN ( zmt1, zmt2 )   &              ! Saturation water vapour
-               &                     / ( sf(jp_tair)%fnow(ji,jj) + rt0 - 35.86  + MAX( 0.e0, zmt3 ) )  )
+               &                     / ( sf(jp_tair)%fnow(ji,jj) - 35.86  + MAX( 0.e0, zmt3 ) )  )
             zev(ji,jj) = sf(jp_humi)%fnow(ji,jj) * zes * 1.0e-05                   ! vapour pressure  
          END DO