Changeset 3605 for LMDZ6/branches/Ocean_skin/libf/dynphy_lonlat

Timestamp:

Nov 21, 2019, 4:43:45 PM (5 years ago)

Author:

lguez

Message:

Merge revisions 3427:3600 of trunk into branch Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/dynphy_lonlat/inigeomphy_mod.F90 (modified) (4 diffs)
• libf/dynphy_lonlat/phydev/iniphysiq_mod.F90 (modified) (1 diff)
• libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90 (modified) (1 diff)
• libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90 (modified) (8 diffs)
• libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (4 diffs)

LMDZ6/branches/Ocean_skin/libf/dynphy_lonlat/inigeomphy_mod.F90

@@ -76 +76 @@
   REAL,ALLOCATABLE,SAVE :: boundslonfi(:,:)
   REAL,ALLOCATABLE,SAVE :: boundslatfi(:,:)
-!$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi)
+  INTEGER,ALLOCATABLE,SAVE :: ind_cell_glo_fi(:)
+!$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi,ind_cell_glo_fi)
 
   ! Initialize Physics distibution and parameters and interface with dynamics
@@ -93 +94 @@
   
   DO i=1,iim
+   boundslon_reg(i,east)=rlonu(i+1) 
    boundslon_reg(i,west)=rlonu(i) 
-   boundslon_reg(i,east)=rlonu(i+1) 
   ENDDO
 
@@ -204 +205 @@
   ALLOCATE(boundslonfi(klon_omp,4))
   ALLOCATE(boundslatfi(klon_omp,4))
+  ALLOCATE(ind_cell_glo_fi(klon_omp))
 
 
@@ -214 +216 @@
   boundslonfi(1:klon_omp,:) = boundslonfi_glo(offset+klon_omp_begin:offset+klon_omp_end,:)
   boundslatfi(1:klon_omp,:) = boundslatfi_glo(offset+klon_omp_begin:offset+klon_omp_end,:)
+  ind_cell_glo_fi(1:klon_omp)=(/ (i,i=offset+klon_omp_begin,offset+klon_omp_end) /)
 
   ! copy over local grid longitudes and latitudes
   CALL init_geometry(klon_omp,lonfi,latfi,boundslonfi,boundslatfi, &
-                     airefi,cufi,cvfi)
+                     airefi,ind_cell_glo_fi,cufi,cvfi)
 
   ! copy over preff , ap(), bp(), etc 

LMDZ6/branches/Ocean_skin/libf/dynphy_lonlat/phydev/iniphysiq_mod.F90

@@ -71 +71 @@
   CALL inifis(prad,pg,pr,pcpp)
   
-  ! Initialize dimphy module
-  CALL Init_dimphy(klon_omp,nlayer)
-
   ! Initialize tracer names, numbers, etc. for physics
   CALL init_infotrac_phy(nqtot,type_trac)

LMDZ6/branches/Ocean_skin/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90

@@ -100 +100 @@
 
   deg2rad = pi/180.0
-
+  y(:,:,:)=0  !ym warning unitialized variable
+  
 ! Compute psol AND tsol, knowing phis.
 !*******************************************************************************

LMDZ6/branches/Ocean_skin/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90

@@ +1 @@
+!
+! $Id$
+!
 MODULE etat0phys
 !
@@ -40 +43 @@
   USE phys_state_var_mod, ONLY: zmea, zstd, zsig, zgam, zthe, zpic, zval, z0m, &
           solsw, radsol, t_ancien, wake_deltat, wake_s,  rain_fall, qsol, z0h, &
-          sollw, rugoro, q_ancien, wake_deltaq, wake_pe, snow_fall, ratqs,w01, &
+          sollw,sollwdown, rugoro, q_ancien, wake_deltaq, wake_pe, snow_fall, ratqs,w01, &
     sig1, ftsol, clwcon, fm_therm, wake_Cstar,  pctsrf,  entr_therm,radpas, f0,&
-    zmax0,fevap, rnebcon,falb_dir, wake_fip,    agesno,  detr_therm, pbl_tke,  &
+    zmax0,fevap, rnebcon,falb_dir, falb_dif, wake_fip,    agesno,  detr_therm, pbl_tke,  &
     phys_state_var_init, ql_ancien, qs_ancien, prlw_ancien, prsw_ancien, &
-    prw_ancien
+    prw_ancien, u10m,v10m, treedrg, u_ancien, v_ancien, wake_delta_pbl_TKE, wake_dens, &
+    ale_bl, ale_bl_trig, alp_bl, &
+    ale_wake, ale_bl_stat
+
   USE comconst_mod, ONLY: pi, dtvr
 
