Changeset 1531 for trunk/LMDZ.GENERIC/libf/phystd/iniwrite_specIR.F

Timestamp:

Apr 7, 2016, 9:17:30 AM (9 years ago)

Author:

mturbet

Message:

Generic GCM:

• Fix buggy ouputs in 1D introduced by previous code modifications.

EM+MT

File:

• trunk/LMDZ.GENERIC/libf/phystd/iniwrite_specIR.F (modified) (8 diffs)

trunk/LMDZ.GENERIC/libf/phystd/iniwrite_specIR.F

@@ -1 @@
-      SUBROUTINE iniwrite_specIR(nid,idayref,area)
+      SUBROUTINE iniwrite_specIR(nid,idayref,area,nbplon,nbplat)
 
       use radinc_h, only: L_NSPECTI
@@ -36 +36 @@
       integer,intent(in) :: nid        ! NetCDF file ID
       INTEGER*4,intent(in) :: idayref  ! date (initial date for this run)
-      real,intent(in) :: area(nbp_lon+1,nbp_lat) ! mesh area (m2)
+      real,intent(in) :: area(nbplon,nbplat) ! mesh area (m2)
+      integer,intent(in) :: nbplon,nbplat ! sizes of area
 
 c   Local:
@@ -44 +45 @@
       REAL tab_cntrl(length) ! run parameters are stored in this array
       INTEGER ierr
-      REAl :: lon_reg_ext(nbp_lon+1) ! extended longitudes
+      REAl,ALLOCATABLE :: lon_reg_ext(:) ! extended longitudes
 
       integer :: nvarid,idim_index,idim_rlonu,idim_rlonv
@@ -53 +54 @@
 
 c-----------------------------------------------------------------------
+
+      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
 
       DO l=1,length
@@ -103 +112 @@
       ierr = NF_DEF_DIM (nid, "index", length, idim_index)
       ierr = NF_DEF_DIM (nid, "latitude", nbp_lat, idim_rlatu)
-      ierr = NF_DEF_DIM (nid, "longitude", nbp_lon+1, idim_rlonv)
-      ierr = NF_DEF_DIM (nid, "IR Wavenumber",L_NSPECTI,idim_bandsIR)
+      IF (nbp_lon*nbp_lat==1) THEN
+        ierr = NF_DEF_DIM (nid, "longitude", 1, idim_rlonv)
+      ELSE
+        ierr = NF_DEF_DIM (nid, "longitude", nbp_lon+1, idim_rlonv)
+      ENDIF
+      ierr = NF_DEF_DIM (nid, "IR_Wavenumber",L_NSPECTI,idim_bandsIR)
 
       ierr = NF_ENDDEF(nid)
@@ -149 +162 @@
       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
       
       ierr = NF_REDEF (nid)
@@ -175 +192 @@
       ! define variable
 #ifdef NC_DOUBLE
-      ierr=NF_DEF_VAR(nid,"IR Wavenumber",NF_DOUBLE,1,
-     .                                idim_bandsIR,nvarid)
-#else
-      ierr=NF_DEF_VAR(nid,"IR Wavenumber",NF_FLOAT,1,
+      ierr=NF_DEF_VAR(nid,"IR_Wavenumber",NF_DOUBLE,1,
+     .                                idim_bandsIR,nvarid)
+#else
+      ierr=NF_DEF_VAR(nid,"IR_Wavenumber",NF_FLOAT,1,
      .                                idim_bandsIR,nvarid)
 #endif
@@ -199 +216 @@
       ! define variable
 #ifdef NC_DOUBLE
-      ierr=NF_DEF_VAR(nid,"IR Bandwidth",NF_DOUBLE,1,
-     .                                idim_bandsIR,nvarid)
-#else
-      ierr=NF_DEF_VAR(nid,"IR Bandwidth",NF_FLOAT,1,
+      ierr=NF_DEF_VAR(nid,"IR_Bandwidth",NF_DOUBLE,1,
+     .                                idim_bandsIR,nvarid)
+#else
+      ierr=NF_DEF_VAR(nid,"IR_Bandwidth",NF_FLOAT,1,
      .                                idim_bandsIR,nvarid)
 #endif