Changeset 1118 for trunk/LMDZ.MARS/util/concatnc.F90

Timestamp:

Nov 25, 2013, 5:40:00 PM (11 years ago)

Author:

tnavarro

Message:

Using option all variables for concat was not working + Consistent controle field about the date in the concat file.

File:

• trunk/LMDZ.MARS/util/concatnc.F90 (modified) (7 diffs)

trunk/LMDZ.MARS/util/concatnc.F90

@@ -27 +27 @@
 character (len=80), dimension(1000) :: file
 ! file(): input file(s) names(s)
-character (len=30), dimension(15) :: notconcat
-! notconcat(): names of the (15) variables that won't be concatenated
+character (len=30), dimension(16) :: notconcat
+! notconcat(): names of the (16) variables that won't be concatenated
 character (len=50), dimension(:), allocatable :: var
 ! var(): name(s) of variable(s) that will be concatenated
@@ -192 +192 @@
 notconcat(14)='aire'
 notconcat(15)='phisinit'
+notconcat(16)='soildepth'
+
 
 !==============================================================================
@@ -202 +204 @@
    ! vartmp now contains the "name" of variable of ID # i
    var_ok=0
-   do inter=1,15
+   do inter=1,size(notconcat)
       if (vartmp.eq.notconcat(inter)) then
          var_ok=1 
          Nnotconcat=Nnotconcat+1
       endif 
-   enddo        
+   enddo     
    if (var_ok.eq.0)  write(*,*) trim(vartmp)
 enddo
@@ -249 +251 @@
 ! Variables names from the file are catched
    nbvar=nbvarfile-Nnotconcat
-   do i=1,nbvar
-      ierr=nf_inq_varname(nid,i+Nnotconcat,var(i))
-      write(*,'(a9,1x,i2,1x,a1,1x,a50)') "variable ",i,":",var(i)
+   j=1
+   do i=1,nbvarfile
+      ierr=nf_inq_varname(nid,i,vartmp)
+      var_ok=0
+      do inter=1,size(notconcat)
+        if (vartmp.eq.notconcat(inter)) then
+           var_ok=1
+        endif
+      enddo
+      if (var_ok.eq.0) then
+         if (j .gt. nbvar) then
+           write(*,*) "PROBLEM HERE !", var
+           stop
+         endif
+         var(j) = vartmp 
+         write(*,'(a9,1x,i2,1x,a1,1x,a50)') "variable ",j,":",var(j)
+         j=j+1
+      endif
    enddo
 else if(nbvar==0) then
@@ -379 +396 @@
                                 modulo(int(memotime),669)," but ",modulo(int(ctl(4)),669),"!!"
            write(*,*) "Starting day of the run has been corrected."
-           memotime=float(modulo(int(ctl(4)),669))
+           memotime=float(modulo(int(ctl(4)),669)) + ctl(27)
+           ctl(4) = 0.
+           ctl(27) = 0.
          endif
       endif
@@ -746 +765 @@
    ierr = NF_REDEF (nout)
 
-   #ifdef NC_DOUBLE
+#ifdef NC_DOUBLE
    ierr = NF_DEF_VAR (nout,"controle",NF_DOUBLE,1,ctldimout,nvarid)
-   #else
+#else
    ierr = NF_DEF_VAR (nout,"controle",NF_FLOAT,1,ctldimout,nvarid)
-   #endif
+#endif
 
    ierr = NF_PUT_ATT_TEXT (nout,nvarid,"title",18,"Control parameters")
@@ -757 +776 @@
    ierr = NF_ENDDEF(nout)
 
-   #ifdef NC_DOUBLE
+#ifdef NC_DOUBLE
    ierr = NF_PUT_VAR_DOUBLE (nout,nvarid,ctl)
-   #else
+#else
    ierr = NF_PUT_VAR_REAL (nout,nvarid,ctl)
-   #endif
+#endif
 endif