Changeset 1532 for trunk/LMDZ.MARS/libf/phymars/inistats.F

Timestamp:

Apr 7, 2016, 3:53:15 PM (9 years ago)

Author:

emillour

Message:

Mars GCM:

• Some fixes for buggy outputs in 1D introduced by previous code modifications.
• made statto.h a module.
• ecritphy in dyn3d/control_mod.F90 should be an integer, not a real.

EM

File:

• trunk/LMDZ.MARS/libf/phymars/inistats.F (modified) (5 diffs)

trunk/LMDZ.MARS/libf/phymars/inistats.F

@@ -1 +1 @@
       subroutine inistats(ierr)
 
+      use statto_mod, only: istats,istime
       use mod_phys_lmdz_para, only : is_master
       USE comvert_mod, ONLY: ap,bp,aps,bps,preff,pseudoalt,presnivs
@@ -9 +10 @@
       implicit none
 
-      include "statto.h"
       include "netcdf.inc"
 
@@ -16 +16 @@
       integer :: l,nsteppd
       real, dimension(nbp_lev) ::  sig_s
-      real :: lon_reg_ext(nbp_lon+1) ! extended longitudes
+      real,allocatable :: lon_reg_ext(:) ! extended longitudes
       integer :: idim_lat,idim_lon,idim_llm,idim_llmp1,idim_time
       real, dimension(istime) :: lt
       integer :: nvarid
 
+
+      IF (nbp_lon*nbp_lat==1) THEN
+        ! 1D model
+        ALLOCATE(lon_reg_ext(1))
+      ELSE
+        ! 3D model
+        ALLOCATE(lon_reg_ext(nbp_lon+1))
+      ENDIF
+      
       write (*,*) 
       write (*,*) '                        || STATS ||'
@@ -46 +55 @@
       
       lon_reg_ext(1:nbp_lon)=lon_reg(1:nbp_lon)
-      !add extra redundant point (180 degrees, since lon_reg starts at -180
-      lon_reg_ext(nbp_lon+1)=-lon_reg_ext(1)
+      IF (nbp_lon*nbp_lat/=1) THEN
+        ! In 3D, add extra redundant point (180 degrees,
+        ! since lon_reg starts at -180)
+        lon_reg_ext(nbp_lon+1)=-lon_reg_ext(1)
+      ENDIF
 
       if (is_master) then
@@ -59 +71 @@
 
       ierr = NF_DEF_DIM (nid, "latitude", nbp_lat, idim_lat)
-      ierr = NF_DEF_DIM (nid, "longitude", nbp_lon+1, idim_lon)
+      IF (nbp_lon*nbp_lat==1) THEN
+        ierr = NF_DEF_DIM (nid, "longitude", 1, idim_lon)
+      ELSE
+        ierr = NF_DEF_DIM (nid, "longitude", nbp_lon+1, idim_lon)
+      ENDIF
       ierr = NF_DEF_DIM (nid, "altitude", nbp_lev, idim_llm)
       ierr = NF_DEF_DIM (nid, "llmp1", nbp_lev+1, idim_llmp1)