Update standard and function names plus major code clean-up #67

nusbaume · 2023-09-18T16:28:00Z

The main purpose of this PR is to update the CCPP standard names to match the internal AMP agreed-upon names, as well as rename some of the physics routines to make them less ambigious and more accurate. Along with these changes, significant code cleanup was performed along with some minor bug fixes, with the goal being to produce bit-for-bit results using the same repo version in both CAM and CAM-SIMA.

Fixes #60
Fixes #61
Fixes #62
Fixes #64

…ithub issue ESCOMP#61).

…composition dependent (Github issue ESCOMP#22).

…me missed kessler variables.

… in qneg scheme.

… to improve scheme name accuracy.

… of dry air gas constant

…sue ESCOMP#64).

…names.

…condensed_water'.

…or held_suarez.

…or Kessler, and fix stdname bug.

peverwhee

Looks good (and like a lot of work!) to me!

Thank you!

nusbaume · 2023-09-20T14:42:31Z

@PeterHjortLauritzen I mostly just requested your review here to see if the updated standard names and physics routine names sound reasonable to you. However if you end up not having the time to review then just let me know and I'll take you off the review list. Thanks!

PeterHjortLauritzen

Looks great. Thanks Jesse ... just have one question (see comment for specific code section)

PeterHjortLauritzen · 2023-09-20T15:19:21Z

utilities/state_converters.F90

@@ -187,20 +124,20 @@ subroutine wet_to_dry_water_vapor_run(ncol, nz, pdel, pdeldry, qv, qv_dry,  &

     integer,          intent(in)  :: ncol


The conversion from wet to dry and dry to wet mixing ratios is general. I am curious why there are separate calls for water vapor, rain, etc. to convert from wet to dry. Could we use a generic subroutine instead?

We currently have these separate calls for legacy reasons, i.e. we had converted Kessler before we had any general way to deal with constituents in the framework.

However, I agree that we should have generic wet <-> dry conversion routines, and now that we have a constituents object that should be doable. I can make an issue about it so that we remember to tackle it at some point in the future.

I just created the issue, which can be found here: #68

cacraigucar

review of ChangeLog and standard names. Stiil need to review code

doc/ChangeLog

held_suarez/held_suarez_1994.meta

kessler/kessler.meta

doc/ChangeLog

kessler/kessler.meta

…hases.

doc/ChangeLog

cacraigucar

Minor comment for code. This completes my review of the Fortran

utilities/geopotential_temp.F90

held_suarez/held_suarez_1994.meta

mwaxmonsky

Looks good to me! Great work @nusbaume!

…e of PR merge.

Merge pull request ESCOMP#67 from nusbaume/updated_standard_names

nusbaume added 24 commits May 5, 2023 14:48

Update Kessler standard names and perform minor code clean-up.

e8cde64

Replace hard-coded exner pressure with reference pressure argument (G…

ba91bc2

…ithub issue ESCOMP#61).

Remove 'state_variable' metadata attribute.

7b49804

Update geopotential_t standard names and change kessler 'rair' to be …

621b499

…composition dependent (Github issue ESCOMP#22).

Update standard names for remaining 'utilities' schemes as well as so…

3690243

…me missed kessler variables.

Properly dimension all 'composition_dependent' variables.

4ed49b1

Update held_suarez standard names and remove unused 'qprops' variable…

25bf5b7

… in qneg scheme.

Add missing composition dependent variables to held_suarez scheme.

ac41065

Rename 'pres_to_density_dry' to 'calc_dry_ideal_gas_density' in order…

8891334

… to improve scheme name accuracy.

Add the word 'air' to ideal gas density scheme to indicate assumption…

60b464d

… of dry air gas constant

Fix comments in core kessler routine.

e28376a

Make modifications and code clean-up needed to build and run in CAM.

a4cbd40

Update standard names based off last standard names meeting.

0e98991

Update 'geopotential_t' to use all thermo-active constituents.

3fe75c3

Fix syntax errors in 'geopotential_t' utility.

d70c9a9

Rename 'geopotential_t' to 'geopotential_temp', and fix syntax errors.

d3d192c

Move geopotential after qneg, and add geopotential to Held-Suarez (is…

a5e7d54

…sue ESCOMP#64).

Replace 'moist_air' with 'moist_air_and_condensed_water' in standard …

fd45ead

…names.

Add parentheses around division step needed for b4b results in CAM.

6de7654

Finish updating 'wrt_moist_air' standard names to 'wrt_moist_air_and_…

4a076b1

…condensed_water'.

Add mods needed to get CCPP cap code generation to work in CAM-SIMA f…

ee881c1

…or held_suarez.

Add mods needed for Held-Suarez to pass the ncdata_check snapshot test.

c10880c

Add mods needed to get CCPP cap code generation to work in CAM-SIMA f…

c012f24

…or Kessler, and fix stdname bug.

Add a ChangeLog.

4f7ee72

nusbaume added documentation Improvements or additions to documentation enhancement New feature or request bug-fix This PR was created to fix a specific bug. labels Sep 18, 2023

nusbaume requested review from cacraigucar and peverwhee September 18, 2023 16:28

nusbaume self-assigned this Sep 18, 2023

nusbaume requested a review from mwaxmonsky September 18, 2023 16:46

peverwhee approved these changes Sep 20, 2023

View reviewed changes

nusbaume requested a review from PeterHjortLauritzen September 20, 2023 14:40

PeterHjortLauritzen reviewed Sep 20, 2023

View reviewed changes

cacraigucar requested changes Sep 20, 2023

View reviewed changes

Replace 'horizontal_dimension' with 'horizontal_loop_extent' in run p…

cd2b128

…hases.

PeterHjortLauritzen self-requested a review September 21, 2023 17:24

cacraigucar reviewed Sep 22, 2023

View reviewed changes

doc/ChangeLog Show resolved Hide resolved

PeterHjortLauritzen approved these changes Sep 22, 2023

View reviewed changes

cacraigucar requested changes Sep 22, 2023

View reviewed changes

utilities/geopotential_temp.F90 Outdated Show resolved Hide resolved

nusbaume added 3 commits September 26, 2023 11:48

Implement code review change requests.

0f59e45

Make 'geopotential_temp' only use thermo-active water species.

0542f8c

Update static_energy scheme to allow its use in CAM.

6fd70dd

nusbaume requested a review from cacraigucar October 3, 2023 16:58

cacraigucar approved these changes Oct 6, 2023

View reviewed changes

cacraigucar requested changes Oct 6, 2023

View reviewed changes

held_suarez/held_suarez_1994.meta Show resolved Hide resolved

cacraigucar approved these changes Oct 6, 2023

View reviewed changes

mwaxmonsky approved these changes Oct 9, 2023

View reviewed changes

Update 'NamesNotInDictionary.txt' to ensure it represents repo at tim…

a3433e2

…e of PR merge.

nusbaume merged commit 0597379 into ESCOMP:main Oct 9, 2023

cacraigucar added a commit to cacraigucar/atmospheric_physics that referenced this pull request Dec 13, 2023

Merge tag 'atmos_phys0_01_000' into atmos_phys_zm_clean_up

3d03d40

Merge pull request ESCOMP#67 from nusbaume/updated_standard_names

nusbaume deleted the updated_standard_names branch September 24, 2024 21:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update standard and function names plus major code clean-up #67

Update standard and function names plus major code clean-up #67

nusbaume commented Sep 18, 2023

peverwhee left a comment

nusbaume commented Sep 20, 2023

PeterHjortLauritzen left a comment

PeterHjortLauritzen Sep 20, 2023

nusbaume Sep 20, 2023

nusbaume Sep 20, 2023

cacraigucar left a comment

cacraigucar left a comment

mwaxmonsky left a comment

		@@ -187,20 +124,20 @@ subroutine wet_to_dry_water_vapor_run(ncol, nz, pdel, pdeldry, qv, qv_dry, &

		integer, intent(in) :: ncol

Update standard and function names plus major code clean-up #67

Update standard and function names plus major code clean-up #67

Conversation

nusbaume commented Sep 18, 2023

peverwhee left a comment

Choose a reason for hiding this comment

nusbaume commented Sep 20, 2023

PeterHjortLauritzen left a comment

Choose a reason for hiding this comment

PeterHjortLauritzen Sep 20, 2023

Choose a reason for hiding this comment

nusbaume Sep 20, 2023

Choose a reason for hiding this comment

nusbaume Sep 20, 2023

Choose a reason for hiding this comment

cacraigucar left a comment

Choose a reason for hiding this comment

cacraigucar left a comment

Choose a reason for hiding this comment

mwaxmonsky left a comment

Choose a reason for hiding this comment