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.

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

add Newton-Krylov solver related tavg vars to abio_dic_dic14 #36

Merged
merged 2 commits into from
Jun 26, 2020

Conversation

klindsay28
Copy link
Collaborator

Description of changes:
add tavg vars needed for Newton-Krylov solver to abio_dic_dic14

Move io_read_fallback_register_field call for 'ABIO_PH_SURF' outside of all_fields_exist_in_restfile conditional. This fallback should always be available, and the Newton-Krylov solver relies on it.

Testing:
Test case/suite: passes aux_pop on cheyenne/intel, compared to pop2_cesm2_1_rel_n10
Test status: bit for bit

new test ERS_Ld5_D.T62_g37.C.cheyenne_intel.pop-abio_dic_dic14_ltavg_NK added to aux_pop

Fixes: NA

User interface (namelist or namelist defaults) changes?
computation and inclusion of vars in tavg file controlled with nml var abio_dic_dic14_ltavg_NK
(nml var not written to pop_in, just passed to tavg_contents generating script)

Testing: passes aux_pop on cheyenne/intel, compared to pop2_cesm2_1_rel_n10
    expected NLCOMP & BASELINE failures for new test
    some MEMCOMP failures

computation and inclusion of vars in tavg file controlled with nml var abio_dic_dic14_ltavg_NK

nml var enabled in new test ERS_Ld5_D.T62_g37.C.cheyenne_intel.pop-abio_dic_dic14_ltavg_NK

mv io_read_fallback_register_field call for 'ABIO_PH_SURF' outside of all_fields_exist_in_restfile conditional
@klindsay28 klindsay28 added the enhancement New feature or request label Jun 21, 2020
@klindsay28 klindsay28 requested a review from mnlevy1981 June 21, 2020 11:53
Copy link
Collaborator

@mnlevy1981 mnlevy1981 left a comment

Choose a reason for hiding this comment

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

I made two in-line comments, but marked this as "request changes" solely because of the BranchChangeLog update. I'll approve this even if you leave the name of abio_dic_dic14_ltavg_NK unchanged, it's up to you.

BranchChangeLog Outdated
Tag Creator: klindsay
Developers: klindsay
Tag Date: 21 Jun 2020
Tag Name: pop2/trunk_tags/cesm_pop_2_1_20190306
Copy link
Collaborator

Choose a reason for hiding this comment

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

You have Tag Name listed twice, and I think the trunk_tag name is incorrect

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

extra Tag Name line removed

@mnlevy1981 , I haven't actually made the tag, assuming that this step is performed after the PR is merged.
Is that correct?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@klindsay28 That's right -- I'll merge the branch and then create the tag. I can update the Tag Date when I do the merge (git merge --no-commit --no-ff will let me modify files the same way we modify files if there is a conflict in the merge). I guess I could've cleaned up the tag name as well...

<!-- abio_dic_dic14 derived vars -->
<!--------------------------------->

<abio_dic_dic14_ltavg_NK>.false.</abio_dic_dic14_ltavg_NK>
Copy link
Collaborator

Choose a reason for hiding this comment

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

It seems like this variable serves the same function as lecosys_tavg_all (it's not passed to the Fortran code, it only exists so build-namelist and the ocn.*.tavg.csh script know what output to include in tavg_contents. Given that, should the variable name be structured similarly? I'd expect labio_tavg_NK or labio_dic_dic14_tavg_NK.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I prefer abio_dic_dic14_ltavg_NK, to keep with the convention of all abio_dic_dic14 related nml vars having the module name as a prefix.

I suggest that, at some point, we unify all ecosys related nml vars to have an ecosys_ prefix, including changing lecosys_tavg_all to ecosys_ltavg_all. I think that is well beyond the scope of this PR.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I opened #37 to track this thread, as I agree it's beyond the scope of this PR. I'm on the fence about whether to actually address the issue given the pending retirement of POP in CESM, but that's a discussion for the new issue ticket :)

Copy link
Collaborator

@mnlevy1981 mnlevy1981 left a comment

Choose a reason for hiding this comment

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

Looks good now! @alperaltuntas do you want to look through the changes as well, or is it okay if I merge this?

@mnlevy1981 mnlevy1981 merged commit 512e9f0 into ESCOMP:cesm2_1_x_rel Jun 26, 2020
@mnlevy1981 mnlevy1981 mentioned this pull request Jun 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants