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

Upgrading to atmos_phys0_09_000 #207

Merged
merged 6 commits into from
Feb 21, 2025
Merged

Upgrading to atmos_phys0_09_000 #207

merged 6 commits into from
Feb 21, 2025

Conversation

mwaxmonsky
Copy link
Collaborator

Tag name (The PR title should also include the tag name): atmos_phys0_09_000
Originator(s): @mwaxmonsky

List all development PR numbers included in this PR and the title of each:

List all automated tests that failed, as well as an explanation for why they weren't fixed: N/A

peverwhee and others added 6 commits February 4, 2025 11:23
Originator(s): peverwhee

Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue
number):
The sima_state_diagnostics scheme only output the "known" constituents.
This PR adds history add and out field calls for ALL other constituents.
I'm open to discussion about the diagnostic names for these!

Describe any changes made to the namelist: n/a

List all files eliminated and why: n/a

List all files added and what they do: n/a

List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)
M   schemes/sima_diagnostics/sima_state_diagnostics.F90
- add "history_add_field" and "history_out_field" calls for constituents
outside of the core expected ones.

List any test failures: all CAM-SIMA tests pass

Is this a science-changing update? New physics package, algorithm
change, tuning changes, etc? no - diagnostics update
Originator(s): @boulderdaze

Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue
number):
- Closes #196
- Fixed bugs for the CAM-SIMA build

Describe any changes made to the namelist: 
```
M       schemes/musica/musica_ccpp_namelist.xml -> Specified the path to directory for the configuration
```

List all files eliminated and why: N/A

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

List all existing files that have been modified, and describe the
changes:
```
M       schemes/musica/musica_ccpp.F90
M       schemes/musica/musica_ccpp.meta
M       schemes/musica/musica_ccpp_namelist.xml
M       schemes/musica/tuvx/musica_ccpp_tuvx.F90
M       schemes/musica/tuvx/musica_ccpp_tuvx_surface_albedo.F90
M       test/musica/test_musica_api.F90
```
List any test failures: N/A

Is this a science-changing update? New physics package, algorithm
change, tuning changes, etc? No
…rmo_water_update) (#178)

Originator(s): @jimmielin

Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue
number):

Closes #177, implementing thermo_water_update scheme to call
cam_thermo_water_update.

Describe any changes made to the namelist: N/A

List all files eliminated and why: N/A

List all files added and what they do:

Implement thermo_water_update scheme
A       schemes/thermo_water_update/thermo_water_update.F90
A       schemes/thermo_water_update/thermo_water_update.meta

List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)

Include thermo_water_update scheme in CAM7 suite and simple physics
suites
M       suites/suite_cam7.xml
M       suites/suite_kessler.xml
M       suites/suite_tj2016.xml

List any test failures:

Is this a science-changing update? New physics package, algorithm
change, tuning changes, etc? Yes

---------

Co-authored-by: Jesse Nusbaumer <[email protected]>
…name update (#169)

Originator(s): @jimmielin

Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue
number):

* Fixes #161: Add check_energy related history output variables to check_energy_diagnostics
* Fixes #166: Need to remove old CAM suite definition files
* Fixes #176 (updates `teout` standard name to
`vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep`)

Companion PR in SIMA: ESCOMP/CAM-SIMA#339

Describe any changes made to the namelist: N/A

List all files eliminated and why:
```
Fix #166 to remove old SDF files from scoping exercise
D       suites/suite_cam4.xml
D       suites/suite_cam6.xml
D       suites/suite_cam6_silhs.xml
```

List all files added and what they do:
```
Add global energy fixer diagnostics (teinp, teout, tefix, efix) 
A       schemes/sima_diagnostics/check_energy_fix_diagnostics.F90
A       schemes/sima_diagnostics/check_energy_fix_diagnostics.meta
```


List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)
```
Move some developments to check_energy_fix_diagnostics so they can be called at right time.
M       schemes/sima_diagnostics/check_energy_diagnostics.F90
M       schemes/sima_diagnostics/check_energy_diagnostics.meta

Add call to check_energy_fix_diagnostics in schemes using global energy fixer:
M       suites/suite_adiabatic.xml
M       suites/suite_cam7.xml

Update teout standard name
M       doc/NamesNotInDictionary.txt
M       schemes/check_energy/check_energy_chng.meta
M       schemes/check_energy/check_energy_gmean/check_energy_gmean.meta
M       schemes/check_energy/check_energy_save_teout.meta
M       schemes/sima_diagnostics/check_energy_diagnostics.F90
M       schemes/sima_diagnostics/check_energy_diagnostics.meta
M       schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta
```

List any test failures: N/A

Is this a science-changing update? New physics package, algorithm
change, tuning changes, etc? N/A (diagnostics change only)
…st (#204)

Originator(s): jimmielin

Description (include issue title and the keyword ['closes', 'fixes',
'resolves'] and issue number):

The FPHYStest test for Kessler in SIMA right now uses the same
`suite_kessler.xml` as FKESSLER, which means it includes
`physics_after_coupler` and other `check_energy` schemes we do not want
to include in the FPHYStest test which should only be testing
`kessler_tend`.

This PR includes a new `suite_kessler_test.xml` that removes all the
other schemes from the SDF and keeps only what we want to test, and
consistent with how the snapshots are taken in CAM:

```fortran
      if (trim(cam_take_snapshot_before) == "kessler_tend") then
         call cam_snapshot_all_outfld(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf)
      end if

      call kessler_tend(state, ptend, ztodt, pbuf)
      if ( (trim(cam_take_snapshot_after) == "kessler_tend") .and.            &
           (trim(cam_take_snapshot_before) == trim(cam_take_snapshot_after))) then
         call cam_snapshot_ptend_outfld(ptend, lchnk)
      end if
      call physics_update(state, ptend, ztodt, tend)

      if (trim(cam_take_snapshot_after) == "kessler_tend") then
         call cam_snapshot_all_outfld(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf)
      end if
```

List all namelist files that were added or changed: N/A

List all files eliminated and why: N/A

List all files added and what they do:
```
A       test/test_suites/suite_kessler_test.xml
  - new kessler_test suite
```

List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)
N/A

List all automated tests that failed, as well as an explanation for why
they weren't fixed:
N/A

Is this an answer-changing PR? If so, is it a new physics package,
algorithm change, tuning change, etc?
Yes for FPHYStest kessler test

If yes to the above question, describe how this code was validated with
the new/modified features:
BFB when using this suite
Originator(s): @mwaxmonsky 

Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue
number): Adds pbl_utils capability from CAM.

Describe any changes made to the namelist: N/A

List all files eliminated and why: N/A

List all files added and what they do:
M phys_utils/atmos_phys_pbl_utils.F90
- Transferred all functionality (except for `compute_radf(...)`) from
ESCOMP/cam/src/physics/cam/pbl_utils.F90

M .github/workflows/unit-tests.yaml
- Added phys_utils to code coverage.

M test/unit-test/CMakeLists.txt
M test/unit-test/tests/CMakeLists.txt
M test/unit-test/tests/phys_utils/CMakeLists.txt
M test/unit-test/tests/phys_utils/test_atmos_pbl_utils.pf
- Creating CMake target library for `phys_utils` and adding sample unit
tests.


List all existing files that have been modified, and describe the
changes: N/A
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)

List any test failures: N/A

Is this a science-changing update? New physics package, algorithm
change, tuning changes, etc? No

---------

Co-authored-by: Jesse Nusbaumer <[email protected]>
@mwaxmonsky mwaxmonsky merged commit 7031edf into main Feb 21, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants