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

Import 5 canopy arrays and 3 photdiag arrays from AQM #1

Merged
merged 3 commits into from
Feb 28, 2024

Conversation

iri01
Copy link
Collaborator

@iri01 iri01 commented Feb 14, 2024

Description

(Instructions: this, and all subsequent sections of text should be removed and filled in as appropriate.)
Provide a detailed description of what this PR does.
What bug does it fix, or what feature does it add?
Is a change of answers expected from this PR?

Import 5 canopy arrays and 3 photdiag output arrays from AQM

Issue(s) addressed

Link the issues to be closed with this PR, whether in this repository, or in another repository.
(Remember, issues should always be created before starting work on a PR branch!)

  • fixes #<issue_number>
  • fixes noaa-emc/fv3atm/issues/<issue_number>

Consistent use of canopy data in photolysis and diffusion, formerly diffusion using LSM Noah look-up table. Enable 2D photolysis diagnostics.

Testing

How were these changes tested?
Tested on rdhpcs hera.

What compilers / HPCs was it tested with?
Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
Have the ufs-weather-model regression test been run? On what platform?

  • Will the code updates change regression test baseline? If yes, why? Please show the baseline directory below.
  • Please commit the regression test log files in your ufs-weather-model branch

The use the AQM canopy data in diffusion changes the results when 'do_canopy' correction is selected.

Dependencies

If testing this branch requires non-default branches in other repositories, list them.
Those branches should have matching names (ideally)

feature/aqm_canopy

Do PRs in upstream repositories need to be merged first?
If so add the "waiting for other repos" label and list the upstream PRs

  • waiting on noaa-emc/nems/pull/<pr_number>
  • waiting on noaa-emc/fv3atm/pull/<pr_number>

@iri01 iri01 requested a review from drnimbusrain February 14, 2024 21:40
@drnimbusrain
Copy link
Member

@iri01 Please comment on this, and I assume we are still waiting on updates to some other files to account for new canopy variables in the ccpp/data GFS .F90 and meta files?

@drnimbusrain drnimbusrain marked this pull request as draft February 27, 2024 14:08
@drnimbusrain
Copy link
Member

I have converted this to draft until you get the other files necessary updated here.

@drnimbusrain drnimbusrain marked this pull request as ready for review February 27, 2024 23:52
Copy link
Member

@drnimbusrain drnimbusrain left a comment

Choose a reason for hiding this comment

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

Only a slight change in the GFS_typedefs.meta to comment out my previous test lines.

dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
### IVAI
[canopylaixy]
standard_name = canopy_leaf_area_index
long_name = canopy leaf area index
Copy link
Member

Choose a reason for hiding this comment

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

@iri01 I am not really using these test canopylaixy and other canopy variables below, and the compilation may complain about duplicate standard names, so I would comment all these "...xy" variables I put below.

@drnimbusrain drnimbusrain self-requested a review February 28, 2024 21:38
@iri01 iri01 merged commit 610593f into feature/aqm_canopy Feb 28, 2024
@iri01 iri01 deleted the feature/aqm_canopy_new branch February 28, 2024 22:09
drnimbusrain pushed a commit that referenced this pull request May 2, 2024
* In GFS_diagnostics make LAI, WILT and FLDCP be outputted with all LSMs. Also, output of LAI should
not depend on RDLAI.

* In GFS_typedefs.* add surface heat flux from the fire for use in RUC LSM.

* Fix hail size output diagnostic array size (#1)

* Added one more variable - frac_grid_burned_out - to GFS_typedefs.F90.
Also, the surface heat flux from fires and frac_grid_burned_out are added to the
model output in GFS_diagnostics.F90.

---------

Co-authored-by: tanyasmirnova <tanya.smirnova@noaa.gov>
Co-authored-by: Anders Jensen <anders.jensen@noaa.gov>
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.

2 participants