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

Timestamp:

Jun 25, 2014, 5:43:19 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2054:2070 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -3 +3 @@
 SUBROUTINE phyetat0 (fichnom, clesphy0, tabcntr0)
 
-  USE dimphy, only: klon, zmasq, klev
+  USE dimphy, only: klon, zmasq, klev, nslay
   USE iophy, ONLY : init_iophy_new
   USE ocean_cpl_mod,    ONLY : ocean_cpl_init
@@ -15 +15 @@
        solsw, t_ancien, u_ancien, v_ancien, w01, wake_cstar, wake_deltaq, &
        wake_deltat, wake_fip, wake_pe, wake_s, zgam, zmax0, zmea, zpic, zsig, &
-       zstd, zthe, zval
+       zstd, zthe, zval, ale_bl, ale_bl_trig, alp_bl
   USE iostart, ONLY : close_startphy, get_field, get_var, open_startphy
   USE infotrac, only: nbtr, type_trac, tname, niadv
@@ -21 +21 @@
   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, ocean_slab_init
 
   IMPLICIT none
@@ -40 +41 @@
 
   REAL tsoil(klon, nsoilmx, nbsrf)
-  REAL tslab(klon), seaice(klon)
   REAL qsurf(klon, nbsrf)
   REAL qsol(klon)
@@ -997 +997 @@
   PRINT*, '(ecart-type) detr_therm:', xmin, xmax
 
+  CALL get_field("ALE_BL", ale_bl, found)
+  IF (.NOT. found) THEN
+     PRINT*, "phyetat0: Le champ <ale_bl> est absent"
+     PRINT*, "Depart legerement fausse. Mais je continue"
+     ale_bl=0.
+  ENDIF
+  xmin = 1.0E+20
+  xmax = -1.0E+20
+  xmin = MINval(ale_bl)
+  xmax = MAXval(ale_bl)
+  PRINT*, '(ecart-type) ale_bl:', xmin, xmax
+
+  CALL get_field("ALE_BL_TRIG", ale_bl_trig, found)
+  IF (.NOT. found) THEN
+     PRINT*, "phyetat0: Le champ <ale_bl_trig> est absent"
+     PRINT*, "Depart legerement fausse. Mais je continue"
+     ale_bl_trig=0.
+  ENDIF
+  xmin = 1.0E+20
+  xmax = -1.0E+20
+  xmin = MINval(ale_bl_trig)
+  xmax = MAXval(ale_bl_trig)
+  PRINT*, '(ecart-type) ale_bl_trig:', xmin, xmax
+
+  CALL get_field("ALP_BL", alp_bl, found)
+  IF (.NOT. found) THEN
+     PRINT*, "phyetat0: Le champ <alp_bl> est absent"
+     PRINT*, "Depart legerement fausse. Mais je continue"
+     alp_bl=0.
+  ENDIF
+  xmin = 1.0E+20
+  xmax = -1.0E+20
+  xmin = MINval(alp_bl)
+  xmax = MAXval(alp_bl)
+  PRINT*, '(ecart-type) alp_bl:', xmin, xmax
+
   ! Read and send field trs to traclmdz
 
@@ -1045 +1081 @@
   end if
 
+  ! Initialize Slab variables
+  IF ( type_ocean == 'slab' ) THEN
+      ALLOCATE(tslab(klon,nslay), stat=ierr)
+      IF (ierr /= 0) CALL abort_gcm &
+         ('phyetat0', 'pb allocation tslab', 1)
+      CALL get_field("tslab", tslab, found)
+      IF (.NOT. found) THEN 
+          PRINT*, "phyetat0: Le champ <tslab> est absent"
+          PRINT*, "Initialisation a tsol_oce"
+          DO i=1,nslay
+              tslab(:,i)=ftsol(:,is_oce)
+          END DO
+      END IF 
+      print*, "calling slab_init"
+      CALL ocean_slab_init(dtime, pctsrf)
+  END IF ! Slab        
+
   ! on ferme le fichier
   CALL close_startphy