Changeset 2097 for LMDZ5/trunk/libf/phylmd

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/phylmd

Files:

• iophy.F90 (modified) (11 diffs)
• phys_output_mod.F90 (modified) (1 diff)
• phys_output_write_mod.F90 (modified) (3 diffs, 1 prop)

LMDZ5/trunk/libf/phylmd/iophy.F90

@@ -115 +115 @@
     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)
@@ -186 +186 @@
     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)
@@ -250 +250 @@
 
 !$OMP MASTER    
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
     if (is_sequential) then
       call histbeg(name,iim,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
@@ -390 +390 @@
     ENDDO
 
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
      call histbeg(nname,pim,plon,plon_bounds, & 
                            plat,plat_bounds, &
@@ -431 +431 @@
       ENDIF
      ENDDO
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
      call histbeg(nname,npstn,npplon,npplon_bounds, &
                             npplat,npplat_bounds, &
@@ -612 +612 @@
       ENDIF
 #endif
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
 
        IF ( var%flag(iff)<=lev_files(iff) ) THEN
@@ -697 +697 @@
       ENDIF
 #endif
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
 
        IF ( var%flag(iff)<=lev_files(iff) ) THEN
@@ -962 +962 @@
                         ALLOCATE(index2d(iim*jj_nb))
                         ALLOCATE(fieldok(iim*jj_nb))
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
                         CALL histwrite(nid_files(iff),var%name,itau_iophy,Field2d,iim*jj_nb,index2d)
 #endif
@@ -990 +990 @@
                               ENDDO
                        ENDIF ! of IF (is_sequential)
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
                        if (prt_level >= 10) then
                          write(lunout,*)"histwrite2d_phy: clef_stations(iff) and iff==iff_beg, call wxios_write_2D"
@@ -1097 +1097 @@
                         ALLOCATE(fieldok(iim*jj_nb,nlev))
 
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
                         CALL histwrite(nid_files(iff),var%name,itau_iophy,Field3d,iim*jj_nb*nlev,index3d)
 #endif
@@ -1128 +1128 @@
                               ENDDO
                         ENDIF
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
                         CALL histwrite(nid_files(iff),var%name,itau_iophy,fieldok,npstn*nlev,index3d)
 #endif

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -382 +382 @@
           endif
 
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
           if (iff.le.6) then
              CALL histvert(nid_files(iff), "presnivs", "Vertical levels", "Pa", &  

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -1 +1 @@
 !
-! $Header$
+! $Id$
 !
 MODULE phys_output_write_mod
@@ -1319 +1319 @@
        IF(.NOT.vars_defined) THEN
           !$OMP MASTER
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
           DO iff=1,nfiles
              IF (clef_files(iff)) THEN
@@ -1344 +1344 @@
     IF(vars_defined) THEN
        ! On synchronise les fichiers pour IOIPSL
-#ifndef CPP_NO_IOIPSL 
+#ifndef CPP_IOIPSL_NO_OUTPUT 
        !$OMP MASTER
        DO iff=1,nfiles