Changeset 1507 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Jan 13, 2016, 9:09:01 AM (9 years ago)

Author:

emillour

Message:

Generic model and Mars model:

• Fix/improvement on planetwide_min/max/sum for the 3D fields which assumed the vertical dimension to be klev. Now works for any (klon,...) field.

EM

File:

• trunk/LMDZ.MARS/libf/phymars/planetwide_mod.F90 (modified) (6 diffs)

trunk/LMDZ.MARS/libf/phymars/planetwide_mod.F90

@@ -50 +50 @@
 
   subroutine planetwide_maxval_i2(values,values_max)
-  use dimphy, only: klon, klev
-  use mod_grid_phy_lmdz, only : klon_glo
-  implicit none
-  integer,intent(in) :: values(:,:) ! local grid (klon,klev)
-  integer,intent(out) :: values_max
-#ifdef CPP_PARA
-  integer :: values_glo(klon_glo,klev) ! global grid
+  use dimphy, only: klon
+  use mod_grid_phy_lmdz, only : klon_glo
+  implicit none
+  integer,intent(in) :: values(:,:) ! local grid (klon,...)
+  integer,intent(out) :: values_max
+#ifdef CPP_PARA
+  integer :: values_glo(klon_glo,size(values,2)) ! global grid
   
   ! gather field on master:
@@ -94 +94 @@
 
   subroutine planetwide_maxval_r2(values,values_max)
-  use dimphy, only: klon, klev
-  use mod_grid_phy_lmdz, only : klon_glo
-  implicit none
-  real,intent(in) :: values(:,:) ! local grid (klon,klev)
-  real,intent(out) :: values_max
-#ifdef CPP_PARA
-  real :: values_glo(klon_glo,klev) ! global grid
+  use dimphy, only: klon
+  use mod_grid_phy_lmdz, only : klon_glo
+  implicit none
+  real,intent(in) :: values(:,:) ! local grid (klon,...)
+  real,intent(out) :: values_max
+#ifdef CPP_PARA
+  real :: values_glo(klon_glo,size(values,2)) ! global grid
   
   ! gather field on master:
@@ -140 +140 @@
 
   subroutine planetwide_minval_i2(values,values_max)
-  use dimphy, only: klon, klev
-  use mod_grid_phy_lmdz, only : klon_glo
-  implicit none
-  integer,intent(in) :: values(:,:) ! local grid (klon,klev)
-  integer,intent(out) :: values_max
-#ifdef CPP_PARA
-  integer :: values_glo(klon_glo,klev) ! global grid
+  use dimphy, only: klon
+  use mod_grid_phy_lmdz, only : klon_glo
+  implicit none
+  integer,intent(in) :: values(:,:) ! local grid (klon,...)
+  integer,intent(out) :: values_max
+#ifdef CPP_PARA
+  integer :: values_glo(klon_glo,size(values,2)) ! global grid
   
   ! gather field on master:
@@ -184 +184 @@
 
   subroutine planetwide_minval_r2(values,values_max)
-  use dimphy, only: klon, klev
-  use mod_grid_phy_lmdz, only : klon_glo
-  implicit none
-  real,intent(in) :: values(:,:) ! local grid (klon,klev)
-  real,intent(out) :: values_max
-#ifdef CPP_PARA
-  real :: values_glo(klon_glo,klev) ! global grid
+  use dimphy, only: klon
+  use mod_grid_phy_lmdz, only : klon_glo
+  implicit none
+  real,intent(in) :: values(:,:) ! local grid (klon,...)
+  real,intent(out) :: values_max
+#ifdef CPP_PARA
+  real :: values_glo(klon_glo,size(values,2)) ! global grid
   
   ! gather field on master:
@@ -230 +230 @@
 
   subroutine planetwide_sumval_i2(values,values_sum)
-  use dimphy, only: klon, klev
-  use mod_grid_phy_lmdz, only : klon_glo
-  implicit none
-  integer,intent(in) :: values(:,:) ! local grid (klon,klev)
+  use dimphy, only: klon
+  use mod_grid_phy_lmdz, only : klon_glo
+  implicit none
+  integer,intent(in) :: values(:,:) ! local grid (klon,...)
   integer,intent(out) :: values_sum
 #ifdef CPP_PARA
-  integer :: values_glo(klon_glo,klev) ! global grid
+  integer :: values_glo(klon_glo,size(values,2)) ! global grid
   
   ! gather field on master:
@@ -274 +274 @@
 
   subroutine planetwide_sumval_r2(values,values_sum)
-  use dimphy, only: klon, klev
-  use mod_grid_phy_lmdz, only : klon_glo
-  implicit none
-  real,intent(in) :: values(:,:) ! local grid (klon,klev)
+  use dimphy, only: klon
+  use mod_grid_phy_lmdz, only : klon_glo
+  implicit none
+  real,intent(in) :: values(:,:) ! local grid (klon,...)
   real,intent(out) :: values_sum
 #ifdef CPP_PARA
-  real :: values_glo(klon_glo,klev) ! global grid
+  real :: values_glo(klon_glo,size(values,2)) ! global grid
   
   ! gather field on master: