Changeset 2595 for LMDZ5/branches/testing

Timestamp:

Jul 19, 2016, 11:06:22 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2589:2593 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/aeropt_2bands.F90 (modified) (1 diff)
• libf/phylmd/dyn1d/inigeomphy_mod.F90 (copied) (copied from LMDZ5/trunk/libf/phylmd/dyn1d/inigeomphy_mod.F90)
• libf/phylmd/ini_paramLMDZ_phy.h (deleted)
• libf/phylmd/paramlmdz_phy_mod.F90 (copied) (copied from LMDZ5/trunk/libf/phylmd/paramlmdz_phy_mod.F90)
• libf/phylmd/physiq_mod.F90 (modified) (6 diffs)
• libf/phylmd/write_paramLMDZ_phy.h (deleted)

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

@@ -1133 +1133 @@
      absvisaer(i)=SUM((1-piz_allaer(i,:,mrfspecies,inu))*tau_allaer(i,:,mrfspecies,inu))
   ENDDO
-  STOP
 
   DEALLOCATE(aerosol_name) 

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

@@ -73 +73 @@
     USE ioipsl_getin_p_mod, ONLY : getin_p
 
+    USE paramLMDZ_phy_mod
 
     !IM stations CFMIP
@@ -284 +285 @@
     !
     !
-
-
     INTEGER debug
     INTEGER n
@@ -765 +764 @@
     REAL uq_lay(klon,klev) ! transport zonal de l'eau a chaque niveau vert.
     !
+    REAL zjulian
+    SAVE zjulian
+!$OMP THREADPRIVATE(zjulian)
+
     INTEGER nhori, nvert
     REAL zsto
     REAL zstophy, zout
-
-    real zjulian
-    save zjulian
-    !$OMP THREADPRIVATE(zjulian)
 
     character*20 modname
@@ -883 +882 @@
     !============================================================
     real :: mr_ozone(klon,klev)
-
-    !IM sorties fichier 1D paramLMDZ_phy.nc
-    REAL :: zx_tmp_0d(1,1)
-    INTEGER, PARAMETER :: np=1
-    REAL,dimension(klon_glo)        :: rlat_glo
-    REAL,dimension(klon_glo)        :: rlon_glo
-    REAL gbils(1), gevap(1), gevapt(1), glat(1), gnet0(1), gnet(1)
-    REAL grain(1), gtsol(1), gt2m(1), gprw(1)
 
     !IM stations CFMIP
@@ -1392 +1383 @@
        include "ini_histday_seri.h"
 
-       include "ini_paramLMDZ_phy.h"
+       CALL ini_paramLMDZ_phy(dtime,nid_ctesGCM)
 
 #endif
@@ -4349 +4340 @@
          flag_aerosol, flag_aerosol_strat, ok_cdnc)
 
-
-
     include "write_histday_seri.h"
 
-    include "write_paramLMDZ_phy.h"
+    CALL write_paramLMDZ_phy(itap,nid_ctesGCM,ok_sync)
 
 #endif