@@ -110 +116 @@
   INTEGER :: iflag_radia, iflag_cldcon, iflag_ratqs
   REAL    :: ratqsbas, ratqshaut, tau_ratqs
-  LOGICAL :: ok_ade, ok_aie, ok_alw, ok_cdnc, aerosol_couple, chemistry_couple
+  LOGICAL :: ok_ade, ok_aie, ok_volcan, ok_alw, ok_cdnc, aerosol_couple, chemistry_couple
   INTEGER :: flag_aerosol
   INTEGER :: flag_aerosol_strat
@@ -133 +139 @@
                    iflag_cldcon,                                        &
                    iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs,            &
-                   ok_ade, ok_aie, ok_alw, ok_cdnc, aerosol_couple,     &
+                   ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan,          &
+                   aerosol_couple,                                      &
                    chemistry_couple, flag_aerosol, flag_aerosol_strat,  & 
                    flag_aer_feedback,                                   &
@@ -194 +201 @@
   falb_dir(:, :, is_oce) = 0.5
   falb_dir(:, :, is_sic) = 0.6
+
+!ym warning missing init for falb_dif => set to 0
+  falb_dif(:,:,:)=0
+
+  u10m(:,:)=0  
+  v10m(:,:)=0  
+  treedrg(:,:,:)=0
+
   fevap(:,:) = 0.
   DO i=1,nbsrf; qsolsrf(:,i)=150.; END DO
@@ -201 +216 @@
   solsw      = 165.
   sollw      = -53.
+!ym warning missing init for sollwdown => set to 0
+  sollwdown  = 0.
   t_ancien   = 273.15
   q_ancien   = 0.
@@ -209 +226 @@
   prw_ancien = 0.
   agesno     = 0.
-
+  
+  u_ancien = 0.
+  v_ancien = 0.
+  wake_delta_pbl_TKE(:,:,:)=0
+  wake_dens(:)=0
+  ale_bl = 0.
+  ale_bl_trig =0.
+  alp_bl=0.
+  ale_wake=0.
+  ale_bl_stat=0.
+  
+  z0m(:,:)=0 ! ym missing 5th subsurface initialization
+ 
   z0m(:,is_oce) = rugmer(:)
   z0m(:,is_ter) = MAX(1.0e-05,zstd(:)*zsig(:)/2.0)
@@ -315 +344 @@
   ALLOCATE(zmea0(iml,jml),zstd0(iml,jml)) !--- Mean orography and std deviation
   ALLOCATE(zsig0(iml,jml),zgam0(iml,jml)) !--- Slope and nisotropy
+  zsig0(:,:)=0   !ym uninitialized variable
+  zgam0(:,:)=0   !ym uninitialized variable
   ALLOCATE(zthe0(iml,jml))                !--- Highest slope orientation
+  zthe0(:,:)=0   !ym uninitialized variable
   ALLOCATE(zpic0(iml,jml),zval0(iml,jml)) !--- Peaks and valley heights
 

LMDZ6/branches/Ocean_skin/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -31 +31 @@
   USE inifis_mod, ONLY: inifis
   USE time_phylmdz_mod, ONLY: init_time
-  USE temps_mod, ONLY: annee_ref, day_ini, day_ref, start_time, calend
+  USE temps_mod, ONLY: annee_ref, day_ini, day_ref, start_time, calend, year_len
   USE infotrac_phy, ONLY: init_infotrac_phy
   USE phystokenc_mod, ONLY: init_phystokenc
   USE phyaqua_mod, ONLY: iniaqua
+  USE comconst_mod, ONLY: omeg, rad
 #ifdef INCA
   USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic
@@ -118 +119 @@
 
   ! Initialize dimphy module (unless in 1D where it has already been done)
-  IF (klon_glo>1) CALL Init_dimphy(klon_omp,nlayer)
+!  IF (klon_glo>1) CALL Init_dimphy(klon_omp,nlayer)
 
   ! Copy over "offline" settings
@@ -134 +135 @@
                                   cu,cuvsurcv,cv,cvusurcu, &
                                   aire,apoln,apols, &
-                                  aireu,airev,rlatvdyn) 
+                                  aireu,airev,rlatvdyn,rad,omeg) 
   END IF
 
@@ -172 +173 @@
   ! Additional initializations for aquaplanets 
   IF (iflag_phys>=100) THEN
-    CALL iniaqua(klon_omp,iflag_phys)
+    CALL iniaqua(klon_omp,year_len,iflag_phys)
   END IF