Changeset 3903 for dynamico_lmdz

Timestamp:

Feb 3, 2016, 12:18:02 PM (9 years ago)

Author:

ymipsl

Message:

Add gravity wave parametrization management for dynamico grid

YM

File:

• dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/create_etat0_unstruct.f90 (modified) (5 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/create_etat0_unstruct.f90

@@ -32 +32 @@
     
     REAL,    DIMENSION(klon_mpi)             :: tsol_mpi, qsol_mpi, zmasq_mpi, lic_mpi
+    REAL,    DIMENSION(klon_mpi)             :: zmea_mpi, zstd_mpi, zsig_mpi, zgam_mpi, zthe_mpi
 
     INTEGER :: ji,j,i
@@ -40 +41 @@
       CALL xios_recv_field("mask",zmasq_mpi)
       CALL xios_recv_field("landice",lic_mpi)
+      CALL xios_recv_field("zmea",zmea_mpi)
+      CALL xios_recv_field("zstd",zstd_mpi)
+      CALL xios_recv_field("zsig",zsig_mpi)
+      CALL xios_recv_field("zgam",zgam_mpi)
+      CALL xios_recv_field("zthe",zthe_mpi)
     ENDIF
     CALL scatter_omp(tsol_mpi,tsol)
@@ -45 +51 @@
     CALL scatter_omp(zmasq_mpi,zmasq)
     CALL scatter_omp(lic_mpi,lic)
-    
+    CALL scatter_omp(zmea_mpi,zmea)
+    CALL scatter_omp(zstd_mpi,zstd)
+    CALL scatter_omp(zsig_mpi,zsig)
+    CALL scatter_omp(zgam_mpi,zgam)
+    CALL scatter_omp(zthe_mpi,zthe)
+
     rads(:)   = 0.0
     rugmer(:) = 0.001
@@ -81 +92 @@
     pctsrf(:,is_oce)=(1.-zmasq(:))
     WHERE(pctsrf(:,is_oce)<EPSFRA) pctsrf(:,is_oce)=0.
-
+    
+    zval(:)=max(0.,zmea-2*zstd(:))
+    zpic(:)=zmea+2*zstd(:)
+    
 !! WARNING    DON'T FORGET FOR LATER
 !!ym  IF(couple) pctsrf(:,is_oce)=ocemask_fi(:)
@@ -126 +140 @@
     z0m(:,is_oce) = rugmer(:)
 
-!ym for now, no orography parametrization for gravity wave
-!   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) = 1.0e-05
-    z0m(:,is_lic) = 1.0e-05
+   z0m(:,is_ter) = MAX(1.0e-05,zstd(:)*zsig(:)/2.0)
+   z0m(:,is_lic) = MAX(1.0e-05,zstd(:)*zsig(:)/2.0)
 
-    z0m(:,is_sic) = 0.001
-    z0h(:,:)=z0m(:,:)
+   z0m(:,is_sic) = 0.001
+   z0h(:,:)=z0m(:,:)
 
     fder = 0.0