Changeset 2302 for LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/etat0phys_netcdf.F90

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

File:

• LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/etat0phys_netcdf.F90 (moved) (moved from LMDZ5/trunk/libf/dynlonlat_phylonlat/etat0phys_netcdf.F90) (8 diffs)

LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/etat0phys_netcdf.F90

@@ -36 +36 @@
   USE ioipsl,             ONLY: flininfo, flinopen, flinget, flinclo
   USE assert_eq_m,        ONLY: assert_eq
-#ifdef CPP_EARTH
   USE dimphy
   USE phys_state_var_mod, ONLY: zmea, zstd, zsig, zgam, zthe, zpic, zval, z0m, &
@@ -44 +43 @@
     zmax0,fevap, rnebcon,falb_dir, wake_fip,    agesno,  detr_therm, pbl_tke,  &
     phys_state_var_init
-#endif
 
   PRIVATE
@@ -82 +80 @@
 !-------------------------------------------------------------------------------
   USE control_mod
-#ifdef CPP_EARTH
   USE infotrac
   USE fonte_neige_mod
@@ -93 +90 @@
   USE test_disvert_m, ONLY: test_disvert
   USE grid_atob_m,    ONLY: grille_m
-#endif
   IMPLICIT NONE
 !-------------------------------------------------------------------------------
@@ -100 +96 @@
   REAL,    INTENT(INOUT) :: masque(:,:) !--- Land mask           dim(iip1,jjp1)
   REAL,    INTENT(INOUT) :: phis  (:,:) !--- Ground geopotential dim(iip1,jjp1)
-#ifndef CPP_EARTH
-  WRITE(lunout,*)'etat0phys_netcdf: Earth-specific routine, needs Earth physics'
-#else
 !-------------------------------------------------------------------------------
 ! Local variables:
@@ -315 +308 @@
   CALL histclo()
 
-#endif 
-!#endif of #ifdef CPP_EARTH
-
 END SUBROUTINE etat0phys_netcdf
 !
@@ -323 +313 @@
 
 
-#ifdef CPP_EARTH
 !-------------------------------------------------------------------------------
 !
@@ -550 +539 @@
 !-------------------------------------------------------------------------------
 
-#endif 
-!#endif of #ifdef CPP_EARTH
 
 END MODULE etat0phys