-
Notifications
You must be signed in to change notification settings - Fork 18
sima0_12_000: Implement tracer_data in CAM-SIMA; registry entries for prescribed ozone/BAM; NaN check in physics data check #441
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
Merged
Merged
Changes from 36 commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
66bbc52
Initial (lightly modified) version of tracer_data from CAM; utilities…
jimmielin 92877f7
First try at dechunkization
jimmielin d523030
First try at removing pbuf support
jimmielin 977910f
Remove (for now) horizontal weighting for aircraft emiss.
jimmielin 88649c6
to_lower units; use state directly in advance_trcdata
jimmielin 322fd79
Merge branch 'development' into hplin/tracer_data
jimmielin c4b2f17
Fixes to build tracer_data in SIMA.
jimmielin 37064db
Merge branch 'development' into hplin/tracer_data
jimmielin 35c9bbc
Cleanup
jimmielin 4a6bdef
Merge branch 'development' into hplin/tracer_data
jimmielin d9802ea
Merge branch 'development' into hplin/tracer_data
jimmielin a8c6b01
Add tracer_data regression test; regridding fix; registry entries for…
jimmielin 1ee957f
Add NaN check in check data
jimmielin 0d683ec
Merge branch 'development' into hplin/tracer_data
jimmielin 3a50f89
Update to sync with review comments atmos_phys (2)
jimmielin f8381c3
Fix regression tests.
jimmielin 9c1ece0
Fix regression tests, take two
jimmielin 2b9cd4e
Update cime_config/testdefs/testlist_cam.xml
jimmielin 55f06db
Merge branch 'development' into hplin/tracer_data
jimmielin a49d68e
Merge branch 'hplin/tracer_data' of github.com:jimmielin/CAM-SIMA int…
jimmielin 27f8b9e
Address review comments: reduce extraneous computations in nan calcul…
jimmielin ffbc6a8
Address review comments: remove unstructured and replace with dycore_…
jimmielin 1c45bfb
Address various review comments in tracer_data
jimmielin 81f93ba
Merge branch 'development' into hplin/tracer_data
jimmielin c06fe83
Remove duplicate O3
jimmielin d88de0e
Move string functions to string_core_utils; add pfunit tests
jimmielin e4d2de0
Address review comments further: errmsg, check_allocate; cleanup
jimmielin 9bbf406
Cleanup for review comments; use statements
jimmielin 7c69f00
Change to allocatables; clean up use statements
jimmielin 0f0dbcf
Cleanup use statements
jimmielin c4edc59
Use rebin from atmos_phys.
jimmielin f5e85f6
Merge branch 'development' into hplin/tracer_data
jimmielin 6500043
Merge branch 'development' into hplin/tracer_data
jimmielin 0fbbbda
Merge branch 'development' into hplin/tracer_data
jimmielin 033e390
Merge branch 'development' into hplin/tracer_data
jimmielin 8dcd0e8
Fix check_field_4d with nan_count feature
jimmielin 285fa65
Merge branch 'development' into hplin/tracer_data
jimmielin 319e95f
Small cleanups to tracer_data
jimmielin 775ce6f
Update to latest atmos_phys hash (in main)
jimmielin d201a47
Fix plat, plon
jimmielin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
2 changes: 2 additions & 0 deletions
2
cime_config/testdefs/testmods_dirs/cam/outfrq_trcdata_bam_derecho/shell_commands
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites tracer_data_test" | ||
| ./xmlchange RUN_STARTDATE="1979-01-01" |
53 changes: 53 additions & 0 deletions
53
cime_config/testdefs/testmods_dirs/cam/outfrq_trcdata_bam_derecho/user_nl_cam
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| ! these snapshots were constructed to specifically test whether the data read into the | ||
| ! physics buffer by tracer_data in CAM will match the data read by CAM-SIMA bit-for-bit. | ||
| ! this was done by | ||
| ! (1) taking a FHIST_C4 snapshot (which has prescribed_ozone and aero) | ||
| ! in this case a ne3pg3_fhistc4_gw_drag_cam4_oro snapshot, | ||
| ! (2) using nco to zero out the prescribed ozone and aero fields from the snapshot data, | ||
| ! to create the "before" snapshot. | ||
| ! (3) the "after" snapshot is the original snapshot file (which has non-zero values for prescribed | ||
| ! ozone and aerosols) | ||
| ! the test will pass iff. the tracer_data utility in CAM-SIMA and the prescribed_ozone/aerosols schemes | ||
| ! can populate the prescribed fields bit-for-bit compared to the original snapshot file. | ||
|
|
||
| ncdata = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_fhistc4_tracer_data_0xprescribed-ozone-aero_from_cam4_oro_snapshot_derecho_gnu_after_c20251028.nc' | ||
| ncdata_check = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_fhistc4_gw_drag_cam4_oro_snapshot_derecho_gnu_after_c20250826.nc' | ||
|
|
||
| ! tolerances for testing | ||
| ncdata_check_err = .true. | ||
| min_difference = 2e-15 | ||
|
|
||
| ! cam4 vertical levels (FHIST_C4 snapshots) | ||
| pver = 26 | ||
|
|
||
| prescribed_aero_datapath = "/glade/campaign/cesm/cesmdata/inputdata/atm/cam/chem/trop_mozart_aero/aero" | ||
| prescribed_aero_file = "aero_1.9x2.5_L26_1850-2005_c091112.nc" | ||
| prescribed_aero_filelist = "aero_1.9x2.5_L26_list_c070514.txt" | ||
| prescribed_aero_model = "bulk" | ||
| prescribed_aero_specifier = 'sulf:SO4', 'bcar1:CB1', 'bcar2:CB2', 'ocar1:OC1', 'ocar2:OC2', 'sslt1:SSLT01', 'sslt2:SSLT02', 'sslt3:SSLT03', 'sslt4:SSLT04', 'dust1:DST01', 'dust2:DST02', 'dust3:DST03', 'dust4:DST04' | ||
| prescribed_aero_type = "INTERP_MISSING_MONTHS" | ||
| prescribed_aero_cycle_yr = 0 | ||
| prescribed_aero_fixed_tod = 0 | ||
| prescribed_aero_fixed_ymd = 0 | ||
|
|
||
| aerodep_flx_datapath = '/glade/campaign/cesm/cesmdata/inputdata/atm/cam/chem/trop_mozart_aero/aero' | ||
| aerodep_flx_file = 'aerosoldep_monthly_1849-2006_1.9x2.5_c090803.nc' | ||
| aerodep_flx_specifier = 'BCDEPWET', 'BCPHODRY', 'BCPHIDRY', 'OCDEPWET', 'OCPHODRY', 'OCPHIDRY', 'DSTX01DD', 'DSTX02DD', 'DSTX03DD', | ||
| 'DSTX04DD', 'DSTX01WD', 'DSTX02WD', 'DSTX03WD', 'DSTX04WD' | ||
| aerodep_flx_type = 'INTERP_MISSING_MONTHS' | ||
| aerodep_flx_cycle_yr = 0 | ||
|
|
||
| prescribed_ozone_datapath = "/glade/campaign/cesm/cesmdata/inputdata/atm/cam/ozone" | ||
| prescribed_ozone_file = "ozone_1.9x2.5_L26_1850-2005_c091112.nc" | ||
| prescribed_ozone_filelist = "UNSET" | ||
| prescribed_ozone_name = "O3" | ||
| prescribed_ozone_type = "INTERP_MISSING_MONTHS" | ||
| prescribed_ozone_fixed_tod = 0 | ||
| prescribed_ozone_fixed_ymd = 0 | ||
| prescribed_ozone_cycle_yr = 0 | ||
|
|
||
| hist_output_frequency;h1: 1*nsteps | ||
| hist_max_frames;h1: 1 | ||
| hist_add_inst_fields;h1:ozone | ||
| hist_add_inst_fields;h1:sulf_D,bcar1_D,bcar2_D,ocar1_D,ocar2_D,sslt1_D,sslt2_D,sslt3_D,sslt4_D,dust1_D,dust2_D,dust3_D,dust4_D | ||
| hist_precision;h1: REAL64 |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we actually use this feature in cam. This was left over from the old MOZART chemical transport model. Not sure that
increment_stringneeds to migrated to CAM-SIMA.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems it's mentioned in this "ccm type filename" block in
tracer_data.CAM-SIMA/src/utils/tracer_data.F90
Lines 990 to 1005 in 8dcd0e8
I agree it is likely unused. I am happy to make an issue to remove this in a future cleanup. Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be nice to clean this up. If you want to do it an a future PR, that's fine with me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @fvitt - I added #474 as a future issue so I can go back and clean this up.