Skip to content

Issue #28: Reducing methods with different names, same functionality (continuous issue) #30

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

Merged
fmalatino merged 5 commits into from
Oct 13, 2023
+2 −23
Merged

Issue #28: Reducing methods with different names, same functionality (continuous issue) #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e70894d
Testing changes reflected across branches
Oct 10, 2023
2a8b97a
Undoing changes made in build_gaea_c5.sh
Oct 10, 2023
e2cdd5c
Testing vscode functionality, by adding a change to external_grid branch
fmalatino Oct 10, 2023
b4d9e5d
Testing vscode functionality, by adding a change to external_grid branch
fmalatino Oct 10, 2023
faca2fc
Edited init_utils.py and initialize_tc.py regarding the overlap in in…
fmalatino Oct 12, 2023
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
21 changes: 0 additions & 21 deletions fv3core/pace/fv3core/initialization/init_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,6 @@ def horizontally_averaged_temperature(eta):
return t_mean


def _initialize_delp(ak, bk, ps, shape):
# TODO: resolve function duplication
delp = np.zeros(shape)
delp[:, :, :-1] = (
ak[None, None, 1:]
- ak[None, None, :-1]
+ ps[:, :, None] * (bk[None, None, 1:] - bk[None, None, :-1])
)

return delp


def initialize_delp(ps, ak, bk):
return (
ak[None, None, 1:]
Expand All @@ -203,15 +191,6 @@ def initialize_delz(pt, peln):
return constants.RDG * pt[:, :, :-1] * (peln[:, :, 1:] - peln[:, :, :-1])


def _initialize_edge_pressure(delp, ptop, shape):
# TODO: resolve function duplication
pe = np.zeros(shape)
pe[:, :, 0] = ptop
for k in range(1, pe.shape[2]):
pe[:, :, k] = ptop + np.sum(delp[:, :, :k], axis=2)
return pe


def initialize_edge_pressure(delp, ptop):
pe = np.zeros(delp.shape)
pe[:, :, 0] = ptop
Expand Down
4 changes: 2 additions & 2 deletions fv3core/pace/fv3core/initialization/test_cases/initialize_tc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,8 @@ def init_tc_state(
# for now, take from metric terms
ak = _define_ak()
bk = _define_bk()
delp = init_utils._initialize_delp(ak, bk, ps, shape)
pe = init_utils._initialize_edge_pressure(delp, tc_properties["ptop"], shape)
delp = init_utils.initialize_delp(ps, ak, bk)
pe = init_utils.initialize_edge_pressure(delp, tc_properties["ptop"])
peln = np.log(pe)
pk, pkz = init_utils.initialize_kappa_pressures(pe, peln, tc_properties["ptop"])

Expand Down