Changeset 726 for LMDZ4/branches/V3_test/libf/dyn3dpar/leapfrog_p.F

Timestamp:

Nov 6, 2006, 4:51:16 PM (18 years ago)

Author:

Laurent Fairhead

Message:

Modifications pour rendre INCA plus independant de LMDZ ACo
LF

File:

• LMDZ4/branches/V3_test/libf/dyn3dpar/leapfrog_p.F (modified) (6 diffs)

LMDZ4/branches/V3_test/libf/dyn3dpar/leapfrog_p.F

@@ -19 +19 @@
        USE Write_Field_p
        USE vampir
-       
-#ifdef INCA
-      USE transport_controls, ONLY : hadv_flg, mmt_adj
-#endif
 
       IMPLICIT NONE
@@ -76 +72 @@
 #include "academic.h"
 #include "clesphys.h"
-
+#include "advtrac.h"
       
       include 'mpif.h'
@@ -148 +144 @@
 
       REAL alpha(ip1jmp1,llm),beta(ip1jmp1,llm)
-#ifdef INCA_CH4
+#ifdef INCA
       REAL :: flxw(ip1jmp1,llm)
 #endif
@@ -528 +524 @@
 c$OMP PARALLEL DEFAULT(SHARED) 
 c
-#ifdef INCA_CH4
+#ifdef INCA
              CALL caladvtrac_p(q,pbaru,pbarv,
      *                      p, masse, dq,  teta,
      .             flxw,
-     .             pk,
-     .             mmt_adj,
-     .             hadv_flg,iapptrac)
+     .             pk, 
+     .             iapptrac)
 #else
              CALL caladvtrac_p(q,pbaru,pbarv,
@@ -680 +675 @@
      *                               jj_Nb_physic,2,2,Request_physic)
         enddo
-#ifdef INCA_CH4
+#ifdef INCA
         call Register_SwapFieldHallo(flxw,flxw,ip1jmp1,llm,
      *                               jj_Nb_physic,2,2,Request_physic)
@@ -698 +693 @@
      $               ucov,vcov,teta,q,masse,ps,p,pk,phis,phi ,
      $               du,dv,dteta,dq,w,
-#ifdef INCA_CH4
+#ifdef INCA
      $               flxw,
 #endif