Ignore:
Timestamp:
Nov 28, 2014, 4:36:29 PM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:
LMDZ5/branches/testing
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phydev/iophy.F90

    • Property svn:keywords set to Id
    r2056 r2160  
    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/branches/testing/libf/phydev/physiq.F90

    r2056 r2160  
    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)
Note: See TracChangeset for help on using the changeset viewer.