Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changing meshgrid to mgrid - fixing gdX, gdY and ext_x, ext_y for 2D kCS... #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changing meshgrid to mgrid - fixing gdX, gdY and ext_x, ext_y for 2D kCS... #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pykCSD/KCSD2D.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ def set_parameters(self, params):
nx = (self.xmax - self.xmin)/self.gdX + 1
ny = (self.ymax - self.ymin)/self.gdY + 1

lin_x = np.linspace(self.xmin, self.xmax, nx)
lin_y = np.linspace(self.ymin, self.ymax, ny)
self.space_X, self.space_Y = np.meshgrid(lin_x, lin_y)
self.space_X, self.space_Y = np.mgrid[self.xmin:self.xmax:np.complex(0,nx),
self.ymin:self.ymax:np.complex(0,ny)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid long lines:

        self.space_X, self.space_Y = np.mgrid[
            self.xmin:self.xmax:np.complex(0,nx),
            self.ymin:self.ymax:np.complex(0,ny)
        ]



(self.X_src, self.Y_src, self.R) = sd.make_src_2D(
self.space_X,
Expand Down
7 changes: 3 additions & 4 deletions pykCSD/source_distribution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,8 @@ def make_src_2D(X, Y, n_src, ext_x, ext_y, R_init):
ext_x_n = (Lx_nn - Lx)/2
ext_y_n = (Ly_nn - Ly)/2

lin_x = np.linspace(np.min(X) - ext_x_n, np.max(X) + ext_x_n, nx)
lin_y = np.linspace(np.min(Y) - ext_y_n, np.max(Y) + ext_y_n, ny)

X_src, Y_src = np.meshgrid(lin_x, lin_y)
X_src, Y_src = np.mgrid[(np.min(X) - ext_x_n):(np.max(X) + ext_x_n):np.complex(0,nx),
(np.min(Y) - ext_y_n):(np.max(Y) + ext_y_n):np.complex(0,ny)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to avoid long lines:

    X_src, Y_src = np.mgrid[
         (np.min(X) - ext_x_n):(np.max(X) + ext_x_n):np.complex(0,nx),
         (np.min(Y) - ext_y_n):(np.max(Y) + ext_y_n):np.complex(0,ny)
    ]

Also maybe the parameters inside np.meshgrid could be given names?


d = round(R_init/ds)
R = d * ds
Expand Down Expand Up @@ -247,6 +245,7 @@ def make_src_3D(X, Y, Z, n_src, ext_x, ext_y, ext_z, R_init):

(X_src, Y_src, Z_src) = np.meshgrid(lin_x, lin_y, lin_z)


Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why? :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was trying to fix it for the 3D case as well, but I gave up.

d = np.round(R_init/ds)
R = d * ds

Expand Down