Changeset 2641 for LMDZ5/branches/testing/libf/filtrez

Timestamp:

Sep 29, 2016, 11:26:46 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2593:2640 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/filtrez/filtreg_mod.F90 (modified) (2 diffs)
• libf/filtrez/inifgn.F (modified) (2 diffs)

LMDZ5/branches/testing/libf/filtrez/filtreg_mod.F90

@@ -14 +14 @@
   USE mod_filtre_fft_loc, ONLY : Init_filtre_fft_loc=>Init_filtre_fft    !
 #endif
+  USE serre_mod, ONLY: alphax
+  USE logic_mod, ONLY: fxyhypb, ysinus
     !    ... H. Upadhyaya, O.Sharma   ...
     !
@@ -22 +24 @@
     !     Correction  le 28/10/97    P. Le Van .
     !  -------------------------------------------------------------------
-#include "dimensions.h"
-#include "paramet.h"
+    include "dimensions.h"
+    include "paramet.h"
     !  -------------------------------------------------------------------
-#include "comgeom.h"
-#include "coefils.h"
-#include "logic.h"
-#include "serre.h"
+    include "comgeom.h"
+    include "coefils.h"
 
     REAL  dlonu(iim),dlatu(jjm)

LMDZ5/branches/testing/libf/filtrez/inifgn.F

@@ -8 +8 @@
       IMPLICIT NONE
 c
-#include "dimensions.h"
-#include "paramet.h"
-#include "comgeom.h"
-#include "serre.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
 
 c
@@ -20 +19 @@
       INTEGER i,j,k,imm1,nrot
 C
-#include "coefils.h"
+      include "coefils.h"
 c
       EXTERNAL SSUM, acc,eigen,jacobi