Changeset 1546

Timestamp:

May 2, 2016, 11:10:25 AM (9 years ago)

Author:

emillour

Message:

Generic GCM: in local dynamics package

• bug fix in calfis: wrong array (pw) sent to physics: the transfered mass flux should be on the physics grid, not the dynamics grid. Moreover values at the poles needed to be correctly recomputed.

JL+EM

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (2 diffs)
• libf/dynphy_lonlat/calfis.F (modified) (3 diffs)

trunk/LMDZ.GENERIC/README

@@ -1203 +1203 @@
    comgeomphy.F90 instead
 
-== 22/04/2016 ==
+== 22/04/2016 == EM
 - Updates and cleanup wrt dynamics/physics separation:
   Removed init_phys_lmdz.F90 and comgeomphy.F90 from phystd;
@@ -1211 +1211 @@
   Added nrtype.F90 (contains math const. like PI, etc.) in "misc"
 
+== 02/05/2016 == JL+EM
+- bug fix in calfis: wrong array (pw) sent to physics: the transfered
+  mass flux should be on the physics grid, not the dynamics grid.
+  Moreover values at the poles needed to be correctly recomputed.

trunk/LMDZ.GENERIC/libf/dynphy_lonlat/calfis.F

@@ -117 +117 @@
       REAL ztfi(ngridmx,llm),zqfi(ngridmx,llm,nqtot)
 c
-      REAL zvervel(ngridmx,llm)
+!      REAL zvervel(ngridmx,llm)
+      REAL flxwfi(ngridmx,llm) ! vertical mass flux (kg/s) on physics grid
 c
       REAL zdufi(ngridmx,llm),zdvfi(ngridmx,llm)
@@ -333 +334 @@
 c      (dans la couche llm, on garde la valeur à la limite inférieure llm)
 
+! vertical mass flux
+      ! tranfer values from dynamics grid to physics grid:
+      CALL gr_dyn_fi(llm,iip1,jjp1,ngridmx,pw,flxwfi)
+      ! but mass flux is an extensive variable, so take the sum at the poles
+      DO l=1,llm
+        flxwfi(1,l)=sum(pw(1:iim,1,l))
+        flxwfi(ngridmx,l)=sum(pw(1:iim,jjp1,l))
+      ENDDO
+
 c   45. champ u:
 c   ------------
 
-      DO 50 l=1,llm
-
-         DO 25 j=2,jjm
+      DO l=1,llm
+         DO j=2,jjm
             ig0 = 1+(j-2)*iim
             zufi(ig0+1,l)= 0.5 * 
      $      ( pucov(iim,j,l)/cu(iim,j) + pucov(1,j,l)/cu(1,j) )
-            DO 10 i=2,iim
+            DO i=2,iim
                zufi(ig0+i,l)= 0.5 *
      $         ( pucov(i-1,j,l)/cu(i-1,j) + pucov(i,j,l)/cu(i,j) )
-10         CONTINUE
-25      CONTINUE
-
-50    CONTINUE
+            ENDDO
+        ENDDO
+      ENDDO
 
 
@@ -430 +438 @@
      ,     zufi, zvfi,ztfi, zqfi,  
 !     ,     zvervel,
-     ,     pw,
+     ,     flxwfi,
 C - sorties
      s     zdufi, zdvfi, zdtfi, zdqfi,zdpsrf,tracer)