Modifiche ai nomi delle variabili in fortran per evitare

Leonardo [2010-04-06 15:01]
Modifiche ai nomi delle variabili in fortran per evitare
conflitti con il filter del python.
Filename
Filtering/fast_filters.f90
diff --git a/Filtering/fast_filters.f90 b/Filtering/fast_filters.f90
index 08ad24e..42e844b 100644
--- a/Filtering/fast_filters.f90
+++ b/Filtering/fast_filters.f90
@@ -1,17 +1,17 @@
-SUBROUTINE filter_and_downsample(output, samples, downsample, filter, n, m)
+SUBROUTINE filter_and_downsample(output, samples, downsample, fb_filter, n, m)

   IMPLICIT NONE
   ! Variabili
   INTEGER m, n
   DOUBLE PRECISION, DIMENSION(n) :: samples
-  DOUBLE PRECISION, DIMENSION(m) :: filter
+  DOUBLE PRECISION, DIMENSION(m) :: fb_filter

   INTEGER downsample
   INTEGER k, i, s
   DOUBLE PRECISION, DIMENSION(n/downsample) :: output

 !F2PY INTENT(IN) :: samples
-!F2PY INTENT(IN) :: filter
+!F2PY INTENT(IN) :: fb_filter
 !F2PY INTENT(IN) :: downsample
 !F2PY INTENT(HIDE) :: n
 !F2PY INTENT(HIDE) :: m
@@ -25,7 +25,7 @@ SUBROUTINE filter_and_downsample(output, samples, downsample, filter, n, m)
      output(s) = 0
      i = 0
      DO WHILE( i < m .and. i < k )
-        output(s) = output(s) + filter(i + 1)*samples(k - i)
+        output(s) = output(s) + fb_filter(i + 1)*samples(k - i)
         i = i + 1
      END DO

@@ -36,16 +36,16 @@ SUBROUTINE filter_and_downsample(output, samples, downsample, filter, n, m)

 END SUBROUTINE

-SUBROUTINE upsample_and_filter(output, samples, upsample, filter, n, m)
+SUBROUTINE upsample_and_filter(output, samples, upsample, fb_filter, n, m)

   ! dichiarazioni
   INTEGER :: m,n, upsample, i,j,s
   DOUBLE PRECISION, DIMENSION(n) :: samples
-  DOUBLE PRECISION, DIMENSION(m) :: filter
+  DOUBLE PRECISION, DIMENSION(m) :: fb_filter
   DOUBLE PRECISION, DIMENSION(upsample * n) :: output

   !F2PY INTENT(IN) samples
-  !F2PY INTENT(IN) filter
+  !F2PY INTENT(IN) fb_filter
   !F2PY INTENT(IN) upsample
   !F2PY INTENT(HIDE) m
   !F2PY INTENT(HIDE) n
@@ -62,8 +62,8 @@ SUBROUTINE upsample_and_filter(output, samples, upsample, filter, n, m)
      ! con il vettore upsampled sfruttando l'informazione che
      ! nei posti dispari c'è solo 0.
      DO WHILE(j < m .and. j < s)
-        output(s)     = output(s) + samples(i - j/2) * filter(j + 1)
-        output(s + 1) = output(s + 1) + samples(i - j/2) * filter(j + 2)
+        output(s)     = output(s) + samples(i - j/2) * fb_filter(j + 1)
+        output(s + 1) = output(s + 1) + samples(i - j/2) * fb_filter(j + 2)
         j = j + 2
      END DO
      s = s + 2
ViewGit