Use correct variable for LUFRAC_ and DLUSE #103
Closed
bbakernoaa wants to merge 4 commits into
Closed
Conversation
3 tasks
BrianCurtis-NOAA
added a commit
to BrianCurtis-NOAA/AQM
that referenced
this pull request
Feb 27, 2025
6 tasks
AnnaSmoot-NOAA
pushed a commit
that referenced
this pull request
Mar 13, 2025
…USE (#106) * Initial commit of rrfs_cmaq_canopy branch. * Initial copy of canopy photolysis routines. * Initial modifications to canopy photolysis CMAQ5.2.1 codes. * Updated CMAQ makefiles for modified canopy codes. * Added new canopy variables to AQM shared components. * Added placeholder new canopy variables to aqm cap for fv3. * Added conditional CANOPY_SHADE environment variable/logical. * Updated conditional canopy_yn environment and logicals. * Fixed bugs. * Removed "RETURN" bug and added diagnostic prints. * Removed debug prints and added canopy variables in DESC3. * Fixed allocation/save bug. * Update Makefile.in * Added new canopy file to read for AQM. * Updated example aqm.rc for canopy settings and file. * Initial changes for reading canopy data in AQM. * Updated aqm_emis_read and aqm.rc for canopy variables. * Moved ASX_DATA_MOD to compile above Phot.F * Updated to remove default ASX_DATA_MOD and phot.F This reverts commit 1abdda0. This reverts commit 43588af. * initialize feature/pt-source * Testing Sub-Canopy phot effects only. * Enable CMAQ simplistic scavenging and wet removal in resolved clouds. * Fix naming inconsistency for convective and nonconvective precipitation fields. * Properly set compiler flags in GNU build system for fixed source form files. * Remove leftover code in PT3D_DEFN * Remove duplicate get-config in `aqm_methods` * Remove 'AREA' case in `interpx` was added by Youhua but is not present in upstream * Remove fenghsa `em%dens_flag` block upstream doesn't have it Quick check of canopy inputs and photolysis attenuation factors. * Update phot.F Fixed bug on integrating though ZCAN=ZFL, and rolled back to FCH > 0.5 m canopy condition to be consistent with initial implementation. * Revert fixes to get debug mode working with UFSWM debug run (#57) * Restricted to FCH and LAI only to match CCPP physics. * Fixed bug in IF statement for canopy conditions. * update CMAQ respository * update aqm_files.cmake with corresponding code changes in the local /model/src folder * Update centralized_io_module.F * Add files via upload un-commented all MAPS lines, and changed CMakeList.txt * Update ASX_DATA_MOD.F * Update o3totcol.f * Update vdiffacmx.F * Update aqm_files.cmake turn on according changed codes in local src/ folder * Update .gitmodules point to CMAQ 5.4+ * Update RUNTIME_VARS.F * Change aqm_files.cmake to use ROS3 solver * Add rbdriver.F file to localCCTM folder. There is a typo in CMAQ's source file and therefore need to put it here * Update PT3D_STKS_DEFN.F * Fix issue with array trying to set data where water is * Bring in changes from #103 * Fix debug runtime bug in PT3d_STKE_DEFN.f --------- Co-authored-by: Patrick.C.Campbell@noaa.gov <Patrick.C.Campbell@m71a1.ncep.noaa.gov> Co-authored-by: Patrick Campbell <dr.nimbusrain@gmail.com> Co-authored-by: bbakernoaa <barry.baker@noaa.gov> Co-authored-by: Youhua Tang <Youhua.Tang@noaa.gov> Co-authored-by: Raffaele Montuoro <raffaele.montuoro@noaa.gov> Co-authored-by: Zachary Moon <zmoon92@gmail.com> Co-authored-by: Wei Li <liweicugb@gmail.com> Co-authored-by: lwcugb <35088762+lwcugb@users.noreply.github.com> Co-authored-by: Beiming Tang <51177339+btang1@users.noreply.github.com>
Collaborator
|
Merged in with #106 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This pull request introduces several changes to the
module AQMand related files to add support for a new field,vtype, which represents vegetation type. The most important changes include updating the import field count, adding thevtypefield to various sections, and modifying theaqm_state_typeto includevtype. Will close #102Changes to support the new
vtypefield:src/aqm_cap.F90: Updated theimportFieldCountto 37 and added thevtypefield to the list of import fields. [1] [2]src/aqm_comp_mod.F90: Modified theaqm_comp_importsubroutine to handle the newvtypefield.src/shr/aqm_methods.F90: Updated theinterpxfunction to use thevtypefield for the 'LUFRAC_' and 'DLUSE' cases. [1] [2]src/shr/aqm_state_mod.F90: Added thevtypefield to theaqm_state_typestructure, ensuring it is included among the 2D variables.PR Checklist
[ x] RDHPCS.
This PR has been tested with the ufs-srweather-app workflow online-cmaq branch.
New or updated input data is required by this PR.
Baselines are expected to change.
Description
Issue(s) addressed
Dependencies