Remove CAM dependencies and add CCPP layer for PUMAS v1 routines - #71
Merged
Conversation
… using framework script.
and change subroutine dummy argument declarations to not specify dimension sizes.
Katetc
requested changes
Feb 12, 2025
Katetc
left a comment
Katetc
left a comment
Collaborator
There was a problem hiding this comment.
Phew! I did it. I didn't see much that was actually an issue except the units on DCS. Thanks Jesse!
Contributor
Author
|
Thanks for reviewing @Katetc! I am just letting you know that I think I have responded to all of your requests, and have asked for a re-review. Thanks again! |
Katetc
approved these changes
Mar 10, 2025
Katetc
left a comment
Katetc
left a comment
Collaborator
There was a problem hiding this comment.
Thanks for all of this work, Jessie!
wkchuang
added a commit
to wkchuang/PUMAS
that referenced
this pull request
Mar 24, 2025
commit 8e61d3f Merge: d2683f2 c9bff7e Author: Kate Thayer-Calder <katec@ucar.edu> Date: Mon Mar 10 16:38:26 2025 -0600 Merge pull request ESCOMP#71 from nusbaume/ccpp_prep Remove CAM dependencies and add CCPP layer for PUMAS v1 routines commit c9bff7e Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Fri Feb 28 10:54:10 2025 -0700 Add modifications requested during code review. commit a165913 Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Fri Feb 21 16:13:53 2025 -0700 Move variable initialization to inside GPU-ized loop. commit 685a20b Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Fri Feb 21 15:51:37 2025 -0700 Initialize local variables to zero (ESCOMP/PUMAS issue ESCOMP#72). commit 2b44b58 Merge: 7044b6b a8a10b6 Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Fri Feb 7 16:10:25 2025 -0700 Merge remote-tracking branch 'origin/ccpp_prep' into ccpp_prep commit 7044b6b Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Fri Feb 7 16:06:45 2025 -0700 Fix bad dimension in metadata file, and change subroutine dummy argument declarations to not specify dimension sizes. commit a8a10b6 Author: peverwhee <courtneyp@ucar.edu> Date: Thu Jan 30 14:27:17 2025 -0700 fix stdnames for a couple of tendency variables commit fb7bbed Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Thu Jan 16 14:41:56 2025 -0700 Fix typo in comment. commit 7cde106 Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Thu Jan 16 08:47:49 2025 -0700 Add stub proc_rates DDT metadata file, fix comments, and update Tag Notes. commit fa085ce Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Tue Jan 14 16:18:50 2025 -0700 Fix errors found during a CAM run, and fix micro_pumas_ccpp.meta file using framework script. commit c5a15a3 Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Fri Jan 10 13:51:09 2025 -0700 Fix syntax errors found during compilation. commit fd86c7f Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Thu Jan 9 15:52:31 2025 -0700 Update dependency metadata listing to include wv_sat_methods.F90. commit 79cabd3 Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Wed Jan 8 16:06:45 2025 -0700 Finish CCPP interface for core PUMAS routines. commit 7a08cd5 Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Mon Dec 23 12:32:29 2024 -0700 Add remaining input and output arguments to CCPP run (tend) routine. commit 434778d Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Fri Dec 6 12:03:09 2024 -0700 Add input arguments to CCPP run (tend) routine. commit f820633 Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Tue Nov 19 15:29:46 2024 -0700 Add CCPP init phase, and perform additional clean-up. commit 42f2222 Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Wed Nov 13 11:16:57 2024 -0700 Remove unused 'micro_pumas_data.F90' file. commit 769f7a3 Author: Jesse Nusbaumer <nusbaume@ucar.edu> Date: Thu Nov 7 15:46:25 2024 -0700 First attempt at removing/replacing non-portable CESM share code.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This PR removes all explicit uses of CAM and/or CESM share modules, and instead adds internal PUMAS routines to accomplish the same goals. The one exception is for calls to
wv_sat_methodswhich will need to remain a dependency for now (but can likely be CCPP-ized as well later). Part of this effort included removing the no-longer-usedmicro_pumas_data.F90file.This PR also adds a CCPP Fortran module and metadata file to enable CCPP-compliant calls to
micro_pumas_initandmicro_pumas_tend, as well as a stub metadata file for theproc_rates_typeDDT, which will need to be visible to the CCPP-framework in order for it to be passed to external CCPP schemes (e.g. diagnostics).Finally, this PR fixes #72
Testing:
Successfully passed all aux_cam tests on Derecho with the Intel compiler using
cam6_4_055baselines. Also passed all aux_pumas tests except for the one test failure described in #70