Changeset 1279 for LMDZ4/trunk/libf/phylmd/phyredem.F

Timestamp:

Dec 10, 2009, 10:02:56 AM (14 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/phyredem.F (modified) (6 diffs)

LMDZ4/trunk/libf/phylmd/phyredem.F

@@ -12 +12 @@
       USE phys_state_var_mod
       USE iostart
+      USE traclmdz_mod, ONLY : traclmdz_to_restart
+      USE infotrac
 
       IMPLICIT none
@@ -42 +44 @@
       REAL agesno(klon,nbsrf)
       REAL run_off_lic_0(klon)
+      REAL trs(klon,nbtr)
 c
       INTEGER nid, nvarid, idim1, idim2, idim3
@@ -52 +55 @@
       CHARACTER (len=7) :: str7
       CHARACTER (len=2) :: str2
-
+      INTEGER           :: it, iiq
+      
 c======================================================================
 c 
@@ -70 +74 @@
          tab_cntrl(ierr) = 0.0
       ENDDO
-      tab_cntrl(1) = dtime
+CC      tab_cntrl(1) = dtime
       tab_cntrl(2) = radpas
+c co2_ppm : current value of atmospheric CO2
       tab_cntrl(3) = co2_ppm
       tab_cntrl(4) = solaire
@@ -86 +91 @@
       tab_cntrl(14) = annee_ref
       tab_cntrl(15) = itau_phy
+
+c co2_ppm0 : initial value of atmospheric CO2
+      tab_cntrl(16) = co2_ppm0
 c
       CALL put_var("controle","Parametres de controle",tab_cntrl)
@@ -311 +319 @@
       CALL put_field("WAKE_FIP","",wake_fip)
 
+
+! trs from traclmdz_mod
+      IF (type_trac == 'lmdz') THEN
+         CALL traclmdz_to_restart(trs)
+         DO it=1,nbtr
+            iiq=niadv(it+2)
+            CALL put_field("trs_"//tname(iiq),"",trs(:,it))
+         END DO
+      END IF
+
       CALL close_restartphy
 !$OMP BARRIER