Changeset 862 for trunk

Timestamp:

Jan 10, 2013, 10:07:14 PM (12 years ago)

Author:

aslmd

Message:

LMDZ.UNIVERSAL
LMDZ.GENERIC

Added calls to Frederic Hourdin's subroutines to output physical fields in parallel. This is under precompiling flags CPP_PARA.
This allows for LMDZ.UNIVERSAL users to use writediagfi with parallel computations.
These lines are not compiled by casual users of LMDZ.GENERIC (or users of LMDZ.UNIVERSAL in sequential mode).

The precompiling flag NOWRITEDIAGFI is obsolete and has been deleted.

NOTES:

• A better cleaner method might be proposed later
• Added subroutines

A 0 LMDZ.UNIVERSAL/libf/phygeneric/iotd_ecrit.F90
A 0 LMDZ.UNIVERSAL/libf/phygeneric/iophys.F90
A 0 LMDZ.UNIVERSAL/libf/phygeneric/iotd.h
A 0 LMDZ.UNIVERSAL/libf/phygeneric/iotd_ini.F90
A 0 LMDZ.UNIVERSAL/libf/phygeneric/iotd_fin.F90
The iotd_* subroutines are actually supposed to be put in bibio in LMDZ.COMMON
This will be done later once agreed in the team

Location:

trunk

Files:

• LMDZ.GENERIC/README (modified) (1 diff)
• LMDZ.GENERIC/libf/phystd/physiq.F90 (modified) (1 diff)
• LMDZ.GENERIC/libf/phystd/writediagfi.F (modified) (7 diffs)
• LMDZ.UNIVERSAL/README.aymeric (modified) (2 diffs)
• LMDZ.UNIVERSAL/libf/phygeneric/iophys.F90 (added)
• LMDZ.UNIVERSAL/libf/phygeneric/iotd.h (added)
• LMDZ.UNIVERSAL/libf/phygeneric/iotd_ecrit.F90 (added)
• LMDZ.UNIVERSAL/libf/phygeneric/iotd_fin.F90 (added)
• LMDZ.UNIVERSAL/libf/phygeneric/iotd_ini.F90 (added)

trunk/LMDZ.GENERIC/README

@@ -858 +858 @@
 - Fixed a small bug in a diagnostic in the end of calc_rayleigh. Some picky compilers complain.
 - Fixed a small bug with the array noms which is not allocated when tracer is false. But still need in physdem1.
+
+== 10/01/2013 == AS
+Added calls to FH subroutines to output physical fields in parallel. This is under precompiling flags CPP_PARA.
+This allows for LMDZ.UNIVERSAL users to use writediagfi with parallel computations.
+These lines are not compiled by casual users of LMDZ.GENERIC (or users of LMDZ.UNIVERSAL in sequential mode).

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

@@ -1856 +1856 @@
         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

@@ -97 +97 @@
       logical,save :: firstcall=.true.
 
+      integer dimvert
+
 !***************************************************************
 !Sortie des variables au rythme voulu
@@ -108 +110 @@
 !***************************************************************
 
-#ifndef NOWRITEDIAGFI
 
 ! At very first call, check if there is a "diagfi.def" to use and read it
@@ -150 +151 @@
       end if
 
+
 ! Initialisation of 'firstnom' and create/open the "diagfi.nc" NetCDF file
 ! ------------------------------------------------------------------------
@@ -165 +167 @@
          endif
 
+         zitau = -1 ! initialize zitau
+
+#ifdef CPP_PARA
+         !! parallel: we cannot use the usual writediagfi method
+         call iophys_ini
+#else
          ! Create the NetCDF file
          ierr = NF_CREATE(fichnom, NF_CLOBBER, nid)
@@ -187 +195 @@
          call gr_fi_dyn(1,ngrid,iip1,jjp1,phisfi,phis)
          call iniwrite(nid,day_ini,phis)
-         
-         zitau = -1 ! initialize zitau
+
       else
          ! Open the NetCDF file
          ierr = NF_OPEN(fichnom,NF_WRITE,nid)
+#endif
       endif ! if (firstnom.eq.'1234567890')
 
@@ -214 +222 @@
 
       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)
@@ -444 +462 @@
 
         endif ! of if (dim.eq.3) elseif(dim.eq.2)...
+#endif
 
       endif ! of if ( MOD(zitau+1,irythme) .eq.0.)
 
+#ifndef CPP_PARA
       ierr= NF_CLOSE(nid)
-
 #endif
 

trunk/LMDZ.UNIVERSAL/README.aymeric

@@ -32 +32 @@
 
 
-makelmdz_fcm -d 64x48x20 -arch CICLADifort -parallel mpi -p generic -debug -cpp NOWRITEDIAGFI gcm
-makelmdz_fcm -d 64x48x20 -arch CICLADifort -parallel mpi -p generic -cpp NOWRITEDIAGFI gcm
+makelmdz_fcm -d 64x48x20 -arch CICLADifort -parallel mpi -p generic -debug gcm
+makelmdz_fcm -d 64x48x20 -arch CICLADifort -parallel mpi -p generic gcm
 
 
@@ -39 +39 @@
 makegcm -d 64x48x20 -t 2 gcm
 
-makelmdz_fcm -d 128x96x20 -arch GNOMEp -parallel mpi -p generic -cpp NOWRITEDIAGFI gcm
+makelmdz_fcm -d 128x96x20 -arch GNOMEp -parallel mpi -p generic gcm