Changeset 424

Timestamp:

2011-08-30T15:13:34+02:00 (13 years ago)

Author:

didier.solyga

Message:

Comment multi-definitions of some physical parameters. The weather module uses the values defined in constantes.f90

File:

• branches/ORCHIDEE_EXT/ORCHIDEE_OL/weather.f90 (modified) (9 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE_OL/weather.f90

@@ -96 +96 @@
 !
 ! Absolute zero
-  REAL,PARAMETER         :: zero_t=273.16
+!!$  REAL,PARAMETER         :: zero_t=273.16
+!>> DS : matches with the value used by ORCHIDEE (see ZeroCelsius in constantes.f90)
+  REAL,PARAMETER         :: zero_t=273.15
+
+!>> DS : 08/2011
+! 
+  REAL,PARAMETER :: pir = pi/180.
+
 !-
 ! Parametres orbitaux:
@@ -211 +218 @@
   REAL :: td(npoi)
   REAL,PARAMETER ::  rair = 287.
-  REAL,PARAMETER :: grav = 9.81
+!>> The two following parameters are replaced by the values used by ORCHIDEE in constantes.f90
+  ! grav by cte_grav= 9.80665
+  ! pi by 4.*ATAN(1.)
+!!$  REAL,PARAMETER :: grav = 9.81
 !!$  REAL,PARAMETER ::  pi = 3.1415927
 !-
@@ -287 +297 @@
 ! define working variables
 !-
-  rwork = (grav/rair/0.0065)
+  rwork = (cte_grav/rair/0.0065)
 !-
 ! 'omega' parameters used to calculate differences in expected
@@ -1006 +1016 @@
 ! local
 !-
-  REAL,PARAMETER :: stef = 5.67051E-8
-  REAL,PARAMETER :: pi = 3.1415927
+!>> DS August 2011 : the two following parameters are replacing by the values used by constantes.f90
+   ! stef is replacing by c_stefan =  5.6697E-8
+   ! pi is replaced by 4.0*ATAN(1.) 
+!!$  REAL,PARAMETER :: stef = 5.67051E-8
+!!$  REAL,PARAMETER :: pi = 3.1415927
+
   REAL,SAVE      :: step
-  REAL,PARAMETER :: pir = pi/180.
+
+!>> DS 08/2011 : pir is global
+!!$  REAL,PARAMETER :: pir = pi/180.
   REAL :: xl,so,xllp,xee,xse
   REAL :: xlam,dlamm,anm,ranm,ranv,anv,tls,rlam
@@ -1130 +1146 @@
 !-- calculate the latitude in radians
 !---
-    xlat = latitude(i)*pi/180.0
+!!$    xlat = latitude(i)*pi/180.0
+    xlat = latitude(i)*pir
 !---
 !-- calculate the cosine of the solar zenith angle
@@ -1333 +1350 @@
 !-- (2) cloud contribution to downward ir radiation flux
 !---
-    fira(i) = (1.-cloud(i))*ea*stef*(ta(i)-dtair)**4 &
- &           +cloud(i)*ec*stef*(ta(i)-dtcloud)**4
+    fira(i) = (1.-cloud(i))*ea*c_stefan*(ta(i)-dtair)**4 &
+ &           +cloud(i)*ec*c_stefan*(ta(i)-dtcloud)**4
   ENDDO
 !-
@@ -1481 +1498 @@
   CHARACTER(LEN=*),INTENT(IN)         :: filename
   REAL,INTENT(IN)                     :: dt_force
-  INTEGER,INTENT(INOUT)                  :: force_id
+  INTEGER,INTENT(INOUT)               :: force_id
   INTEGER,INTENT(IN)                  :: iim, jjm
   REAL,INTENT(IN)                     :: zonal_res,merid_res
@@ -3593 +3610 @@
   REAL rlon2, rlat2
   REAL dist
-  REAL pa, pb, p, pi
+  REAL pa, pb, p
   INTEGER i,j
 !-
-  REAL radius
-  PARAMETER (radius=6371229.)
-!---------------------------------------------------------------------
-  pi = 4.0*ATAN(1.0)
-!-
+!!$  REAL radius
+!!$  PARAMETER (radius=6371229.)
+!---------------------------------------------------------------------
+
   DO j=1,jm
     DO i=1,im
@@ -3607 +3623 @@
       rlon2=rlon(i)
       rlat2=rlat(j)
-      pa = pi/2.0-rlat1*pi/180.0 ! dist. entre pole n et point a
-      pb = pi/2.0-rlat2*pi/180.0 ! dist. entre pole n et point b
-!-----
-      p = (rlon1-rlon2)*pi/180.0 ! angle entre a et b (leurs meridiens)
+!!$      pa = pi/2.0-rlat1*pi/180.0 ! dist. entre pole n et point a
+!!$      pb = pi/2.0-rlat2*pi/180.0 ! dist. entre pole n et point b
+      pa = pi/2.0-rlat1*pir ! dist. entre pole n et point a
+      pb = pi/2.0-rlat2*pir ! dist. entre pole n et point b
+!-----
+!!$      p = (rlon1-rlon2)*pi/180.0 ! angle entre a et b (leurs meridiens)
+      p = (rlon1-rlon2)*pir ! angle entre a et b (leurs meridiens)
 !-----
       dist = ACOS( COS(pa)*COS(pb)+SIN(pa)*SIN(pb)*COS(p))
-      dist = radius*dist
+!!$      dist = radius*dist
+! >> DS 08/2011 : use R_Earth instead of radius
+      dist = R_Earth*dist      
       distance(i,j) = dist
     ENDDO