Changeset 2336 for LMDZ5/trunk/libf/dyn3dmem/convmas2_loc.F90

Timestamp:

Jul 31, 2015, 7:22:21 PM (9 years ago)

Author:

dcugnet

Message:

• Add parallel capability for ce0l.
• Small bug in grid_noro fixed (smoothed topography was used instead of unsmoothed one for geopotential computation at north pole).
• Removed average of mass at poles in etat0dyn_netcdf after start_init_dyn => different results in the zoomed grid case.
• ok_etat0=n and ok_limit=y combination now works fine (if no initial state is needed, but only limit.nc file). This required:
  • to move grid_noro0 and start_init_noro0 subroutines from etat0dyn_netcdf.F90 to limit_netcdf.F90
  • to create init_ssrf_m.F90 file, so that sub-surfaces can be initialized from limit_netcdf.F90 without any etat0*_netcdf routines call).
• Simplified somehow the corresponding code, in particular: 1) removed obsolete flags "oldice". 2) removed flag "ibar": barycentric interpolation is used everywhere (except in start_init_subsurf, still calling grille_m - to be changed soon). 3) removed useless CPP_PHY precompilation directives, considering the possibility to run ce0l without physics is useless (ce0l is dedicated to Earth physics).

File:

• LMDZ5/trunk/libf/dyn3dmem/convmas2_loc.F90 (moved) (moved from LMDZ5/trunk/libf/dyn3dmem/convmas2_loc.F) (1 diff)

LMDZ5/trunk/libf/dyn3dmem/convmas2_loc.F90

@@ -1 @@
-      SUBROUTINE convmas2_loc ( convm )
-c
-      USE parallel_lmdz
-      IMPLICIT NONE
+SUBROUTINE convmas2_loc (convm)
+!
+!-------------------------------------------------------------------------------
+! Authors: P. Le Van , Fr. Hourdin.
+!-------------------------------------------------------------------------------
+! Purpose: Compute mass flux convergence at p levels.
+!          Equivalent to convmas_loc if convmas1_loc is called before.
+  USE parallel_lmdz
+  IMPLICIT NONE
+  include "dimensions.h"
+  include "paramet.h"
+  include "comgeom.h"
+  include "logic.h"
+!===============================================================================
+! Arguments:
+  REAL, INTENT(INOUT) :: convm(ijb_u:ije_u,llm)
+!===============================================================================
+! Method used:   Computation from top to bottom.
+!   Mass convergence at level llm is equal to zero and is not stored in convm.
+!===============================================================================
+! Local variables:
+  INTEGER :: l, ijb, ije
+!===============================================================================
 
-c=======================================================================
-c
-c   Auteurs:  P. Le Van , F. Hourdin  .
-c   -------
-c
-c   Objet:
-c   ------
-c
-c   ********************************************************************
-c   .... calcul de la convergence du flux de masse aux niveaux p ...
-c   ********************************************************************
-c
-c
-c     pbaru  et  pbarv  sont des arguments d'entree pour le s-pg  ....
-c      .....  convm      est  un argument de sortie pour le s-pg  ....
-c
-c    le calcul se fait de haut en bas, 
-c    la convergence de masse au niveau p(llm+1) est egale a 0. et
-c    n'est pas stockee dans le tableau convm .
-c
-c
-c=======================================================================
-c
-c   Declarations:
-c   -------------
+!$OMP MASTER
+!--- Mass convergence is integrated from top to bottom
+  ijb=ij_begin
+  ije=ij_end+iip1
+  IF(pole_sud) ije=ij_end
+  DO l=llmm1,1,-1
+    convm(ijb:ije,l) = convm(ijb:ije,l) + convm(ijb:ije,l+1)
+  END DO
+!$OMP END MASTER
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
-#include "logic.h"
+END SUBROUTINE convmas2_loc
 
-      REAL pbaru( ijb_u:ije_u,llm ),pbarv( ijb_v:ije_v,llm )
-      REAL :: convm(  ijb_u:ije_u,llm )
-      INTEGER   l,ij
-      INTEGER ijb,ije,jjb,jje
- 
-c$OMP MASTER
-c    integration de la convergence de masse de haut  en bas ......
-       ijb=ij_begin
-       ije=ij_end+iip1
-       if (pole_sud) ije=ij_end
-            
-      DO      l      = llmm1, 1, -1
-        DO    ij     = ijb, ije
-         convm(ij,l) = convm(ij,l) + convm(ij,l+1)
-        ENDDO
-      ENDDO
-c
-c$OMP END MASTER
-      RETURN
-      END