new file geometry_v2.py #22
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…f geometry module
dikgarg
reviewed
May 1, 2024
src/nupyprop/geometry_v2.py
Outdated
Comment on lines
13
to
25
| import nupyprop.data as Data | ||
| #from nupyprop.propagate import geometry as Geometry | ||
| import nupyprop.constants as const | ||
|
|
||
| from collections import OrderedDict | ||
| import numpy as np | ||
| from scipy import integrate | ||
| import sympy as sp | ||
| from astropy.table import Table | ||
| #import multiprocessing as mp | ||
| #from multiprocessing import Pool | ||
| import warnings | ||
| warnings.filterwarnings('ignore') |
There was a problem hiding this comment.
Are all these packages being used? Can you remove the ones not being used?
dikgarg
reviewed
May 1, 2024
src/nupyprop/geometry_v2.py
Outdated
Comment on lines
57
to
58
| #sets the last layer as water layer | ||
| Rlay[9] = 6368.0 + (3.0 - float(idepth)) |
There was a problem hiding this comment.
idepth should be kept as type 'int'.
dikgarg
reviewed
May 1, 2024
src/nupyprop/geometry_v2.py
Outdated
Comment on lines
62
to
85
| if Rin <= Rlay[0]: | ||
| edens = 13.0885-8.8381*y**2 | ||
| elif Rin <= Rlay[1]: | ||
| edens = 12.5815-1.2638*y-3.6426*y**2-5.5281*y**3 | ||
| elif Rin <= Rlay[2]: | ||
| edens = 7.9565-6.4761*y+5.5283*y**2-3.0807*y**3 | ||
| elif Rin <= Rlay[3]: | ||
| edens = edens = 5.3197-1.4836*y | ||
| elif Rin <= Rlay[4]: | ||
| edens = 11.2494-8.0298*y | ||
| elif Rin <= Rlay[5]: | ||
| edens = 7.1089-3.8045*y | ||
| elif Rin <= Rlay[6]: | ||
| edens = 2.6910+0.6924*y | ||
| elif Rin <= Rlay[7]: | ||
| edens = 2.900 | ||
| elif Rin <= Rlay[8]: | ||
| edens = 2.600 | ||
| elif Rin <= Rlay[9]: | ||
| edens = 1.020 | ||
| elif Rin <=Rlay[9]*1.001: | ||
| edens = 1.020 | ||
| else: | ||
| edens=0.0 |
There was a problem hiding this comment.
This looks very verbose, you can maybe define all these conditions in a tuple and then use a loop to match for the corresponding Rin. Hint: Try using ChatGPT :)
|
Overall it looks good, but we should create an issue that mentions this file has to serve as the main geometry.py file and we should remove the old one. Also we should remove all the commented out code too. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fortran to python conversion for geometry module in propagate.f90