Changeset 2720 for LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/limit_netcdf.F90

Timestamp:

Nov 30, 2016, 1:28:41 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2664:2719 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dynphy_lonlat/phylmd/limit_netcdf.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/limit_netcdf.F90

@@ -71 +71 @@
   USE netcdf95,           ONLY: nf95_def_var, nf95_put_att, nf95_put_var
   USE comconst_mod, ONLY: pi
+  USE phys_cal_mod, ONLY: calend
   IMPLICIT NONE
 !-------------------------------------------------------------------------------
@@ -244 +245 @@
   !--- Attributes creation
   CALL ncerr(NF90_PUT_ATT(nid,id_tim, "title","Jour dans l annee"),fnam)
+  CALL ncerr(NF90_PUT_ATT(nid,id_tim, "calendar",calend),fnam)
   CALL ncerr(NF90_PUT_ATT(nid,id_FOCE,"title","Fraction ocean"),fnam)
   CALL ncerr(NF90_PUT_ATT(nid,id_FSIC,"title","Fraction glace de mer"),fnam)
@@ -405 +407 @@
       CASE('SIC', 'SST'); cal_in='gregorian'
     END SELECT
-  CALL msg(5,'WARNING: missing "calendar" attribute for "time" in '&
+    CALL msg(5,'WARNING: missing "calendar" attribute for "time" in '&
      &//TRIM(fnam)//'. Choosing default value.')
   END IF
+  CALL strclean(cal_in)                     !--- REMOVE (WEIRD) NULL CHARACTERS
   CALL msg(5,'var, calendar, dim: '//TRIM(dnam)//' '//TRIM(cal_in), lmdep)
   
@@ -477 +480 @@
   fnam_p=fnam(1:idx)//'_p.nc'
   IF(NF90_OPEN(fnam_p,NF90_NOWRITE,ncid)==NF90_NOERR) THEN
-    CALL msg(0,'Reading previous year file ("'//TRIM(fnam_p)//'") first record for '//TRIM(title))
+    CALL msg(0,'Reading next year file ("'//TRIM(fnam_p)//'") first record for '//TRIM(title))
     CALL ncerr(NF90_INQ_VARID(ncid, varname, varid),fnam_p)
     CALL ncerr(NF90_GET_VAR(ncid,varid,champ,[1,1,1],[imdep,jmdep,1]),fnam_p)
@@ -767 +770 @@
 !-------------------------------------------------------------------------------
 
+
+!-------------------------------------------------------------------------------
+!
+SUBROUTINE strclean(s)
+!
+!-------------------------------------------------------------------------------
+  IMPLICIT NONE
+!-------------------------------------------------------------------------------
+! Purpose: Remove tail null characters from the input string.
+!-------------------------------------------------------------------------------
+! Parameters:
+  CHARACTER(LEN=*), INTENT(INOUT) :: s
+!-------------------------------------------------------------------------------
+! Local variable:
+  INTEGER :: k
+!-------------------------------------------------------------------------------
+  k=LEN_TRIM(s); DO WHILE(ICHAR(s(k:k))==0); s(k:k)=' '; k=LEN_TRIM(s); END DO
+
+END SUBROUTINE strclean
+!
+!-------------------------------------------------------------------------------
+
 #endif
 ! of #ifndef CPP_1D