Ignore:
Timestamp:
Jun 17, 2015, 2:46:36 PM (9 years ago)
Author:
Ehouarn Millour
Message:

Move etat0phys_netcdf.F90 to "dynlonlat_phylonlat/phylmd" as it relies on "phylmd" routines.
Some cleanup to remove obsolete and unecessary CPP_EARTH preprocessing condition.
EM

Location:
LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/etat0dyn_netcdf.F90

    r2301 r2302  
    7777  USE control_mod
    7878#ifdef CPP_PHYS
    79 #ifdef CPP_EARTH
    8079  USE regr_lat_time_coefoz_m, ONLY: regr_lat_time_coefoz
    8180  USE regr_pr_o3_m,   ONLY: regr_pr_o3
    8281  USE press_coefoz_m, ONLY: press_coefoz
    83 #endif
    8482#endif
    8583  USE exner_hyb_m,    ONLY: exner_hyb
     
    9391  REAL,    INTENT(INOUT) :: masque(iip1,jjp1)   !--- Land-ocean mask
    9492  REAL,    INTENT(INOUT) :: phis  (iip1,jjp1)   !--- Ground geopotential
    95 !#ifndef CPP_EARTH
    96 !  WRITE(lunout,*)'etat0dyn_netcdf: Earth-specific routine, needs Earth physics'
    97 !#else
    9893!-------------------------------------------------------------------------------
    9994! Local variables:
     
    176171
    177172#ifdef CPP_PHYS
    178 #ifdef CPP_EARTH
    179173! Parameterization of ozone chemistry:
    180174!*******************************************************************************
     
    188182  END IF
    189183
    190 #endif
    191184#endif
    192185  q3d(iip1,:,:,:)=q3d(1,:,:,:)
     
    232225  CALL histclo()
    233226
    234 !#endif
    235 ! of ifdef CPP_EARTH
    236 
    237227END SUBROUTINE etat0dyn_netcdf
    238228!
     
    240230
    241231
    242 !#ifdef CPP_EARTH
    243232!-------------------------------------------------------------------------------
    244233!
     
    763752!-------------------------------------------------------------------------------
    764753
    765 !#endif
    766 ! of ifdef CPP_EARTH
    767 
    768754END MODULE etat0dyn
    769755!
  • LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/etat0phys_netcdf.F90

    r2300 r2302  
    3636  USE ioipsl,             ONLY: flininfo, flinopen, flinget, flinclo
    3737  USE assert_eq_m,        ONLY: assert_eq
    38 #ifdef CPP_EARTH
    3938  USE dimphy
    4039  USE phys_state_var_mod, ONLY: zmea, zstd, zsig, zgam, zthe, zpic, zval, z0m, &
     
    4443    zmax0,fevap, rnebcon,falb_dir, wake_fip,    agesno,  detr_therm, pbl_tke,  &
    4544    phys_state_var_init
    46 #endif
    4745
    4846  PRIVATE
     
    8280!-------------------------------------------------------------------------------
    8381  USE control_mod
    84 #ifdef CPP_EARTH
    8582  USE infotrac
    8683  USE fonte_neige_mod
     
    9390  USE test_disvert_m, ONLY: test_disvert
    9491  USE grid_atob_m,    ONLY: grille_m
    95 #endif
    9692  IMPLICIT NONE
    9793!-------------------------------------------------------------------------------
     
    10096  REAL,    INTENT(INOUT) :: masque(:,:) !--- Land mask           dim(iip1,jjp1)
    10197  REAL,    INTENT(INOUT) :: phis  (:,:) !--- Ground geopotential dim(iip1,jjp1)
    102 #ifndef CPP_EARTH
    103   WRITE(lunout,*)'etat0phys_netcdf: Earth-specific routine, needs Earth physics'
    104 #else
    10598!-------------------------------------------------------------------------------
    10699! Local variables:
     
    315308  CALL histclo()
    316309
    317 #endif
    318 !#endif of #ifdef CPP_EARTH
    319 
    320310END SUBROUTINE etat0phys_netcdf
    321311!
     
    323313
    324314
    325 #ifdef CPP_EARTH
    326315!-------------------------------------------------------------------------------
    327316!
     
    550539!-------------------------------------------------------------------------------
    551540
    552 #endif
    553 !#endif of #ifdef CPP_EARTH
    554541
    555542END MODULE etat0phys
Note: See TracChangeset for help on using the changeset viewer.