Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/write_paramLMDZ_phy.h

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/write_paramLMDZ_phy.h (modified) (2 diffs)

LMDZ5/branches/testing/libf/phylmd/write_paramLMDZ_phy.h

@@ -2 +2 @@
 ! calcul moyennes globales
 !
-       zx_tmp_fi2d=bils*airephy
-       CALL global_mean(zx_tmp_fi2d,airephy,.TRUE.,gbils)
-       zx_tmp_fi2d=evap*airephy
-       CALL global_mean(zx_tmp_fi2d,airephy,.TRUE.,gevap)
-       zx_tmp_fi2d(:)=fevap(:, is_ter)*airephy(:)
-       CALL global_mean(zx_tmp_fi2d,airephy,.TRUE.,gevapt)
-       zx_tmp_fi2d=zxfluxlat*airephy
-       CALL global_mean(zx_tmp_fi2d,airephy,.TRUE.,glat)
-       zx_tmp_fi2d=(topsw0-toplw0)*airephy
-       CALL global_mean(zx_tmp_fi2d,airephy,.TRUE.,gnet0)
-       zx_tmp_fi2d=(topsw-toplw)*airephy
-       CALL global_mean(zx_tmp_fi2d,airephy,.TRUE.,gnet)
-       zx_tmp_fi2d=(rain_fall+snow_fall)*airephy
-       CALL global_mean(zx_tmp_fi2d,airephy,.TRUE.,grain)
-       zx_tmp_fi2d=zxtsol*airephy
-       CALL global_mean(zx_tmp_fi2d,airephy,.TRUE.,gtsol)
-       zx_tmp_fi2d=zt2m*airephy
-       CALL global_mean(zx_tmp_fi2d,airephy,.TRUE.,gt2m)
-       zx_tmp_fi2d=prw*airephy
-       CALL global_mean(zx_tmp_fi2d,airephy,.TRUE.,gprw)
+       zx_tmp_fi2d=bils*cell_area
+       CALL global_mean(zx_tmp_fi2d,cell_area,.TRUE.,gbils)
+       zx_tmp_fi2d=evap*cell_area
+       CALL global_mean(zx_tmp_fi2d,cell_area,.TRUE.,gevap)
+       zx_tmp_fi2d(:)=fevap(:, is_ter)*cell_area(:)
+       CALL global_mean(zx_tmp_fi2d,cell_area,.TRUE.,gevapt)
+       zx_tmp_fi2d=zxfluxlat*cell_area
+       CALL global_mean(zx_tmp_fi2d,cell_area,.TRUE.,glat)
+       zx_tmp_fi2d=(topsw0-toplw0)*cell_area
+       CALL global_mean(zx_tmp_fi2d,cell_area,.TRUE.,gnet0)
+       zx_tmp_fi2d=(topsw-toplw)*cell_area
+       CALL global_mean(zx_tmp_fi2d,cell_area,.TRUE.,gnet)
+       zx_tmp_fi2d=(rain_fall+snow_fall)*cell_area
+       CALL global_mean(zx_tmp_fi2d,cell_area,.TRUE.,grain)
+       zx_tmp_fi2d=zxtsol*cell_area
+       CALL global_mean(zx_tmp_fi2d,cell_area,.TRUE.,gtsol)
+       zx_tmp_fi2d=zt2m*cell_area
+       CALL global_mean(zx_tmp_fi2d,cell_area,.TRUE.,gt2m)
+       zx_tmp_fi2d=prw*cell_area
+       CALL global_mean(zx_tmp_fi2d,cell_area,.TRUE.,gprw)
 !
 !$OMP MASTER
@@ -27 +27 @@
 !
       ndex2d = 0
-      itau_w = itau_phy + itap + int(start_time * day_step / iphysiq)
+      itau_w = itau_phy + itap + int(start_time * day_step_phy)
 !
 ! Variables globales