Changeset 2097 for LMDZ5/trunk/libf/phydev

Timestamp:

Jul 21, 2014, 2:39:49 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Changement de nom de clef CPP:
CPP_NO_IOIPSL devient CPP_IOIPSL_NO_OUTPUT pour éviter la confusion. Elle
permet de ne pas sortir les fichiers IOIPSL "proprement"
L'option -io de makelmdz et makelmdz_fcm est changée:
avec la valeur ioipsl, on ne sort que les fichier IOIPSL

mix, on sort les fichiers IOIPSL et XIOS
xios, on ne sort que les fichiers XIOS

---

Change in the name of a CPP key:
CPP_NO_IOIPSL becomes CPP_IOIPSL_NO_OUTPUT. If defined, IOIPSL outputs are not
generated.
The -io option for makelmdz and makelmdz_fcm is changed as well:
with the value ioipsl, only IOIPSL files are output

mix, IOIPSL and XIOS files are output
xios, only XIOS files are output

Location:

LMDZ5/trunk/libf/phydev

Files:

• iophy.F90 (modified) (2 diffs, 1 prop)
• physiq.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phydev/iophy.F90

@@ -1 +1 @@
 !
-! $Id: $
+! $Id$
 !
 module iophy
@@ -114 +114 @@
     endif
     
-#ifndef CPP_NO_IOIPSL
+#ifndef CPP_IOIPSL_NO_OUTPUT
     call flio_dom_set(mpi_size,mpi_rank,ddid,dsg,dsl,dpf,dpl,dhs,dhe, &
                       'APPLE',phys_domain_id)

LMDZ5/trunk/libf/phydev/physiq.F90

@@ -102 +102 @@
   call ymds2ju(1979, 1, 1, 0.0, zjulian)
   dtime=pdtphys
-#ifndef CPP_NO_IOIPSL
+#ifndef CPP_IOIPSL_NO_OUTPUT
   ! Initialize IOIPSL output file
   call histbeg_phy("histins.nc",itau0,zjulian,dtime,nhori,nid_hist)
@@ -109 +109 @@
 !$OMP MASTER
 
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
 ! IOIPSL
   ! define vertical coordinate
@@ -171 +171 @@
 ! write some outputs:
 ! IOIPSL
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
 if (modulo(itau,iwrite_phys)==0) then
   call histwrite_phy(nid_hist,.false.,"temperature",itau,t)