Changeset 1617


Ignore:
Timestamp:
Feb 28, 2012, 12:35:00 PM (13 years ago)
Author:
Ehouarn Millour
Message:

Minor correction: with previous commits, compilation without physics was no longer possible (because PVtheta calls routine tetalevel, which is in the physics directory). Note also that the levels (hard coded in calfis and calfis_p) given as inputs to PVtheta are Earth-specific. This needs to be cleaned and improved...
EM

Location:
LMDZ5/trunk/libf
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/libf/dyn3d/calfis.F

    r1615 r1617  
    165165      PARAMETER(ntetaSTD=3)
    166166      REAL rtetaSTD(ntetaSTD)
    167       DATA rtetaSTD/350., 380., 405./
     167      DATA rtetaSTD/350., 380., 405./ ! Earth-specific values, beware !!
    168168      REAL PVteta(ngridmx,ntetaSTD)
    169169c
     
    434434c
    435435      if (planet_type=="earth") then
     436#ifdef CPP_PHYS
     437! PVtheta calls tetalevel, which is in the physics
    436438cIM calcul PV a teta=350, 380, 405K
    437439      CALL PVtheta(ngridmx,llm,pucov,pvcov,pteta,
    438440     $           ztfi,zplay,zplev,
    439441     $           ntetaSTD,rtetaSTD,PVteta)
     442#endif
    440443      endif
    441444c
  • LMDZ5/trunk/libf/dyn3dpar/calfis_p.F

    r1615 r1617  
    143143      REAL clesphy0( longcles )
    144144
     145#ifdef CPP_PHYS
     146! Ehouarn: for now calfis_p needs some informations from physics to compile
    145147c    Local variables :
    146148c    -----------------
     
    218220      PARAMETER(ntetaSTD=3)
    219221      REAL rtetaSTD(ntetaSTD)
    220       DATA rtetaSTD/350., 380., 405./
     222      DATA rtetaSTD/350., 380., 405./ ! Earth-specific values, beware !!
    221223      REAL PVteta(klon,ntetaSTD)
    222224     
     
    486488
    487489      IF (is_sequential.and.(planet_type=="earth")) THEN
     490#ifdef CPP_PHYS
     491! PVtheta calls tetalevel, which is in the physics
    488492cIM calcul PV a teta=350, 380, 405K
    489493        CALL PVtheta(ngridmx,llm,pucov,pvcov,pteta,
     
    491495     $           ntetaSTD,rtetaSTD,PVteta)
    492496c
     497#endif
    493498      ENDIF
    494499
     
    11051110      firstcal = .FALSE.
    11061111
     1112#else
     1113      write(lunout,*)
     1114     & "calfis_p: for now can only work with parallel physics"
     1115      stop
     1116#endif
     1117! of #ifdef CPP_PHYS
    11071118      RETURN
    11081119      END
Note: See TracChangeset for help on using the changeset viewer.