Changeset 236 for IOIPSL/trunk/src/restcom.f90

Timestamp:

01/21/08 14:44:35 (17 years ago)

Author:

bellier

Message:

calendar :

• modification of tests to get rid of a truncation error in the determination of the date change.
• addition in "itau2ymds" of a message to inform usage of undefined elements (call with "ioconf_startdate" not done)

restcom :

• some orthographic correction

JB

File:

• IOIPSL/trunk/src/restcom.f90 (modified) (11 diffs)

IOIPSL/trunk/src/restcom.f90

@@ -37 +37 @@
 !-
   INTEGER,PARAMETER :: &
- &  max_var=200, max_file=50, max_dim=NF90_MAX_VAR_DIMS
+ &  max_var=500, max_file=50, max_dim=NF90_MAX_VAR_DIMS
 !-
   CHARACTER(LEN=9),SAVE :: calend_str='unknown'
@@ -45 +45 @@
 !-
   INTEGER,SAVE :: nbfiles = 0 
-  INTEGER,SAVE :: netcdf_id(max_file,2) = -1
+  INTEGER,DIMENSION(max_file,2),SAVE :: netcdf_id = -1
 !-
 ! Description of the content of the 'in' files and the 'out' files.
@@ -67 +67 @@
 ! Time step and time origine in the input file.
 !-
-  REAL,SAVE :: deltat(max_file), timeorig(max_file)
+  REAL,DIMENSION(max_file),SAVE :: deltat,timeorig
 !-
 ! Description of the axes in the output file
@@ -74 +74 @@
 !   itau_out  : Time step which is written on this index of the file
 !-
-  INTEGER,SAVE :: tstp_out(max_file)
-  INTEGER,SAVE :: itau_out(max_file)
+  INTEGER,DIMENSION(max_file),SAVE :: tstp_out,itau_out
 !-
 ! Description of the axes in the output file
 !-
+! For the ?ax_infs variable the following order is used :
+!   ?ax_infs (if,in,1) = size of axis
+!   ?ax_infs (if,in,2) = id of dimension
 ! Number of x,y and z axes in the output file : 
 !   ?ax_nb(if)
-! For the ?ax_infs variable the following order is used :
-!   ?ax_infs (if, in,1) = size of axis
-!   ?ax_infs (if, in,2) = id of dimension
-!-
-  INTEGER,SAVE :: &
- &  xax_infs(max_file,max_dim,2), yax_infs(max_file,max_dim,2),&
- &  zax_infs(max_file,max_dim,2), qax_infs(max_file,max_dim,2)
-  INTEGER,SAVE :: &
- &  xax_nb(max_file)=0, yax_nb(max_file)=0, &
- &  zax_nb(max_file)=0, qax_nb(max_file)=0
+!-
+  INTEGER,DIMENSION(max_file,max_dim,2),SAVE :: &
+ &  xax_infs,yax_infs,zax_infs
+  INTEGER,DIMENSION(max_file),SAVE :: &
+ &  xax_nb=0,yax_nb=0,zax_nb=0
 !-
 ! Description of the time axes in the input and output files
@@ -656 +653 @@
   INTEGER :: ncfid,iret,it,iax,iv,tszij
   INTEGER,ALLOCATABLE :: tmp_index(:,:)
-  REAL,ALLOCATABLE  :: tmp_julian(:,:)
-  CHARACTER(LEN=80)  ::  itau_orig,tax_orig,calendar
+  REAL,ALLOCATABLE :: tmp_julian(:,:)
+  CHARACTER(LEN=80) :: itau_orig,tax_orig,calendar
   CHARACTER(LEN=9) :: tmp_cal
   INTEGER :: year0,month0,day0,hours0,minutes0,seci
-  REAL ::sec0,un_jour,un_an,date0_ju,ttmp
+  REAL :: sec0,un_jour,un_an,date0_ju,ttmp
   CHARACTER :: strc
 !-
@@ -718 +715 @@
     itau_orig = &
       itau_orig(INDEX(itau_orig,'since')+6:LEN_TRIM(itau_orig))
-    iret = NF90_GET_ATT &
- &           (ncfid,tind_varid_in(fid),'tstep_sec',timestep)
-!---
-!-- This time origine will dominate as it is linked to the time steps.
+    iret = &
+ &    NF90_GET_ATT(ncfid,tind_varid_in(fid),'tstep_sec',timestep)
+!---
+!-- This time origin will dominate as it is linked to the time steps.
 !---
     READ (UNIT=itau_orig,FMT='(I4.4,5(a,I2.2))') &
@@ -1662 +1659 @@
     IF (zax_infs(fid,1,1) > 0) req_sz = req_sz*zax_infs(fid,1,1)
   ELSE
-    CALL ipslerr (3,'resput_opp_r1d', &
+    CALL ipslerr (3,'restput_opp_r1d', &
       'Unable to performe an operation on this variable as it has', &
       'a second and third dimension',vname_q)
@@ -1711 +1708 @@
        scal,req_sz,buff_tmp2)
   ELSE
-    CALL ipslerr (3,'resput_opp_r1d', &
+    CALL ipslerr (3,'restput_opp_r1d', &
       'The operation you wish to do on the variable for the ', &
        & 'restart file is not allowed.',topp)
@@ -1765 +1762 @@
     IF (yax_infs(fid,1,1) > 0) req_sz = req_sz*yax_infs(fid,1,1)
   ELSE
-    CALL ipslerr (3,'resput_opp_r2d', &
+    CALL ipslerr (3,'restput_opp_r2d', &
       'Unable to performe an operation on this variable as it has', &
       'a second and third dimension',vname_q)
@@ -1771 +1768 @@
 !-
   IF (jjm < 1) THEN
-    CALL ipslerr (3,'resput_opp_r2d', &
+    CALL ipslerr (3,'restput_opp_r2d', &
       'Please specify a second dimension which is the', &
       'layer on which the operations are performed',vname_q)
@@ -1824 +1821 @@
     ENDDO
   ELSE
-    CALL ipslerr (3,'resput_opp_r2d', &
+    CALL ipslerr (3,'restput_opp_r2d', &
       'The operation you wish to do on the variable for the ', &
       'restart file is not allowed.',topp)