Changeset 1011

Timestamp:

05/07/10 15:05:34 (14 years ago)

Author:

bellier

Message:

New handling for time axes

Location:

IOIPSL/trunk/src

Files:

• calendar.f90 (modified) (1 diff)
• histcom.f90 (modified) (4 diffs)

IOIPSL/trunk/src/calendar.f90

@@ -511 +511 @@
 !- action is smaller than the one from the next expected
 !- check to the next action.
-!- When the test is done on the time steps simplifactions make
+!- When the test is done on the time steps simplifications make
 !- it more difficult to read in the code.
 !- For the real time case it is easier to understand !

IOIPSL/trunk/src/histcom.f90

@@ -1128 +1128 @@
     IF (pzid > W_F(idf)%n_zax) THEN
       WRITE(str70, &
- &    '("The vertical coordinate chosen for variable ",a)') &
+ &    '("The vertical coordinate chosen for variable ",A)') &
  &     TRIM(tmp_name)
       str71 = " Does not exist."
@@ -1300 +1300 @@
   IF (l_dbg) WRITE(*,*) "histdef : 6.0"
 !-
-  IF (W_F(idf)%W_V(iv)%freq_wrt > 0) THEN
-    WRITE(str10,'(I8.8)') INT(W_F(idf)%W_V(iv)%freq_wrt)
-    str40 = TRIM(W_F(idf)%W_V(iv)%topp)//"_"//TRIM(str10)
-  ELSE
-    WRITE(str10,'(I2.2,"month")') ABS(INT(W_F(idf)%W_V(iv)%freq_wrt))
-    str40 = TRIM(W_F(idf)%W_V(iv)%topp)//"_"//TRIM(str10)
-  ENDIF
-  CALL find_str (W_F(idf)%W_V(1:W_F(idf)%n_tax)%tax_name,str40,pos)
-!-
 ! No time axis for once, l_max, l_min or never operation
 !-
@@ -1315 +1306 @@
  &    .AND.(TRIM(W_F(idf)%W_V(iv)%topp) /= 'l_max') &
  &    .AND.(TRIM(W_F(idf)%W_V(iv)%topp) /= 'l_min') ) THEN
+    IF (TRIM(W_F(idf)%W_V(iv)%topp) == 'inst') THEN
+      str10 = 't_inst_'
+    ELSE
+      str10 = 't_op_'
+    ENDIF
+    IF (W_F(idf)%W_V(iv)%freq_wrt > 0) THEN
+      WRITE (UNIT=str40,FMT='(A,I8.8)') &
+&      TRIM(str10),INT(W_F(idf)%W_V(iv)%freq_wrt)
+    ELSE
+      WRITE (UNIT=str40,FMT='(A,I2.2,"month")') &
+&      TRIM(str10),ABS(INT(W_F(idf)%W_V(iv)%freq_wrt))
+    ENDIF
+    CALL find_str (W_F(idf)%W_V(1:W_F(idf)%n_tax)%tax_name,str40,pos)
     IF (pos < 0) THEN
       W_F(idf)%n_tax = W_F(idf)%n_tax+1
@@ -1387 +1391 @@
     dims(1) = W_F(idf)%tid
     IF (W_F(idf)%n_tax > 1) THEN
-      str30 = "t_"//W_F(idf)%W_V(itx)%tax_name
+      str30 = W_F(idf)%W_V(itx)%tax_name
     ELSE
       str30 = "time_counter"
     ENDIF
-    iret = NF90_DEF_VAR (nfid,str30,NF90_REAL8, &
- &           dims(1),W_F(idf)%W_V(itx)%tdimid)
-    IF (W_F(idf)%n_tax <= 1) THEN
+    iret = NF90_DEF_VAR (nfid,TRIM(str30),NF90_REAL8, &
+ &          dims(1),W_F(idf)%W_V(itx)%tdimid)
+    IF (itx <= 1) THEN
       iret = NF90_PUT_ATT (nfid,W_F(idf)%W_V(itx)%tdimid,'axis',"T")
     ENDIF
     iret = NF90_PUT_ATT (nfid,W_F(idf)%W_V(itx)%tdimid, &
- &           'standard_name',"time")
+ &          'standard_name',"time")
 !---
 !   To transform the current itau into a real date and take it