Changeset 969 for trunk

Timestamp:

May 23, 2013, 10:27:44 AM (12 years ago)

Author:

emillour

Message:

Generic/Universal? GCM:
Further cleanup in outputs: enable output of a scalar in writediagfi in parallel mode and remove obsolete io* routines.
EM

Location:

trunk

Files:

• LMDZ.GENERIC/libf/phystd/physiq.F90 (modified) (2 diffs)
• LMDZ.GENERIC/libf/phystd/writediagfi.F (modified) (4 diffs)
• LMDZ.UNIVERSAL/libf/phygeneric/iophys.F90 (deleted)
• LMDZ.UNIVERSAL/libf/phygeneric/iotd.h (deleted)
• LMDZ.UNIVERSAL/libf/phygeneric/iotd_ecrit.F90 (deleted)
• LMDZ.UNIVERSAL/libf/phygeneric/iotd_fin.F90 (deleted)
• LMDZ.UNIVERSAL/libf/phygeneric/iotd_ini.F90 (deleted)

trunk/LMDZ.GENERIC/libf/phystd/physiq.F90

@@ -1687 +1687 @@
 
 !     Subsurface temperatures
-        call writediagsoil(ngrid,"tsurf","Surface temperature","K",2,tsurf)
-        call writediagsoil(ngrid,"temp","temperature","K",3,tsoil)
+!        call writediagsoil(ngrid,"tsurf","Surface temperature","K",2,tsurf)
+!        call writediagsoil(ngrid,"temp","temperature","K",3,tsoil)
 
 !     Total energy balance diagnostics
@@ -1877 +1877 @@
         IF ( ALLOCATED(coslon)) DEALLOCATE(coslon)
 
-#ifdef CPP_PARA
-        ! close diagfi.nc in parallel
-           call iotd_fin
-#endif
-
       endif
 

trunk/LMDZ.GENERIC/libf/phystd/writediagfi.F

@@ -258 +258 @@
       if ( MOD(zitau+1,irythme) .eq.0.) then
 
-!#ifdef CPP_PARA
-!         !! parallel: we cannot use the usual writediagfi method
-!         if (dim .eq. 2) then
-!             dimvert = 1
-!         else if (dim == 3) then
-!             dimvert = llm
-!         endif
-!         call iophys_ecrit(nom,dimvert,titre,unite,px)
-!#else
-
 ! Compute/write/extend 'Time' coordinate (date given in days)
 ! (done every "first call" (at given time level) to writediagfi)
@@ -505 +495 @@
               write(*,*) "***** PUT_VAR problem in writediagfi"
               write(*,*) "***** with ",nom
-              write(*,*) 'ierr=', ierr
+              write(*,*) 'ierr=', ierr,": ",NF_STRERROR(ierr)
 c             call abort
            endif 
@@ -513 +503 @@
 
         else if (dim.eq.0) then
-         if (is_parallel) then
-           write(*,*) "writediagfi error: dim=0 not implemented ",
-     &                 "in parallel mode"
-           stop
-         endif
 
            dx0 = px (1,1)
 
+          if (is_master) then
+           ! only the master writes to output
            ierr= NF_INQ_VARID(nid,nom,varid)
            if (ierr /= NF_NOERR) then
@@ -546 +533 @@
               write(*,*) "***** PUT_VAR matter in writediagfi"
               write(*,*) "***** with ",nom
-              write(*,*) 'ierr=', ierr
+              write(*,*) 'ierr=', ierr,": ",NF_STRERROR(ierr)
 c             call abort
            endif 
+
+          endif !of if (is_master)
 
         endif ! of if (dim.eq.3) elseif(dim.eq.2)...