Changeset 2597 for LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90

Timestamp:

Jul 22, 2016, 8:44:47 AM (8 years ago)

Author:

Ehouarn Millour

Message:

Cleanup in the dynamics: get rid of comconst.h, make it a module comconst_mod.
EM

File:

• LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90 (modified) (15 diffs)

LMDZ5/trunk/libf/dyn3dmem/guide_loc_mod.F90

@@ -346 +346 @@
     USE control_mod
     USE write_field_loc
+    USE comconst_mod, ONLY: cpp, daysec, dtvr, kappa
     
     IMPLICIT NONE
@@ -351 +352 @@
     INCLUDE "dimensions.h"
     INCLUDE "paramet.h"
-    INCLUDE "comconst.h"
     INCLUDE "comvert.h"
 
@@ -748 +748 @@
   SUBROUTINE guide_zonave_u(typ,vsize,field)
 
+    USE comconst_mod, ONLY: pi
+    
     IMPLICIT NONE
 
@@ -753 +755 @@
     INCLUDE "paramet.h"
     INCLUDE "comgeom.h"
-    INCLUDE "comconst.h"
     
     ! input/output variables
@@ -819 +820 @@
   SUBROUTINE guide_zonave_v(typ,hsize,vsize,field)
 
+    USE comconst_mod, ONLY: pi
+    
     IMPLICIT NONE
 
@@ -824 +827 @@
     INCLUDE "paramet.h"
     INCLUDE "comgeom.h"
-    INCLUDE "comconst.h"
     
     ! input/output variables
@@ -890 +892 @@
   USE mod_hallo
   USE Bands
+  USE comconst_mod, ONLY: cpp, kappa
   IMPLICIT NONE
 
@@ -896 +899 @@
   include "comvert.h"
   include "comgeom2.h"
-  include "comconst.h"
 
   REAL, DIMENSION (iip1,jjb_u:jje_u),     INTENT(IN) :: psi ! Psol gcm
@@ -1012 +1014 @@
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
         DO l=1,llm
-            DO j=jjbu,jjeu
-                DO i =1, iip1
+            DO j=jjbu,jjeu
+                DO i =1, iip1
                     pls(i,j,l)=(ap(l)+ap(l+1))/2.+psi(i,j)*(bp(l)+bp(l+1))/2.
                 ENDDO
@@ -1030 +1032 @@
    DO l = 1, llm
        DO j=jjbu,jjeu
-        DO i =1, iip1
-            pls(i,j,l) = preff * ( pk(i,j,l)/cpp) ** unskap
-        ENDDO
+           DO i =1, iip1
+               pls(i,j,l) = preff * ( pk(i,j,l)/cpp) ** unskap
+           ENDDO
        ENDDO
    ENDDO
@@ -1302 +1304 @@
         ! Calcul des nouvelles valeurs des niveaux de pression du guidage
         IF (guide_plevs.EQ.1) THEN
-         CALL Register_Hallo_u(psnat1,1,1,2,2,1,Req)
-         CALL Register_Hallo_u(psnat2,1,1,2,2,1,Req)
-         CALL SendRequest(Req)
-!$OMP BARRIER
-         CALL WaitRequest(Req)
+         CALL Register_Hallo_u(psnat1,1,1,2,2,1,Req)
+         CALL Register_Hallo_u(psnat2,1,1,2,2,1,Req)
+         CALL SendRequest(Req)
+!$OMP BARRIER
+         CALL WaitRequest(Req)
 !$OMP BARRIER
 !$OMP DO
@@ -1320 +1322 @@
             ENDDO
         ELSE IF (guide_plevs.EQ.2) THEN
-         CALL Register_Hallo_u(pnat1,llm,1,2,2,1,Req)
-         CALL Register_Hallo_u(pnat2,llm,1,2,2,1,Req)
-         CALL SendRequest(Req)
-!$OMP BARRIER
-         CALL WaitRequest(Req)
+         CALL Register_Hallo_u(pnat1,llm,1,2,2,1,Req)
+         CALL Register_Hallo_u(pnat2,llm,1,2,2,1,Req)
+         CALL SendRequest(Req)
+!$OMP BARRIER
+         CALL WaitRequest(Req)
 !$OMP BARRIER
 !$OMP DO
@@ -1370 +1372 @@
 ! Calcul des constantes de rappel alpha (=1/tau)
 
+    use comconst_mod, only: pi
+    
     implicit none
 
     include "dimensions.h"
     include "paramet.h"
-    include "comconst.h"
     include "comgeom2.h"
     include "serre.h"
@@ -2127 +2130 @@
     USE parallel_lmdz
     USE mod_hallo, ONLY : gather_field_u, gather_field_v
+    USE comconst_mod, ONLY: pi
     IMPLICIT NONE
 
@@ -2133 +2137 @@
     INCLUDE "netcdf.inc"
     INCLUDE "comgeom2.h"
-    INCLUDE "comconst.h"
     INCLUDE "comvert.h"