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

Timestamp:

Mar 20, 2014, 10:57:19 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -3 +3 @@
 SUBROUTINE phyetat0 (fichnom, clesphy0, tabcntr0)
 
-  USE dimphy
-  USE mod_grid_phy_lmdz
-  USE mod_phys_lmdz_para
-  USE iophy
+  USE dimphy, only: klon, zmasq, klev
+  USE iophy, ONLY : init_iophy_new
   USE ocean_cpl_mod,    ONLY : ocean_cpl_init
   USE fonte_neige_mod,  ONLY : fonte_neige_init
   USE pbl_surface_mod,  ONLY : pbl_surface_init
   USE surface_data,     ONLY : type_ocean
-  USE phys_state_var_mod
-  USE iostart
-  USE write_field_phy
-  USE infotrac
+  USE phys_state_var_mod, ONLY : ancien_ok, clwcon, detr_therm, dtime, &
+       du_gwd_rando, dv_gwd_rando, entr_therm, f0, falb1, falb2, fm_therm, &
+       ftsol, pbl_tke, pctsrf, q_ancien, radpas, radsol, rain_fall, ratqs, &
+       rlat, rlon, rnebcon, rugoro, sig1, snow_fall, solaire_etat0, sollw, &
+       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
+  USE iostart, ONLY : close_startphy, get_field, get_var, open_startphy
+  USE infotrac, only: nbtr, type_trac, tname, niadv
   USE traclmdz_mod,    ONLY : traclmdz_from_restart
   USE carbon_cycle_mod, ONLY : carbon_cycle_tr, carbon_cycle_cpl, co2_send
-  USE indice_sol_mod
+  USE indice_sol_mod, only: nbsrf, is_ter, epsfra, is_lic, is_oce, is_sic
 
   IMPLICIT none
@@ -206 +209 @@
         IF (nsrf.GT.99) THEN
            PRINT*, "Trop de sous-mailles"
-           CALL abort
+           call abort_gcm("phyetat0", "", 1)
         ENDIF
         WRITE(str2, '(i2.2)') nsrf
@@ -242 +245 @@
         IF (isoil.GT.99 .AND. nsrf.GT.99) THEN
            PRINT*, "Trop de couches ou sous-mailles"
-           CALL abort
+           call abort_gcm("phyetat0", "", 1)
         ENDIF
         WRITE(str7, '(i2.2, "srf", i2.2)') isoil, nsrf
@@ -266 +269 @@
         IF (nsrf.GT.99) THEN
            PRINT*, "Trop de sous-mailles"
-           CALL abort
+           call abort_gcm("phyetat0", "", 1)
         ENDIF
         WRITE(str2, '(i2.2)') nsrf
@@ -321 +324 @@
         IF (nsrf.GT.99) THEN
            PRINT*, "Trop de sous-mailles"
-           CALL abort
+           call abort_gcm("phyetat0", "", 1)
         ENDIF
         WRITE(str2, '(i2.2)') nsrf
@@ -359 +362 @@
         IF (nsrf.GT.99) THEN
            PRINT*, "Trop de sous-mailles"
-           CALL abort
+           call abort_gcm("phyetat0", "", 1)
         ENDIF
         WRITE(str2, '(i2.2)') nsrf
@@ -425 +428 @@
         IF (nsrf.GT.99) THEN
            PRINT*, "Trop de sous-mailles"
-           CALL abort
+           call abort_gcm("phyetat0", "", 1)
         ENDIF
         WRITE(str2, '(i2.2)') nsrf
@@ -544 +547 @@
         IF (nsrf.GT.99) THEN
            PRINT*, "Trop de sous-mailles"
-           CALL abort
+           call abort_gcm("phyetat0", "", 1)
         ENDIF
         WRITE(str2, '(i2.2)') nsrf
@@ -582 +585 @@
         IF (nsrf.GT.99) THEN
            PRINT*, "Trop de sous-mailles"
-           CALL abort
+           call abort_gcm("phyetat0", "", 1)
         ENDIF
         WRITE(str2, '(i2.2)') nsrf
@@ -775 +778 @@
         IF (nsrf.GT.99) THEN
            PRINT*, "Trop de sous-mailles"
-           CALL abort
+           call abort_gcm("phyetat0", "", 1)
         ENDIF
         WRITE(str2, '(i2.2)') nsrf
@@ -1028 +1031 @@
   END IF
 
+  if (ok_gwd_rando) then
+     call get_field("du_gwd_rando", du_gwd_rando, found)
+     if (.not. found) then
+        print *, "du_gwd_rando not found, setting it to 0."
+        du_gwd_rando = 0.
+     end if
+
+     call get_field("dv_gwd_rando", dv_gwd_rando, found)
+     if (.not. found) then
+        print *, "dv_gwd_rando not found, setting it to 0."
+        dv_gwd_rando = 0.
+     end if
+  end if
+
   ! on ferme le fichier
   CALL close_startphy