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

Timestamp:

Nov 19, 2021, 4:58:59 PM (3 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/dynphy_lonlat/calfis_p.F (deleted)
• libf/dynphy_lonlat/inigeomphy_mod.F90 (modified) (4 diffs)
• libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90 (modified) (3 diffs)
• libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (6 diffs)
• libf/dynphy_lonlat/phymar (deleted)

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

@@ -93 +93 @@
   ALLOCATE(boundslat_reg(jjm+1,2))
   
-  DO i=1,iim
-   boundslon_reg(i,east)=rlonu(i+1) 
-   boundslon_reg(i,west)=rlonu(i) 
+  ! specific handling of the -180 longitude scalar grid point boundaries
+  boundslon_reg(1,east)=rlonu(1)
+  boundslon_reg(1,west)=rlonu(iim)-2*PI
+  DO i=2,iim
+   boundslon_reg(i,east)=rlonu(i) 
+   boundslon_reg(i,west)=rlonu(i-1) 
   ENDDO
 
@@ -124 +127 @@
     cufi_glo(1) = cu(1)
     cvfi_glo(1) = cv(1)
-    boundslonfi_glo(1,north_east)=0
+    boundslonfi_glo(1,north_east)=PI
     boundslatfi_glo(1,north_east)=PI/2
-    boundslonfi_glo(1,north_west)=2*PI
+    boundslonfi_glo(1,north_west)=-PI
     boundslatfi_glo(1,north_west)=PI/2
-    boundslonfi_glo(1,south_west)=2*PI
+    boundslonfi_glo(1,south_west)=-PI
     boundslatfi_glo(1,south_west)=rlatv(1)
-    boundslonfi_glo(1,south_east)=0
+    boundslonfi_glo(1,south_east)=PI
     boundslatfi_glo(1,south_east)=rlatv(1)
     DO j=2,jjm
@@ -141 +144 @@
         boundslonfi_glo(k,north_east)=rlonu(i)
         boundslatfi_glo(k,north_east)=rlatv(j-1)
-        boundslonfi_glo(k,north_west)=rlonu(i+1)
+        if (i.eq.1) then
+          ! special case for the first longitude's west bound
+          boundslonfi_glo(k,north_west)=rlonu(iim)-2*PI
+          boundslonfi_glo(k,south_west)=rlonu(iim)-2*PI
+        else
+          boundslonfi_glo(k,north_west)=rlonu(i-1)
+          boundslonfi_glo(k,south_west)=rlonu(i-1)
+        endif
         boundslatfi_glo(k,north_west)=rlatv(j-1)
-        boundslonfi_glo(k,south_west)=rlonu(i+1)
         boundslatfi_glo(k,south_west)=rlatv(j)
         boundslonfi_glo(k,south_east)=rlonu(i)
@@ -154 +163 @@
     cufi_glo(klon_glo) = cu((iim+1)*jjm+1)
     cvfi_glo(klon_glo) = cv((iim+1)*jjm-iim)
-    boundslonfi_glo(klon_glo,north_east)= 0
+    boundslonfi_glo(klon_glo,north_east)= PI
     boundslatfi_glo(klon_glo,north_east)= rlatv(jjm)
-    boundslonfi_glo(klon_glo,north_west)= 2*PI
+    boundslonfi_glo(klon_glo,north_west)= -PI
     boundslatfi_glo(klon_glo,north_west)= rlatv(jjm)
-    boundslonfi_glo(klon_glo,south_west)= 2*PI
+    boundslonfi_glo(klon_glo,south_west)= -PI
     boundslatfi_glo(klon_glo,south_west)= -PI/2
-    boundslonfi_glo(klon_glo,south_east)= 0
+    boundslonfi_glo(klon_glo,south_east)= PI
     boundslatfi_glo(klon_glo,south_east)= -Pi/2
 

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

@@ -119 +119 @@
   INTEGER :: flag_aerosol
   INTEGER :: flag_aerosol_strat
+  INTEGER :: flag_volc_surfstrat
   LOGICAL :: flag_aer_feedback
   LOGICAL :: flag_bc_internal_mixture
@@ -138 +139 @@
                    iflag_cldcon,                                        &
                    iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs,            &
-                   ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan,          &
-                   aerosol_couple,                                      &
-                   chemistry_couple, flag_aerosol, flag_aerosol_strat,  & 
-                   flag_aer_feedback,                                   &
-                   flag_bc_internal_mixture, bl95_b0, bl95_b1, &
+                   ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, flag_volc_surfstrat,     &
+                   aerosol_couple, chemistry_couple, flag_aerosol, flag_aerosol_strat,  & 
+                   flag_aer_feedback, flag_bc_internal_mixture, bl95_b0, bl95_b1,       &
                    read_climoz, alp_offset)
   CALL phys_state_var_init(read_climoz)
@@ -240 +239 @@
  
   z0m(:,is_oce) = rugmer(:)
-  z0m(:,is_ter) = MAX(1.0e-05,zstd(:)*zsig(:)/2.0)
-  z0m(:,is_lic) = MAX(1.0e-05,zstd(:)*zsig(:)/2.0)
+  z0m(:,is_ter) = 0.01 !MAX(1.0e-05,zstd(:)*zsig(:)/2.0)
+  z0m(:,is_lic) = 0.001 !MAX(1.0e-05,zstd(:)*zsig(:)/2.0)
   z0m(:,is_sic) = 0.001
   z0h(:,:)=z0m(:,:)

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

@@ -16 +16 @@
   USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid)
   USE vertical_layers_mod, ONLY : init_vertical_layers
-  USE infotrac, ONLY: nqtot,nqo,nbtr,tname,ttext,type_trac,&
+  USE infotrac, ONLY: nqtot,nqo,nbtr,nqCO2,tname,ttext,type_trac,&
                       niadv,conv_flg,pbl_flg,solsym,&
                       nqfils,nqdesc,nqdesc_tot,iqfils,iqpere,&
@@ -24 +24 @@
                       iso_indnum,zone_num,phase_num,&
                       indnum_fn_num,index_trac,&
-                      niso,ntraceurs_zone,ntraciso
+                      niso,ntraceurs_zone,ntraciso,nqtottr,itr_indice
 #ifdef CPP_StratAer
   USE infotrac, ONLY: nbtr_bin, nbtr_sulgas, id_OCS_strat, &
@@ -146 +146 @@
 
   ! Initialize tracer names, numbers, etc. for physics
-  CALL init_infotrac_phy(nqtot,nqo,nbtr,tname,ttext,type_trac,&
+  CALL init_infotrac_phy(nqtot,nqo,nbtr,nqtottr,nqCO2,tname,ttext,type_trac,&
                          niadv,conv_flg,pbl_flg,solsym,&
                          nqfils,nqdesc,nqdesc_tot,iqfils,iqpere,&
@@ -154 +154 @@
                          iso_indnum,zone_num,phase_num,&
                          indnum_fn_num,index_trac,&
-                         niso,ntraceurs_zone,ntraciso&
+                         niso,ntraceurs_zone,ntraciso,itr_indice &
 #ifdef CPP_StratAer
                          ,nbtr_bin,nbtr_sulgas&
@@ -172 +172 @@
 !$OMP END PARALLEL
 
-  IF (type_trac == 'inca') THEN
+  IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN
 #ifdef INCA
      call init_const_lmdz( &
@@ -198 +198 @@
   END IF
 
-  IF (type_trac == 'inca') THEN
+  IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN
 #ifdef INCA
      CALL init_inca_dim(klon_omp,nbp_lev,nbp_lon,nbp_lat - 1, &