Changeset 1955

Timestamp:

Jun 27, 2018, 12:41:02 PM (6 years ago)

Author:

emillour

Message:

Mars GCM:

• Fix problematic writediagfi call in physiq (should not write a "Time" variable as "Time" is already defined as a dimension) and added some extra tests in writediagfi to better detect similar issues.

EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/physiq_mod.F (modified) (1 diff)
• libf/phymars/writediagfi.F (modified) (10 diffs)

trunk/LMDZ.MARS/README

@@ -2592 +2592 @@
 == 21/06/2018 == EM
 - Make a "doc" subdirectory to store the documentation source files with the code
+
+== 27/06/2018 == EM
+- Fix problematic writediagfi call in physiq (should not write a "Time" variable
+  as "Time" is already defined as a dimension) and added some extra tests in
+  writediagfi to better detect similar issues.

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -2329 +2329 @@
      &                  fluxtop_sw_tot)
          call WRITEDIAGFI(ngrid,"temp","temperature","K",3,zt)
-         call WRITEDIAGFI(ngrid,"Time","Time","sols",0,zday)
+         call WRITEDIAGFI(ngrid,"Sols","Time","sols",0,zday)
 
          call WRITEDIAGFI(ngrid,"u","Zonal wind","m.s-1",3,zu)

trunk/LMDZ.MARS/libf/phymars/writediagfi.F

@@ -281 +281 @@
            ntime=ntime+1 ! increment # of stored time steps
            ! compute corresponding date (in days and fractions thereof)
-           date= float (zitau +1)/float (day_step)
+           date=(zitau +1.)/day_step
            ! Get NetCDF ID of 'Time' variable
            ierr= NF_INQ_VARID(nid,"Time",varid)
@@ -293 +293 @@
               write(*,*) "***** PUT_VAR matter in writediagfi_nc"
               write(*,*) "***** with time"
-              write(*,*) 'ierr=', ierr   
+              write(*,*) 'ierr=', ierr,": ",NF_STRERROR(ierr)  
 c             call abort
            endif
@@ -355 +355 @@
 
               write (*,*) "=========================="
-              write (*,*) "DIAGFI: creating variable ",nom
+              write (*,*) "DIAGFI: creating variable ",trim(nom)
               call def_var(nid,nom,titre,unite,4,id,varid,ierr)
 
+           else
+             if (ntime==0) then
+              write(*,*) "DIAGFI Error: failed creating variable ",
+     &                   trim(nom)
+              write(*,*) "it seems it already exists!"
+              stop
+             endif
            endif 
 
@@ -389 +396 @@
            if (ierr.ne.NF_NOERR) then
               write(*,*) "***** PUT_VAR problem in writediagfi"
-              write(*,*) "***** with dx3: ",nom
+              write(*,*) "***** with dx3: ",trim(nom)
               write(*,*) 'ierr=', ierr,": ",NF_STRERROR(ierr)
               stop
@@ -449 +456 @@
 
               write (*,*) "=========================="
-              write (*,*) "DIAGFI: creating variable ",nom
+              write (*,*) "DIAGFI: creating variable ",trim(nom)
 
               call def_var(nid,nom,titre,unite,3,id,varid,ierr)
 
+           else
+             if (ntime==0) then
+              write(*,*) "DIAGFI Error: failed creating variable ",
+     &                   trim(nom)
+              write(*,*) "it seems it already exists!"
+              stop
+             endif
            endif
 
@@ -479 +493 @@
            if (ierr.ne.NF_NOERR) then
               write(*,*) "***** PUT_VAR matter in writediagfi"
-              write(*,*) "***** with dx2: ",nom
+              write(*,*) "***** with dx2: ",trim(nom)
               write(*,*) 'ierr=', ierr,": ",NF_STRERROR(ierr)
               stop
@@ -510 +524 @@
 
               write (*,*) "=========================="
-              write (*,*) "DIAGFI: creating variable ",nom
+              write (*,*) "DIAGFI: creating variable ",trim(nom)
 
               call def_var(nid,nom,titre,unite,2,id,varid,ierr)
               
+           else
+             if (ntime==0) then
+              write(*,*) "DIAGFI Error: failed creating variable ",
+     &                   trim(nom)
+              write(*,*) "it seems it already exists!"
+              stop
+             endif
            endif
            
@@ -529 +550 @@
            if (ierr.ne.NF_NOERR) then
               write(*,*) "***** PUT_VAR problem in writediagfi"
-              write(*,*) "***** with dx1: ",nom
+              write(*,*) "***** with dx1: ",trim(nom)
               write(*,*) 'ierr=', ierr,": ",NF_STRERROR(ierr)
               stop
@@ -551 +572 @@
 
               write (*,*) "=========================="
-              write (*,*) "DIAGFI: creating variable ",nom
+              write (*,*) "DIAGFI: creating variable ",trim(nom)
 
               call def_var(nid,nom,titre,unite,1,id,varid,ierr)
 
+           else
+             if (ntime==0) then
+              write(*,*) "DIAGFI Error: failed creating variable ",
+     &                   trim(nom)
+              write(*,*) "it seems it already exists!"
+              stop
+             endif
            endif
 
@@ -567 +595 @@
            if (ierr.ne.NF_NOERR) then
               write(*,*) "***** PUT_VAR matter in writediagfi"
-              write(*,*) "***** with dx0: ",nom
+              write(*,*) "***** with dx0: ",trim(nom)
               write(*,*) 'ierr=', ierr,": ",NF_STRERROR(ierr)
               stop