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

cam6_4_007: CCPP-ized TJ2016 #1070

Merged
merged 26 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
03f6b72
Integration updates for SIMA and atmos_phys.
mwaxmonsky Apr 11, 2024
725afc9
Updating to latest atmos_phys.
mwaxmonsky Apr 11, 2024
b614f29
Removing pverp in favor of explicit indexing.
mwaxmonsky Apr 12, 2024
310a8df
Fixing U/V tendency calculation.
mwaxmonsky Apr 12, 2024
29a8d18
Updating to use explicit indexing.
mwaxmonsky Apr 12, 2024
fdafcd1
Fixing parameter list.
mwaxmonsky Apr 12, 2024
7f58739
Updating Externals_CAM.cgf to point to latest atmos_phys changes to s…
mwaxmonsky May 7, 2024
343dde6
Fixing merge conflict bringing into tj2016'.
mwaxmonsky May 7, 2024
ac7f501
Update to latest atmos_phys.
mwaxmonsky Jun 7, 2024
e938e7c
Updating to pass regression tests with latest atmos_phys changes.
mwaxmonsky Jun 7, 2024
0cd8bf5
Updating atmos_phys to fix temperature bug.
mwaxmonsky Jun 15, 2024
75ace38
Fixing merge conflicts merging in latest cam_development.
mwaxmonsky Jun 15, 2024
e8e3733
Updating to latest atmos_phys
mwaxmonsky Jun 17, 2024
c25a03c
Updating to latest atmos_phys.
mwaxmonsky Jun 17, 2024
8d31f99
Removing commented out code.
mwaxmonsky Jun 20, 2024
6e1f848
Removing original TJ2016 implementation due to CCPP-ized implementati…
mwaxmonsky Jun 20, 2024
5ded2b6
Updating atmos_phys to official tag.
mwaxmonsky Jun 25, 2024
5f37011
Merge branch 'cam_development' into tj2016
mwaxmonsky Jun 27, 2024
3bd8412
Removing un-needed test definition.
mwaxmonsky Jun 28, 2024
28e6335
Removing un-used variables.
mwaxmonsky Jun 28, 2024
883eb38
Removing test declaration missed in previous commit.
mwaxmonsky Jun 28, 2024
4b06174
Removing unused module variable.
mwaxmonsky Jun 28, 2024
1b70c30
Merge branch 'cam_development' into tj2016
mwaxmonsky Jul 3, 2024
320f472
Fixing whitespace
mwaxmonsky Jul 1, 2024
e501b96
Removing set_const call no longer needed.
mwaxmonsky Jul 5, 2024
b6be2be
Updating ChangeLog
mwaxmonsky Jul 8, 2024
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
[submodule "atmos_phys"]
path = src/atmos_phys
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = atmos_phys0_02_006
fxtag = atmos_phys0_03_000
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics

Expand Down
1 change: 1 addition & 0 deletions bld/configure
Original file line number Diff line number Diff line change
Expand Up @@ -2185,6 +2185,7 @@ sub write_filepath
print $fh "$camsrcdir/src/physics/simple\n";
print $fh "$camsrcdir/src/atmos_phys/kessler\n";
print $fh "$camsrcdir/src/atmos_phys/held_suarez\n";
print $fh "$camsrcdir/src/atmos_phys/tj2016\n";
}

# Weak scaling fix. This has to come before physics/cam and before dycores
Expand Down
79 changes: 79 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,84 @@
===============================================================

Tag name: cam6_4_007
Originator(s): Michael Waxmonsky
Date: 7/8/2024
One-line Summary: cam6_4_007: CCPP-ized TJ2016
Github PR URL: https://github.com/ESCOMP/CAM/pull/1070

Purpose of changes (include the issue number and title text for each relevant GitHub issue):
- Exchanges TJ2016 source from cam/physics/simple to atmospheric_physics
submodule (https://github.com/ESCOMP/atmospheric_physics/pull/92)

Describe any changes made to build system:
- Adds src/atmos_phys/tj2016 to list of folders to search for compiling in
<case>/bld/atm/obj/Filepath used during ./preview_namelists

Describe any changes made to the namelist: N/A

List any changes to the defaults for the boundary datasets: N/A

Describe any substantial timing or memory changes: N/A

Code reviewed by: cacraigucar, nusbaume

List all files eliminated:

$ git diff --name-status cam_development..tj2016 | grep ^D
D src/physics/simple/tj2016.F90

List all files added and what they do: N/A

List all existing files that have been modified, and describe the changes:

$ git diff --name-status cam_development..tj2016 | grep ^M

M .gitmodules
- Updating atmospheric_physics to tag atmos_phys0_03_000

M bld/configure
- See comment to change in build system

M src/physics/simple/tj2016_cam.F90
- Updated API into CCPP-ized TJ2016 precip and sfc_plb_hs run functions
(See https://github.com/ESCOMP/atmospheric_physics/pull/92 for API change desciription).

If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

derecho/intel/aux_cam:
ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
FAIL ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s COMPARE_base_rest
SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s
(Overall: FAIL) details:
FAIL SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s SHAREDLIB_BUILD time=3
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PEND) details:
PEND SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s SHAREDLIB_BUILD
SMS_D_Ln9.T42_T42.FSCAM.derecho_intel.cam-outfrq9s (Overall: PEND) details:
PEND SMS_D_Ln9.T42_T42.FSCAM.derecho_intel.cam-outfrq9s RUN RERUN
- Pre-existing failures

izumi/nag/aux_cam:
DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL) details:
FAIL DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae RUN time=12
PEND DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae COMPARE_base_da
- Pre-existing failure

izumi/gnu/aux_cam: N/A

CAM tag used for the baseline comparison tests if different than previous
tag:
- cesm2_3_alpha17g for manually testing FTJ16 compset

Summarize any changes to answers, i.e.,
- what code configurations:
- what platforms/compilers:
- nature of change (roundoff; larger than roundoff but same climate; new climate): N/A

===============================================================

Tag name: cam6_4_006
Originator(s): pel, eaton
Date: 3 July 2024
Expand Down
Loading