Changeset 2302

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

Files:

• dyn3d/leapfrog.F (modified) (1 diff)
• dyn3dpar/leapfrog_p.F (modified) (1 diff)
• dynlonlat_phylonlat/phylmd/etat0dyn_netcdf.F90 (modified) (7 diffs)
• dynlonlat_phylonlat/phylmd/etat0phys_netcdf.F90 (moved) (moved from LMDZ5/trunk/libf/dynlonlat_phylonlat/etat0phys_netcdf.F90) (8 diffs)
• phylmd/limit_netcdf.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/dyn3d/leapfrog.F

@@ -443 +443 @@
          IF (ip_ebil_dyn.ge.1 ) THEN 
           ztit='bil dyn'
-! Ehouarn: be careful, diagedyn is Earth-specific (includes ../phylmd/..)!
+! Ehouarn: be careful, diagedyn is Earth-specific!
            IF (planet_type.eq."earth") THEN
-#ifdef CPP_EARTH
             CALL diagedyn(ztit,2,1,1,dtphys
      &    , ucov    , vcov , ps, p ,pk , teta , q(:,:,1), q(:,:,2))
-#endif
            ENDIF
          ENDIF ! of IF (ip_ebil_dyn.ge.1 )

LMDZ5/trunk/libf/dyn3dpar/leapfrog_p.F

@@ -747 +747 @@
       IF (ip_ebil_dyn.ge.1 ) THEN 
           ztit='bil dyn'
-! Ehouarn: be careful, diagedyn is Earth-specific (includes ../phylmd/..)!
+! Ehouarn: be careful, diagedyn is Earth-specific!
            IF (planet_type.eq."earth") THEN
-#ifdef CPP_EARTH
             CALL diagedyn(ztit,2,1,1,dtphys
      &    , ucov    , vcov , ps, p ,pk , teta , q(:,:,1), q(:,:,2))
-#endif
            ENDIF
       ENDIF 

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

@@ -77 +77 @@
   USE control_mod
 #ifdef CPP_PHYS
-#ifdef CPP_EARTH
   USE regr_lat_time_coefoz_m, ONLY: regr_lat_time_coefoz
   USE regr_pr_o3_m,   ONLY: regr_pr_o3
   USE press_coefoz_m, ONLY: press_coefoz
-#endif
 #endif
   USE exner_hyb_m,    ONLY: exner_hyb
@@ -93 +91 @@
   REAL,    INTENT(INOUT) :: masque(iip1,jjp1)   !--- Land-ocean mask
   REAL,    INTENT(INOUT) :: phis  (iip1,jjp1)   !--- Ground geopotential
-!#ifndef CPP_EARTH
-!  WRITE(lunout,*)'etat0dyn_netcdf: Earth-specific routine, needs Earth physics'
-!#else
 !-------------------------------------------------------------------------------
 ! Local variables:
@@ -176 +171 @@
 
 #ifdef CPP_PHYS
-#ifdef CPP_EARTH
 ! Parameterization of ozone chemistry:
 !*******************************************************************************
@@ -188 +182 @@
   END IF
 
-#endif
 #endif
   q3d(iip1,:,:,:)=q3d(1,:,:,:)
@@ -232 +225 @@
   CALL histclo()
 
-!#endif 
-! of ifdef CPP_EARTH
-
 END SUBROUTINE etat0dyn_netcdf
 !
@@ -240 +230 @@
 
 
-!#ifdef CPP_EARTH
 !-------------------------------------------------------------------------------
 !
@@ -763 +752 @@
 !-------------------------------------------------------------------------------
 
-!#endif
-! of ifdef CPP_EARTH
-
 END MODULE etat0dyn
 !

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

LMDZ5/trunk/libf/phylmd/limit_netcdf.F90

@@ -19 +19 @@
   USE control_mod
   USE indice_sol_mod
-#ifdef CPP_EARTH
   USE dimphy
   USE ioipsl,             ONLY : ioget_year_len
@@ -30 +29 @@
   USE netcdf95,    ONLY: nf95_def_var, nf95_put_att, nf95_put_var
   USE grid_atob_m, ONLY: grille_m, rugosite, sea_ice
-#endif
   IMPLICIT NONE
 !-------------------------------------------------------------------------------
@@ -41 +39 @@
   LOGICAL,                    INTENT(IN) :: oldice   ! old way ice computation
   REAL, DIMENSION(iip1,jjp1), INTENT(IN) :: masque   ! land mask
-#ifndef CPP_EARTH
-  CALL abort_gcm('limit_netcdf','Earth-specific routine, needs Earth physics',1)
-#else
 !-------------------------------------------------------------------------------
 ! Local variables:
@@ -648 +643 @@
 
 #endif
-! of #ifdef CPP_EARTH
-
-#endif
 ! of #ifndef CPP_1D
 END SUBROUTINE limit_netcdf