Changeset 2669 for LMDZ5/branches/testing/libf/phylmd/phyetat0.F90

Timestamp:

Oct 14, 2016, 2:57:28 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2640:2664 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phyetat0.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/phyetat0.F90

@@ -3 +3 @@
 SUBROUTINE phyetat0 (fichnom, clesphy0, tabcntr0)
 
-  USE dimphy, only: klon, zmasq, klev, nslay
+  USE dimphy, only: klon, zmasq, klev
   USE iophy, ONLY : init_iophy_new
   USE ocean_cpl_mod,    ONLY : ocean_cpl_init
@@ -25 +25 @@
   USE carbon_cycle_mod, ONLY : carbon_cycle_tr, carbon_cycle_cpl, co2_send
   USE indice_sol_mod, only: nbsrf, is_ter, epsfra, is_lic, is_oce, is_sic
-  USE ocean_slab_mod, ONLY: tslab, seaice, tice, ocean_slab_init
+  USE ocean_slab_mod, ONLY: nslay, tslab, seaice, tice, ocean_slab_init
   USE time_phylmdz_mod, ONLY: init_iteration, pdtphys, itau_phy
 
@@ -443 +443 @@
   IF ( type_ocean == 'slab' ) THEN
       CALL ocean_slab_init(dtime, pctsrf)
-      found=phyetat0_get(nslay,tslab,"tslab","tslab",0.)
+      IF (nslay.EQ.1) THEN
+        found=phyetat0_get(1,tslab,"tslab01","tslab",0.)
+        IF (.NOT. found) THEN
+            found=phyetat0_get(1,tslab,"tslab","tslab",0.)
+        END IF
+      ELSE
+          DO i=1,nslay
+            WRITE(str2,'(i2.2)') i
+            found=phyetat0_get(1,tslab(:,i),"tslab"//str2,"tslab",0.)  
+          END DO
+      END IF
       IF (.NOT. found) THEN 
           PRINT*, "phyetat0: Le champ <tslab> est absent"
@@ -453 +463 @@
 
       ! Sea ice variables
-      found=phyetat0_get(1,tice,"slab_tice","slab_tice",0.)
       IF (version_ocean == 'sicINT') THEN
+          found=phyetat0_get(1,tice,"slab_tice","slab_tice",0.)
           IF (.NOT. found) THEN 
               PRINT*, "phyetat0: Le champ <tice> est absent"
@@ -460 +470 @@
                   tice(:)=ftsol(:,is_sic)
           END IF 
+          found=phyetat0_get(1,seaice,"seaice","seaice",0.)
           IF (.NOT. found) THEN
               PRINT*, "phyetat0: Le champ <seaice> est absent"