Changeset 2600 for LMDZ5/trunk/libf/dyn3d_common/advxp.F

Timestamp:

Jul 23, 2016, 7:45:38 AM (8 years ago)

Author:

Ehouarn Millour

Message:

Cleanup in the dynamics: turn comvert.h into module comvert_mod.F90
EM

File:

• LMDZ5/trunk/libf/dyn3d_common/advxp.F (modified) (5 diffs)

LMDZ5/trunk/libf/dyn3d_common/advxp.F

@@ -13 +13 @@
 C  parametres principaux du modele
 C
-#include "dimensions.h"
-#include "paramet.h"
-#include "comvert.h"
+      include "dimensions.h"
+      include "paramet.h"
 
        INTEGER ntra
@@ -102 +101 @@
 c         IF (S0(i,j,l,ntra) .lt. 0. ) THEN
 c         PRINT*,'S0(',i,j,l,')=',S0(i,j,l,ntra)
-c            print*, 'SSX(',i,j,l,')=',SSX(i,j,l,ntra)
+c             print*, 'SSX(',i,j,l,')=',SSX(i,j,l,ntra)
 c         print*, 'SY(',i,j,l,')=',SY(i,j,l,ntra)
 c         print*, 'SZ(',i,j,l,')=',SZ(i,j,l,ntra)
@@ -119 +118 @@
       DO j = 1, jjp1
       DO i = 1, iim
-         sqi = sqi + S0(i,j,l,ntra)
+         sqi = sqi + S0(i,j,l,ntra)
       END DO
       END DO
@@ -611 +610 @@
 c      DO 9999 j = 1, jjp1
 c      DO 9999 i = 1, iip1
-c          IF (S0(i,j,l,ntra).lt.0..and.LIMIT) THEN
+c           IF (S0(i,j,l,ntra).lt.0..and.LIMIT) THEN
 c           PRINT*, '-------------------'
-c               PRINT*, 'En fin de ADVXP'
+c                PRINT*, 'En fin de ADVXP'
 c           PRINT*,'S0(',i,j,l,')=',S0(i,j,l,ntra)
-c               print*, 'SSX(',i,j,l,')=',SSX(i,j,l,ntra)
+c                print*, 'SSX(',i,j,l,')=',SSX(i,j,l,ntra)
 c           print*, 'SY(',i,j,l,')=',SY(i,j,l,ntra)
-c               print*, 'SZ(',i,j,l,')=',SZ(i,j,l,ntra)
+c               print*, 'SZ(',i,j,l,')=',SZ(i,j,l,ntra)
 c            WRITE (*,*) 'On arrete !! - pbl en fin de ADVXP'
 c            STOP
@@ -628 +627 @@
          SM(iip1,j,l) = SM(1,j,l)
          S0(iip1,j,l,ntra) = S0(1,j,l,ntra)
-         SSX(iip1,j,l,ntra) = SSX(1,j,l,ntra)
-         SY(iip1,j,l,ntra) = SY(1,j,l,ntra)
-         SZ(iip1,j,l,ntra) = SZ(1,j,l,ntra)
+              SSX(iip1,j,l,ntra) = SSX(1,j,l,ntra)
+             SY(iip1,j,l,ntra) = SY(1,j,l,ntra)
+             SZ(iip1,j,l,ntra) = SZ(1,j,l,ntra)
       END DO
       END DO