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

Remove CAM dependencies and add CCPP layer for PUMAS v1 routines #71

Open
wants to merge 16 commits into
base: main_cam
Choose a base branch
from
Open

Remove CAM dependencies and add CCPP layer for PUMAS v1 routines #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
769f7a3
First attempt at removing/replacing non-portable CESM share code.
nusbaume Nov 7, 2024
42f2222
Remove unused 'micro_pumas_data.F90' file.
nusbaume Nov 13, 2024
f820633
Add CCPP init phase, and perform additional clean-up.
nusbaume Nov 19, 2024
434778d
Add input arguments to CCPP run (tend) routine.
nusbaume Dec 6, 2024
7a08cd5
Add remaining input and output arguments to CCPP run (tend) routine.
nusbaume Dec 23, 2024
79cabd3
Finish CCPP interface for core PUMAS routines.
nusbaume Jan 8, 2025
fd86c7f
Update dependency metadata listing to include wv_sat_methods.F90.
nusbaume Jan 9, 2025
c5a15a3
Fix syntax errors found during compilation.
nusbaume Jan 10, 2025
fa085ce
Fix errors found during a CAM run, and fix micro_pumas_ccpp.meta file…
nusbaume Jan 14, 2025
7cde106
Add stub proc_rates DDT metadata file, fix comments, and update Tag N…
nusbaume Jan 16, 2025
fb7bbed
Fix typo in comment.
nusbaume Jan 16, 2025
a8a10b6
fix stdnames for a couple of tendency variables
peverwhee Jan 30, 2025
7044b6b
Fix bad dimension in metadata file,
nusbaume Feb 7, 2025
2b44b58
Merge remote-tracking branch 'origin/ccpp_prep' into ccpp_prep
nusbaume Feb 7, 2025
685a20b
Initialize local variables to zero (ESCOMP/PUMAS issue #72).
nusbaume Feb 21, 2025
a165913
Move variable initialization to inside GPU-ized loop.
nusbaume Feb 21, 2025
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 ML_fixer_check.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module ML_fixer_check
contains
subroutine ML_fixer_calc(mgncol,dt,qc,nc,qr,nr,qctend,nctend,qrtend,nrtend,fixer,qc_fixer, nc_fixer, qr_fixer, nr_fixer)

use shr_kind_mod, only: r8=>shr_kind_r8
use pumas_kinds, only: r8=>kind_r8
use micro_pumas_utils, only: pi, rhow

integer, intent(in) :: mgncol
Expand Down Expand Up @@ -45,13 +45,13 @@ subroutine ML_fixer_calc(mgncol,dt,qc,nc,qr,nr,qctend,nctend,qrtend,nrtend,fixer
fixer(i) = 1._r8
qctend(i) = -qc(i)/dt
qrtend(i) = qc(i)/dt
nctend(i) = -nc(i)/dt
nctend(i) = -nc(i)/dt
end if
if( qr_tmp.lt.0._r8 ) then
fixer(i) = 1._r8
qrtend(i) = -qr(i)/dt
qctend(i) = qr(i)/dt
nrtend(i) = -nr(i)/dt
nrtend(i) = -nr(i)/dt
end if
if( nc_tmp.lt.0._r8 ) then
fixer(i) = 1._r8
Expand Down
17 changes: 10 additions & 7 deletions Tag_Notes.readme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
====================================
.. pumas_cam-release_v1.38
January 15, 2025 - Removed all CAM dependencies from core PUMAS routines except wv_sat_methods. Also added a Common Community Physics Package (CCPP) wrapper for micro_pumas_v1.F90, including two new CCPP metadata files. A new CAM tag will be made which calls the wrapper instead of PUMAS directly, although this isn't technically required.
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is kind of silly, but could you add the name of the wrapper file (micro_pumas_ccpp.F90) and possibly the new calling order for CAM-SIMA in here?

====================================
.. pumas_cam-release_v1.37
May 21, 2024 - Renaming and moving the default branch from Master to main_cam (previously release/cam). Added a README.md file to the release code with instructions for contributing to the PUMAS project on the main Github page. This external will work with all cam tags after cam6_3_144.
====================================
Expand All @@ -24,7 +27,7 @@ September 19, 2023 - More support for machine learning including GPU code clean
July 17, 2023 - Adding in support for the machine learning emulators. CAM support in PR phase, to run this code use branch https://github.com/PUMASDevelopment/CAM/tree/katetc/machlrn_camdev_pr2_cac until the CAM PR is done.
====================================
.. pumas_cam-release_v1.29
March 1, 2023 - Mainly updates to the heterogenious ice nucleation methods for cam_dev tuning. These tags are currently supported on the cam_development branch.
March 1, 2023 - Mainly updates to the heterogenious ice nucleation methods for cam_dev tuning. These tags are currently supported on the cam_development branch.
====================================
.. pumas_cam-release_v1.28
October 11, 2022 - Creation and implimentation of a derived data type (DDT) for process rates. Not supported by cam_development yet. The CAM changes are currently in https://github.com/ESCOMP/CAM/pull/632
Expand All @@ -33,7 +36,7 @@ October 11, 2022 - Creation and implimentation of a derived data type (DDT) for
August 24, 2022 - New tag for cam_development. Initialized nnudep and mnudep.
====================================
.. pumas_cam-release_v1.26
June 7, 2022 - Cam Tag cam6_3_063 now supports PUMAS interface changes in the F2000dev compset
June 7, 2022 - Cam Tag cam6_3_063 now supports PUMAS interface changes in the F2000dev compset
(cam_dev version of micro_pumas_cam.F90). This applies to the previous two tags as well.
====================================
.. pumas_cam-release_v1.25
Expand All @@ -43,12 +46,12 @@ June 2, 2022 - Notes from v1.23 still apply. The CAM PR does not have a tag yet.
May 27, 2022 - Notes from v1.23 still apply. The CAM PR does not have a tag yet.
====================================
.. pumas_cam-release_v1.23
May 23, 2022 - Adding new output arguments for number tendencies. This changes the PUMAS_tend
May 23, 2022 - Adding new output arguments for number tendencies. This changes the PUMAS_tend
interface, so the correct CAM tag will need to run with this. The CAM changes are currently in
https://github.com/ESCOMP/CAM/pull/597
https://github.com/ESCOMP/CAM/pull/597
====================================
.. pumas_cam-release_v1.22
Jan 19, 2022 - Renames for pumas_v1 and use in cam_dev from here on. All changes required to run
Jan 19, 2022 - Renames for pumas_v1 and use in cam_dev from here on. All changes required to run
the head of pumas/cam/release will be integrated into cam_dev physics in cam6_3_046, most likely.
====================================
.. pumas_cam-release_v1.21
Expand All @@ -58,7 +61,7 @@ Nov 29, 2021 - Rain reflectivity bug fix. Notes from v1.19 still apply.
Nov 15, 2021 - Small bug fix. Notes from v1.19 still apply.
====================================
.. pumas_cam-release_v1.19
Oct 26, 2021 - This tag depends on changes to cam_development that have not been brought to a PR
Oct 26, 2021 - This tag depends on changes to cam_development that have not been brought to a PR
(or merged) yet. To use this code, you must include the changes from the gettelman_pumas_update0821
branch of https://github.com/PUMASDevelopment/CAM at commit 2f2346bb92.
====================================
====================================
Loading