--- trunk/Sources/filtrez/filtreg.f	2015/04/30 14:22:32	135
+++ trunk/Sources/filtrez/filtreg_scal.f	2015/05/06 15:51:03	137
@@ -1,23 +1,24 @@
-module filtreg_m
+module filtreg_scal_m
 
   IMPLICIT NONE
 
 contains
 
-  SUBROUTINE filtreg(champ, direct, intensive)
+  SUBROUTINE filtreg_scal(champ, direct, intensive)
 
     ! From filtrez/filtreg.F, version 1.1.1.1, 2004/05/19 12:53:09
     ! Author: P. Le Van
     ! Objet : filtre matriciel longitudinal, avec les matrices pr\'ecalcul\'ees
     ! pour l'op\'erateur filtre. 
 
-    USE coefils, ONLY: sddu, sddv, unsddu, unsddv
+    USE coefils, ONLY: sddv, unsddv
     USE dimens_m, ONLY: iim, jjm
-    use inifilr_m, only: jfiltnu, jfiltnv, jfiltsu, jfiltsv, matriceun, &
-         matriceus, matricevn, matricevs, matrinvn, matrinvs
+    use filtreg_hemisph_m, only: filtreg_hemisph
+    use inifilr_m, only: jfiltnu, jfiltsu, matriceun, matriceus, matrinvn, &
+         matrinvs
     use nr_util, only: assert
 
-    REAL, intent(inout):: champ(:, :, :) ! (iim + 1, nlat, nbniv)
+    REAL, intent(inout):: champ(:, :, :) ! (iim + 1, jjm + 1, :)
     ! en entr\'ee : champ \`a filtrer, en sortie : champ filtr\'e
 
     logical, intent(in):: direct ! filtre direct ou inverse 
@@ -26,100 +27,29 @@
     ! champ intensif ou extensif (pond\'er\'e par les aires)
 
     ! Local:
-    LOGICAL griscal
-    INTEGER nlat ! nombre de latitudes \`a filtrer
-    integer nbniv ! nombre de niveaux verticaux \`a filtrer 
-    INTEGER jdfil1, jdfil2, jffil1, jffil2, jdfil, jffil
-    INTEGER j, l
-    REAL eignq(iim), sdd1(iim), sdd2(iim)
-    INTEGER hemisph
+    REAL sdd1(iim), sdd2(iim)
 
     !-----------------------------------------------------------
 
-    call assert(size(champ, 1) == iim + 1, "filtreg iim + 1")
-    nlat = size(champ, 2)
-    nbniv = size(champ, 3)
-    call assert(nlat == jjm .or. nlat == jjm + 1, "filtreg nlat")
-    griscal = nlat == jjm + 1
-
-    IF (.not. direct .AND. nlat == jjm) THEN
-       PRINT *, 'filtreg: inverse filter on scalar grid only'
-       STOP 1
-    END IF
+    call assert(size(champ, 1) == iim + 1, "filtreg_scal iim + 1")
+    call assert(size(champ, 2) == jjm + 1, "filtreg_scal jjm + 1")
 
-    IF (griscal) THEN
-       IF (intensive) THEN
-          sdd1 = sddv
-          sdd2 = unsddv
-       ELSE
-          sdd1 = unsddv
-          sdd2 = sddv
-       END IF
-
-       jdfil1 = 2
-       jffil1 = jfiltnu
-       jdfil2 = jfiltsu
-       jffil2 = jjm
+    IF (intensive) THEN
+       sdd1 = sddv
+       sdd2 = unsddv
     ELSE
-       IF (intensive) THEN
-          sdd1 = sddu
-          sdd2 = unsddu
-       ELSE
-          sdd1 = unsddu
-          sdd2 = sddu
-       END IF
-
-       jdfil1 = 1
-       jffil1 = jfiltnv
-       jdfil2 = jfiltsv
-       jffil2 = jjm
+       sdd1 = unsddv
+       sdd2 = sddv
     END IF
 
-    DO hemisph = 1, 2
-       IF (hemisph==1) THEN
-          jdfil = jdfil1
-          jffil = jffil1
-       ELSE
-          jdfil = jdfil2
-          jffil = jffil2
-       END IF
-
-       DO l = 1, nbniv
-          DO j = jdfil, jffil
-             champ(:iim, j, l) = champ(:iim, j, l) * sdd1
-
-             IF (hemisph==1) THEN
-                IF (.not. direct) THEN
-                   eignq = matmul(matrinvn(:, :, j), champ(:iim, j, l))
-                ELSE IF (griscal) THEN
-                   eignq = matmul(matriceun(:, :, j), champ(:iim, j, l))
-                ELSE
-                   eignq = matmul(matricevn(:, :, j), champ(:iim, j, l))
-                END IF
-             ELSE
-                IF (.not. direct) THEN
-                   eignq = matmul(matrinvs(:, :, j - jfiltsu + 1), &
-                        champ(:iim, j, l))
-                ELSE IF (griscal) THEN
-                   eignq = matmul(matriceus(:, :, j - jfiltsu + 1), &
-                        champ(:iim, j, l))
-                ELSE
-                   eignq = matmul(matricevs(:, :, j - jfiltsv + 1), &
-                        champ(:iim, j, l))
-                END IF
-             END IF
-
-             IF (direct) THEN
-                champ(:iim, j, l) = (champ(:iim, j, l) + eignq) * sdd2
-             ELSE
-                champ(:iim, j, l) = (champ(:iim, j, l) - eignq) * sdd2
-             END IF
-
-             champ(iim + 1, j, l) = champ(1, j, l)
-          END DO
-       END DO
-    end DO
+    if (direct) then
+       call filtreg_hemisph(champ(:, 2:jfiltnu, :), sdd1, sdd2, matriceun)
+       call filtreg_hemisph(champ(:, jfiltsu:jjm, :), sdd1, sdd2, matriceus)
+    else
+       call filtreg_hemisph(champ(:, 2:jfiltnu, :), sdd1, sdd2, - matrinvn)
+       call filtreg_hemisph(champ(:, jfiltsu:jjm, :), sdd1, sdd2, - matrinvs)
+    end if
 
-  END SUBROUTINE filtreg
+  END SUBROUTINE filtreg_scal
 
-end module filtreg_m
+end module filtreg_scal_m