Changeset 2097


Ignore:
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
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/phydev/iophy.F90

    • Property svn:keywords set to Id
    r2002 r2097  
    11!
    2 ! $Id: $
     2! $Id$
    33!
    44module iophy
    … …  
    114114    endif
    115115   
    116 #ifndef CPP_NO_IOIPSL
     116#ifndef CPP_IOIPSL_NO_OUTPUT
    117117    call flio_dom_set(mpi_size,mpi_rank,ddid,dsg,dsl,dpf,dpl,dhs,dhe, &
    118118                      'APPLE',phys_domain_id)

  • LMDZ5/trunk/libf/phydev/physiq.F90

    r2037 r2097  
    102102  call ymds2ju(1979, 1, 1, 0.0, zjulian)
    103103  dtime=pdtphys
    104 #ifndef CPP_NO_IOIPSL
     104#ifndef CPP_IOIPSL_NO_OUTPUT
    105105  ! Initialize IOIPSL output file
    106106  call histbeg_phy("histins.nc",itau0,zjulian,dtime,nhori,nid_hist)
    … …  
    109109!$OMP MASTER
    110110
    111 #ifndef CPP_NO_IOIPSL
     111#ifndef CPP_IOIPSL_NO_OUTPUT
    112112! IOIPSL
    113113  ! define vertical coordinate
    … …  
    171171! write some outputs:
    172172! IOIPSL
    173 #ifndef CPP_NO_IOIPSL
     173#ifndef CPP_IOIPSL_NO_OUTPUT
    174174if (modulo(itau,iwrite_phys)==0) then
    175175  call histwrite_phy(nid_hist,.false.,"temperature",itau,t)

  • LMDZ5/trunk/libf/phylmd/iophy.F90

    r2002 r2097  
    115115    ENDIF
    116116
    117 #ifndef CPP_NO_IOIPSL   
     117#ifndef CPP_IOIPSL_NO_OUTPUT   
    118118    CALL flio_dom_set(mpi_size,mpi_rank,ddid,dsg,dsl,dpf,dpl,dhs,dhe, &
    119119                      'APPLE',phys_domain_id)
    … …  
    186186    endif
    187187   
    188 #ifndef CPP_NO_IOIPSL
     188#ifndef CPP_IOIPSL_NO_OUTPUT
    189189    call flio_dom_set(mpi_size,mpi_rank,ddid,dsg,dsl,dpf,dpl,dhs,dhe, &
    190190                      'APPLE',phys_domain_id)
    … …  
    250250
    251251!$OMP MASTER   
    252 #ifndef CPP_NO_IOIPSL
     252#ifndef CPP_IOIPSL_NO_OUTPUT
    253253    if (is_sequential) then
    254254      call histbeg(name,iim,io_lon, jj_nb,io_lat(jj_begin:jj_end), &
    … …  
    390390    ENDDO
    391391
    392 #ifndef CPP_NO_IOIPSL
     392#ifndef CPP_IOIPSL_NO_OUTPUT
    393393     call histbeg(nname,pim,plon,plon_bounds, &
    394394                           plat,plat_bounds, &
    … …  
    431431      ENDIF
    432432     ENDDO
    433 #ifndef CPP_NO_IOIPSL
     433#ifndef CPP_IOIPSL_NO_OUTPUT
    434434     call histbeg(nname,npstn,npplon,npplon_bounds, &
    435435                            npplat,npplat_bounds, &
    … …  
    612612      ENDIF
    613613#endif
    614 #ifndef CPP_NO_IOIPSL
     614#ifndef CPP_IOIPSL_NO_OUTPUT
    615615
    616616       IF ( var%flag(iff)<=lev_files(iff) ) THEN
    … …  
    697697      ENDIF
    698698#endif
    699 #ifndef CPP_NO_IOIPSL
     699#ifndef CPP_IOIPSL_NO_OUTPUT
    700700
    701701       IF ( var%flag(iff)<=lev_files(iff) ) THEN
    … …  
    962962                        ALLOCATE(index2d(iim*jj_nb))
    963963                        ALLOCATE(fieldok(iim*jj_nb))
    964 #ifndef CPP_NO_IOIPSL
     964#ifndef CPP_IOIPSL_NO_OUTPUT
    965965                        CALL histwrite(nid_files(iff),var%name,itau_iophy,Field2d,iim*jj_nb,index2d)
    966966#endif
    … …  
    990990                              ENDDO
    991991                       ENDIF ! of IF (is_sequential)
    992 #ifndef CPP_NO_IOIPSL
     992#ifndef CPP_IOIPSL_NO_OUTPUT
    993993                       if (prt_level >= 10) then
    994994                         write(lunout,*)"histwrite2d_phy: clef_stations(iff) and iff==iff_beg, call wxios_write_2D"
    … …  
    10971097                        ALLOCATE(fieldok(iim*jj_nb,nlev))
    10981098
    1099 #ifndef CPP_NO_IOIPSL
     1099#ifndef CPP_IOIPSL_NO_OUTPUT
    11001100                        CALL histwrite(nid_files(iff),var%name,itau_iophy,Field3d,iim*jj_nb*nlev,index3d)
    11011101#endif
    … …  
    11281128                              ENDDO
    11291129                        ENDIF
    1130 #ifndef CPP_NO_IOIPSL
     1130#ifndef CPP_IOIPSL_NO_OUTPUT
    11311131                        CALL histwrite(nid_files(iff),var%name,itau_iophy,fieldok,npstn*nlev,index3d)
    11321132#endif

  • LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

    r2095 r2097  
    382382          endif
    383383
    384 #ifndef CPP_NO_IOIPSL
     384#ifndef CPP_IOIPSL_NO_OUTPUT
    385385          if (iff.le.6) then
    386386             CALL histvert(nid_files(iff), "presnivs", "Vertical levels", "Pa", & 

  • LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

    • Property svn:keywords set to Id
    r2095 r2097  
    11!
    2 ! $Header$
     2! $Id$
    33!
    44MODULE phys_output_write_mod
    … …  
    13191319       IF(.NOT.vars_defined) THEN
    13201320          !$OMP MASTER
    1321 #ifndef CPP_NO_IOIPSL
     1321#ifndef CPP_IOIPSL_NO_OUTPUT
    13221322          DO iff=1,nfiles
    13231323             IF (clef_files(iff)) THEN
    … …  
    13441344    IF(vars_defined) THEN
    13451345       ! On synchronise les fichiers pour IOIPSL
    1346 #ifndef CPP_NO_IOIPSL
     1346#ifndef CPP_IOIPSL_NO_OUTPUT
    13471347       !$OMP MASTER
    13481348       DO iff=1,nfiles

  • LMDZ5/trunk/makelmdz

    r2032 r2097  
    107107[-parallel none/mpi/omp/mpi_omp] : parallelism (default: none) : mpi, openmp or mixted mpi_openmp
    108108[-g GRI]                   : grid configuration in dyn3d/GRI_xy.h  (default: reg, inclues a zoom)
    109 [-io IO]                   : Input/Output library (default: ioipsl)
     109[-io ioipsl/mix/xios]                   : Input/Output library (default: ioipsl)
    110110[-include INCLUDES]        : extra include path to add
    111111[-cpp CPP_KEY]             : additional preprocessing definitions
    … …  
    384384   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    385385   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
    386 elif [[ $io == xios ]]
     386elif [[ $io == mix ]]
    387387then
    388388   # For now, xios implies also using ioipsl
    389389   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
     390   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
     391   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
     392elif [[ $io == xios ]]
     393then
     394   # For now, xios implies also using ioipsl
     395   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
    390396   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    391397   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"

  • LMDZ5/trunk/makelmdz_fcm

    r2084 r2097  
    7979[-parallel none/mpi/omp/mpi_omp] : parallelism (default: none) : mpi, openmp or mixted mpi_openmp
    8080[-g GRI]                   : grid configuration in dyn3d/GRI_xy.h  (default: reg, inclues a zoom)
    81 [-io IO]                   : Input/Output library (default: ioipsl)
     81[-io ioipsl/mix/xios]                   : Input/Output library (default: ioipsl)
    8282[-include INCLUDES]        : extra include path to add
    8383[-cpp CPP_KEY]             : additional preprocessing definitions
    … …  
    321321   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    322322   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
    323 elif [[ $io == xios ]]
     323elif [[ $io == mix ]]
    324324then
    325325   # For now, xios implies also using ioipsl
    326326   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
     327   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
     328   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
     329elif [[ $io == xios ]]
     330then
     331   # For now, xios implies also using ioipsl
     332   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
    327333   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    328334   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
Note: See TracChangeset for help on using the changeset viewer.