Changeset 523

Timestamp:

May 17, 2004, 12:12:25 PM (21 years ago)

Author:

lmdzadmin

Message:

Dernieres modifs (ha, ha) sur le tag IPSL-CM4_IPCC, MED & JLD:

• avant 1930 on force la lecture des sulfates naturels
• bug de debordement de tableau dans physiq.F
• taucalv passe à 10 ans

LF

Location:

LMDZ.3.3/branches/rel-LF/libf/phylmd

Files:

• conf_phys.F90 (modified) (1 diff)
• physiq.F (modified) (1 diff)
• readsulfate.F (modified) (2 diffs)

LMDZ.3.3/branches/rel-LF/libf/phylmd/conf_phys.F90

@@ -629 +629 @@
 !Config Key  = tau_calv
 !Config Desc = temps de relaxation pour fonte des glaciers en jours
-!Config Def  = 1 an 
-!Config Help = 
-!
-  tau_calv = 360.
+!Config Def  = 10 ans 
+!Config Help = 
+!
+  tau_calv = 360.*10.
   call getin('tau_calv',tau_calv)
 

LMDZ.3.3/branches/rel-LF/libf/phylmd/physiq.F

@@ -992 +992 @@
 c======================================================================
 cIM BEG
-        DO k=1, nlev
+        DO k=1, nlevENS
           DO l=1, nlevSTD
 c

LMDZ.3.3/branches/rel-LF/libf/phylmd/readsulfate.F

@@ -100 +100 @@
       ENDDO
 
+      IF (iyr .lt. 1930) THEN
+         WRITE(*,*) 'iyr=', iyr
+         cyear='.nat'
+         CALL getso4fromfile(cyear, so4_1)
+      ELSE
+
       ! Read in data:
       ! a) from actual 10-yr-period
@@ -124 +130 @@
       CALL getso4fromfile(cyear, so4_2)
          
+      ENDIF
+        
       ! Interpolate linarily to the actual year:
       DO it=1,12