Changeset 111

Timestamp:

Jul 16, 2010 10:10:40 AM (13 years ago)

Author:

vondreel

Message:

modified for refactoring of integration

File:

• trunk/fsource/histogram2d.for (modified) (3 diffs)

trunk/fsource/histogram2d.for

@@ -1 @@
-      SUBROUTINE HISTOGRAM2D(N,X,Y,Z,NXBINS,NYBINS,XLIM,YLIM,
-     1  NST,HST,HSTX,HSTY)
+      SUBROUTINE HISTOGRAM2D(N,X,Y,Z,NXBINS,NYBINS,XLIM,YLIM,DX,DY,
+     1  NST,HST)
 
 Cf2py intent(in) N
@@ -13 +13 @@
 Cf2py intent(in) XLIM
 Cf2py intent(in) YLIM
+Cf2py intent(in) DX
+Cf2py intent(in) DY
 Cf2py intent(in,out) NST
 Cf2py depend(NXBINS,NYBINS) NST
 Cf2py intent(in,out) HST
 Cf2py depend(NXBINS,NYBINS) HST
-Cf2py intent(in,out) HSTX
-Cf2py depend(NXBINS) HSTX
-Cf2py intent(in,out) HSTY
-Cf2py depend(NYBINS) HSTY
 
       IMPLICIT NONE
@@ -27 +25 @@
       INTEGER*4   NXBINS,NYBINS
       REAL*8      XLIM(0:1),YLIM(0:1)
+      REAL*8      DX,DY
       INTEGER*8   NST(0:NXBINS-1,0:NYBINS-1)
       REAL*4      HST(0:NXBINS-1,0:NYBINS-1)
-      REAL*8      HSTX(0:NXBINS),HSTY(0:NYBINS)
 
       INTEGER*4   I,J,K
-      REAL*8      DX,DY
 
-      DX = (XLIM(1)-XLIM(0))/FLOAT(NXBINS)
-      DY = (YLIM(1)-YLIM(0))/FLOAT(NYBINS)
-
-      DO I=0,NXBINS
-        HSTX(I) = XLIM(0)+FLOAT(I)*DX
-      END DO
-      DO J=0,NYBINS
-        HSTY(J) = YLIM(0)+FLOAT(J)*DY
-      END DO
-      
       DO K=0,N-1
         IF ( ( X(K) .GE. XLIM(0) .AND. X(K) .LE. XLIM(1)) .AND.