Changeset 2839 for LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd

Timestamp:

Mar 30, 2017, 4:16:38 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2785:2838 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90 (modified) (2 diffs)
• libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (2 diffs)
• libf/dynphy_lonlat/phylmd/init_ssrf_m.F90 (modified) (3 diffs)

LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90

@@ -82 +82 @@
   USE fonte_neige_mod
   USE pbl_surface_mod
-  USE regr_lat_time_climoz_m, ONLY: regr_lat_time_climoz
+  USE regr_horiz_time_climoz_m, ONLY: regr_horiz_time_climoz
   USE indice_sol_mod
   USE conf_phys_m, ONLY: conf_phys
@@ -170 +170 @@
   radsol(:) = 0.0                               !--- Net radiation at ground
   rugmer(:) = 0.001                             !--- Ocean rugosity
-  IF(read_climoz>=1) &                          !--- Ozone climatology
-    CALL regr_lat_time_climoz(read_climoz)
+  !--- Ozone (zonal or 3D) interpolation in space and time (if 2nd arg is TRUE)
+  IF(read_climoz>=1) CALL regr_horiz_time_climoz(read_climoz,ok_daily_climoz)
 
 ! Sub-surfaces initialization.

LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -12 +12 @@
                      prad,pg,pr,pcpp,iflag_phys)
   USE dimphy, ONLY: init_dimphy
-  USE comvert_mod, ONLY: preff, ap, bp, presnivs, scaleheight, pseudoalt
   USE inigeomphy_mod, ONLY: inigeomphy
   USE mod_grid_phy_lmdz, ONLY: nbp_lon,nbp_lat,nbp_lev,klon_glo ! number of atmospheric columns (on full grid)
@@ -110 +109 @@
 !$OMP COPYIN(annee_ref, day_ini, day_ref, start_time)
 
-  ! copy over preff , ap(), bp(), etc 
-  CALL init_vertical_layers(nlayer,preff,scaleheight, &
-                            ap,bp,presnivs,pseudoalt)
-
   ! Initialize physical constants in physics:
   CALL inifis(punjours,prad,pg,pr,pcpp)

LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/init_ssrf_m.F90

@@ -9 +9 @@
   USE grid_atob_m,        ONLY: grille_m
   USE ioipsl,             ONLY: flininfo, flinopen, flinget, flinclo
+  USE ioipsl_getin_p_mod, ONLY: getin_p
   USE comconst_mod, ONLY: im, pi
 
@@ -42 +43 @@
   REAL, ALLOCATABLE :: dlat_lic(:), lat_lic(:,:), flic_tmp(:,:), vtmp(:,:)
   REAL              :: date, lev(1), dt, deg2rad
+  LOGICAL           :: no_ter_antartique   ! If true, no land points are allowed at Antartic
 !-------------------------------------------------------------------------------
   deg2rad= pi/180.0
@@ -97 +99 @@
   END DO 
 
+
+  !--- Option no_ter_antartique removes all land fractions souther than 60S.
+  !--- Land ice is set instead of the land fractions on these latitudes.
+  !--- The ocean and sea-ice fractions are not changed.
+  no_ter_antartique=.FALSE.
+  CALL getin_p('no_ter_antartique',no_ter_antartique)
+  WRITE(lunout,*)"no_ter_antartique=",no_ter_antartique
+  IF (no_ter_antartique) THEN
+     ! Remove all land fractions souther than 60S and set land-ice instead
+     WRITE(lunout,*) "Remove land fractions souther than 60deg south by increasing"
+     WRITE(lunout,*) "the continental ice fractions. No land can now be found at Antartic."
+     DO ji=1, klon
+        IF (latitude_deg(ji)<-60.0) THEN
+           pctsrf(ji,is_lic) = pctsrf(ji,is_lic) + pctsrf(ji,is_ter)
+           pctsrf(ji,is_ter) = 0
+        END IF
+     END DO
+  END IF
+
+
 !--- Sub-surface ocean and sea ice (sea ice set to zero for start).
   pctsrf(:,is_oce)=(1.-zmasq(:))