CMAQv5.2.1 Release #98
Merged
Conversation
This file contains 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
On branch orgaer modified: CCTM/scripts/run_cctm.csh modified: CCTM/src/aero/aero6/AEROSOL_CHEMISTRY.F modified: CCTM/src/aero/aero6/AERO_DATA.F modified: CCTM/src/aero/aero6/SOA_DEFN.F modified: CCTM/src/aero/aero6/aero_driver.F modified: CCTM/src/aero/aero6/aero_subs.F modified: bldit_project.csh
On branch orgaer modified: CCTM/scripts/run_cctm.csh modified: bldit_project.csh
-removes errant line added to the template
Conflicts: CCTM/scripts/run_cctm.csh bldit_project.csh
modified: CCTM/src/gas/smvgear/grsprse.F
-changed how temporary arrays are allocated and initialized to
prevent convergence failure when compiling using -O3 flag with
the ifort version 15 or higher
Conflicts: CCTM/scripts/run_cctm.csh On branch orgaer Changes to be committed: modified: CCTM/scripts/run_cctm.csh modified: CCTM/src/MECHS/cb6r3_ae6_aq/SpecDef_Dep_cb6r3_ae6_aq.txt modified: CCTM/src/emis/emis/EMIS_DEFN.F modified: CCTM/src/emis/emis/LTNG_DEFN.F deleted: POST/combine/scripts/spec_def_files/SpecDef_Dep_cb05tump_ae6_aq.txt new file: POST/combine/scripts/spec_def_files/SpecDef_Dep_saprc07tb_ae6_aq.txt deleted: POST/combine/scripts/spec_def_files/SpecDef_Dep_saprc07tb_ae6i_aq.txt new file: POST/combine/scripts/spec_def_files/SpecDef_Dep_saprc07tic_ae6invPOA_aq.txt deleted: POST/combine/scripts/spec_def_files/SpecDef_Dep_saprc07tic_ae6invPOA_aq2.txt deleted: POST/combine/scripts/spec_def_files/SpecDef_cb05tump_ae6_aq.txt new file: POST/combine/scripts/spec_def_files/SpecDef_saprc07tb_ae6_aq.txt deleted: POST/combine/scripts/spec_def_files/SpecDef_saprc07tb_ae6i_aq.txt modified: POST/combine/scripts/spec_def_files/linkem modified: bldit_project.csh
modified: POST/writesite/src/writesite.F Bugfix by Christian Hogrefe: The previous version of writesite (released with CMAQv5.2) did not support polar stereographic projections except when SITE_FILE was set to “ALL” (or not set at all, since the default behavior seems to be to internally set SITE_FILE to ALL if not set to a different value in the script). This revised version added polar stereographic projection support to the “ToProj” subroutine in writesite.F which is called by module_site.F if SITE_FILE is set to a value different than ALL (and the corresponding SITE_FILE contains valid lon/lat entries). In addition, the error messages at the end of the SetProj, ToProj, and ToLL subroutines in writesite.F were updated to say “Unsupported map projection” instead of “Map projection setup error”
On branch blditproj modified: CCTM/src/util/util/setup_logdev.F
On branch orgaer modified: CCTM/src/aero/aero6/aero_subs.F modified: bldit_project.csh
Make generalized solvers work with ifort version 17
Small changes to scripts and log filenames
On branch bioseason modified: CCTM/scripts/run_cctm.csh
Turn on bioseason switch by default
On branch advtol modified: CCTM/src/driver/yamo/advstep.F
On branch scripts modified: POST/appendwrf/scripts/run_appendwrf.csh modified: POST/bldoverlay/scripts/run_bldoverlay.csh modified: POST/block_extract/scripts/run_block_extract.csh modified: POST/combine/scripts/run_combine.csh modified: POST/hr2day/scripts/run_hr2day.csh modified: POST/sitecmp/scripts/run_sitecmp_AQS_Hourly.csh modified: POST/sitecmp_dailyo3/scripts/run_sitecmp_dailyo3_AQS.csh modified: POST/sitecmp_dailyo3/scripts/run_sitecmp_dailyo3_CASTNET.csh modified: POST/writesite/scripts/run_writesite.csh
Bugfix to writesite utility
Updates to Scripts to pass compiler information appropriately
modified: CCTM/src/gas/ebi_cb05e51_ae6nvPOA_aq/hrdriver.F
modified: CCTM/src/gas/ebi_cb05eh51_ae6_aq/hrdriver.F
modified: CCTM/src/gas/ebi_cb05mp51_ae6_aq/hrdriver.F
modified: CCTM/src/gas/ebi_cb05tucl_ae6_aq/hrdriver.F
modified: CCTM/src/gas/ebi_cb6r3_ae6_aq/hrdriver.F
modified: CCTM/src/gas/ebi_cb6r3_ae6nvPOA_aq/hrdriver.F
modified: CCTM/src/gas/ebi_racm2_ae6_aq/hrdriver.F
modified: CCTM/src/gas/ebi_saprc07tb_ae6_aq/hrdriver.F
modified: CCTM/src/gas/ebi_saprc07tc_ae6_aq/hrdriver.F
modified: CCTM/src/gas/ebi_saprc07tc_ae6nvPOA_aq/hrdriver.F
modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrdriver.F
modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrdriver.F
modified: UTIL/create_ebi/template_RXNSU_OPT/hrdriver.F
-enabled INTERPX offset for METCRO2D to be different than offsets than
METCRO3D. The change allows the METCRO2D file to have different horizontal dimensions
and origin than the METCRO3D file. This circumstance occurs for the twoway model because
the METBDY3D is not available.
For hrdriver.F, UNIQUE INTERPX offsets for METCRO2D
On branch makefile modified: UTIL/bldmake/src/bldmake.f modified: config_cmaq.csh
… hydrolysis A new EBI solver is needed since the mechanism file was changed
…s/ include paths Updates compilation options and include paths
…in s07tic Removed the duplicate heterogeneous reaction of N2O5: <HET_N2O5>
-added tables list functions possible in formula expressions
modified: POST/combine/src/combine.F
modified: POST/combine/src/module_evaluator.F
modified: POST/combine/src/module_file.F
modified: POST/combine/src/module_specdef.F
modified: POST/combine/src/utils.F
-attempted to make formula evaluator obey mathematical rules of
operation
-added several grid cell functions and checks to prevent floating point
errors when using them
fixed table syntax
Corrected test to allow an argument equal to zero but stop program if argument is less than zero.
-added SAVE attribute to minl2sg and maxl2sg arrays otherwise the array's values may
not saved after the first call based on the compiler, compile flags and platform. For
example, gfortran version 4.6.3 does not when using debug flags.
…ndary condition aerosol checks Fix bugs in Aerosol ICBC checking
…tegories were inadvertently omitted from agricultural classes in the NH3 bidirectional exchange model. This reduced the fraction of agricultural land by approximately 30%. However, the impact on NH3 emissions was much smaller due to the lower intensity of fertilization for pasture and due to the application of fertilizer on pasture in the spring and fall when ambient temperatures are lower and thus the emission potential is lower. Preliminary results indicate that this results in approximately a 10% increase in the ambient NH3 concentrations. modified: CCTM/src/depv/m3dry/ABFLUX_MOD.F
Hay land use fix for bidirectional NH3
… l2sg values Make getpar save values of minl2sg and maxl2sg
…cessing) Improve combine's math
On branch make_debug modified: UTIL/bldmake/src/bldmake.f
Changes to be committed: modified: CCTM/scripts/bldit_cctm.csh modified: UTIL/bldmake/src/bldmake.f modified: UTIL/bldmake/src/cfg_module.f modified: UTIL/bldmake/src/utils.f
…debug flags in Makefile at build Implement command-line option for DEBUG flags in makefile
On branch dev removed all SNL routines so CMAQ does not depend on it any more
remove SNL routines
On branch dev removed all SWAP routines and replaced with SE_COMM
removed all SWAP routines and replaced with SE_COMM
On branch 5.2 modified: driver/yamo/driver.F
Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. On branch aerosol_doc new file: User_Manual/Appendix_A/cb05e51_ae6_aq/AE6_species_table_master.md new file: User_Manual/Appendix_A/cb05tucl/AE6_species_table_master.md new file: User_Manual/Appendix_A/cb6mp_ae6_aq/AE6_species_table.md new file: User_Manual/Appendix_A/cb6mp_ae6_aq/CB6_species_table.md new file: User_Manual/Appendix_A/cb6r3_ae6_aq/AE6_species_table.md new file: User_Manual/Appendix_A/racm2_ae6_aq/AE6_species_table_master.md new file: User_Manual/Appendix_A/saprc07tb_ae6_aq/AE6_species_table_master.md new file: User_Manual/Appendix_A/saprc07tc_ae6_aq/AE6_species_table_master.md new file: User_Manual/Appendix_A/saprc07tic_ae6i_aq/AE6_species_table_master.md
On branch aerosol_doc new file: DOCS/User_Manual/Appendix_A/cb05e51_ae6_aq/AE6_species_table.md deleted: DOCS/User_Manual/Appendix_A/cb05e51_ae6_aq/AE6_species_table_master.md new file: DOCS/User_Manual/Appendix_A/cb05tucl/AE6_species_table.md deleted: DOCS/User_Manual/Appendix_A/cb05tucl/AE6_species_table_master.md new file: DOCS/User_Manual/Appendix_A/racm2_ae6_aq/AE6_species_table.md deleted: DOCS/User_Manual/Appendix_A/racm2_ae6_aq/AE6_species_table_master.md new file: DOCS/User_Manual/Appendix_A/saprc07tb_ae6_aq/AE6_species_table.md deleted: DOCS/User_Manual/Appendix_A/saprc07tb_ae6_aq/AE6_species_table_master.md new file: DOCS/User_Manual/Appendix_A/saprc07tc_ae6_aq/AE6_species_table.md deleted: DOCS/User_Manual/Appendix_A/saprc07tc_ae6_aq/AE6_species_table_master.md new file: DOCS/User_Manual/Appendix_A/saprc07tic_ae6i_aq/AE6_species_table.md deleted: DOCS/User_Manual/Appendix_A/saprc07tic_ae6i_aq/AE6_species_table_master.md
…le sin user guide On branch 5.2.1 modified: DOCS/User_Manual/Appendix_A/cb05e51_ae6_aq/AE6_species_table.md modified: DOCS/User_Manual/Appendix_A/cb05tucl/AE6_species_table.md modified: DOCS/User_Manual/Appendix_A/cb6mp_ae6_aq/AE6_species_table.md modified: DOCS/User_Manual/Appendix_A/cb6r3_ae6_aq/AE6_species_table.md modified: DOCS/User_Manual/Appendix_A/racm2_ae6_aq/AE6_species_table.md modified: DOCS/User_Manual/Appendix_A/saprc07tb_ae6_aq/AE6_species_table.md modified: DOCS/User_Manual/Appendix_A/saprc07tc_ae6_aq/AE6_species_table.md modified: DOCS/User_Manual/Appendix_A/saprc07tic_ae6i_aq/AE6_species_table.md
These developments include mostly bug fixes but also some very minor feature improvements Conflicts: CCTM/src/util/util/setup_logdev.F POST/bldoverlay/scripts/run_bldoverlay.csh POST/sitecmp/scripts/run_sitecmp_AQS_Hourly.csh POST/sitecmp_dailyo3/scripts/run_sitecmp_dailyo3_CASTNET.csh On branch 5.2.1 modified: CCTM/scripts/bldit_cctm.csh modified: CCTM/src/MECHS/saprc07tic_ae6i_aq/RXNS_DATA_MODULE.F90 modified: CCTM/src/MECHS/saprc07tic_ae6i_aq/RXNS_FUNC_MODULE.F90 modified: CCTM/src/MECHS/saprc07tic_ae6i_aq/mech_saprc07tic_ae6i_aq.def modified: CCTM/src/MECHS/saprc07tic_ae6invPOA_aq/RXNS_DATA_MODULE.F90 modified: CCTM/src/MECHS/saprc07tic_ae6invPOA_aq/RXNS_FUNC_MODULE.F90 modified: CCTM/src/MECHS/saprc07tic_ae6invPOA_aq/mech_saprc07tic_ae6invPOA_aq.def modified: CCTM/src/STENEX/se/se_comm_module.f modified: CCTM/src/aero/aero6/AEROSOL_CHEMISTRY.F modified: CCTM/src/aero/aero6/AERO_DATA.F modified: CCTM/src/aero/aero6/SOA_DEFN.F modified: CCTM/src/aero/aero6/aero_driver.F modified: CCTM/src/aero/aero6/aero_subs.F modified: CCTM/src/aero/aero6/getpar.f modified: CCTM/src/depv/m3dry/ABFLUX_MOD.F modified: CCTM/src/driver/yamo/advstep.F modified: CCTM/src/driver/yamo/driver.F modified: CCTM/src/gas/ebi_cb05e51_ae6_aq/hrdriver.F modified: CCTM/src/gas/ebi_cb05e51_ae6nvPOA_aq/hrdriver.F modified: CCTM/src/gas/ebi_cb05eh51_ae6_aq/hrdriver.F modified: CCTM/src/gas/ebi_cb05mp51_ae6_aq/hrdriver.F modified: CCTM/src/gas/ebi_cb05tucl_ae6_aq/hrdriver.F modified: CCTM/src/gas/ebi_cb6r3_ae6_aq/hrdriver.F modified: CCTM/src/gas/ebi_cb6r3_ae6nvPOA_aq/hrdriver.F modified: CCTM/src/gas/ebi_racm2_ae6_aq/hrdriver.F modified: CCTM/src/gas/ebi_saprc07tb_ae6_aq/hrdriver.F modified: CCTM/src/gas/ebi_saprc07tc_ae6_aq/hrdriver.F modified: CCTM/src/gas/ebi_saprc07tc_ae6nvPOA_aq/hrdriver.F modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrdata_mod.F modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrdriver.F modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrg1.F modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrg2.F modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrg3.F modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrg4.F modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrinit.F modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrprodloss.F modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrrates.F modified: CCTM/src/gas/ebi_saprc07tic_ae6i_aq/hrsolver.F modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrdata_mod.F modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrdriver.F modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrg1.F modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrg2.F modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrg3.F modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrg4.F modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrinit.F modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrprodloss.F modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrrates.F modified: CCTM/src/gas/ebi_saprc07tic_ae6invPOA_aq/hrsolver.F modified: CCTM/src/gas/ros3/rbsparse.F modified: CCTM/src/gas/smvgear/grsprse.F modified: CCTM/src/hadv/yamo/rdbcon.F modified: CCTM/src/hadv/yamo/x_ppm.F modified: CCTM/src/hadv/yamo/x_yamo.F modified: CCTM/src/hadv/yamo/y_ppm.F modified: CCTM/src/hadv/yamo/y_yamo.F modified: CCTM/src/hdiff/multiscale/deform.F modified: CCTM/src/hdiff/multiscale/hdiff.F modified: CCTM/src/init/yamo/load_cgrid.F modified: CCTM/src/util/util/setup_logdev.F modified: POST/bldoverlay/scripts/run_bldoverlay.csh modified: POST/combine/README.md modified: POST/combine/src/combine.F modified: POST/combine/src/module_evaluator.F modified: POST/combine/src/module_file.F modified: POST/combine/src/module_specdef.F modified: POST/combine/src/utils.F modified: POST/sitecmp/scripts/run_sitecmp_AQS_Hourly.csh modified: POST/sitecmp_dailyo3/scripts/run_sitecmp_dailyo3_CASTNET.csh modified: POST/writesite/src/writesite.F modified: UTIL/bldmake/src/bldmake.f modified: UTIL/bldmake/src/cfg_module.f modified: UTIL/bldmake/src/utils.f modified: UTIL/create_ebi/template_RXNSU_OPT/hrdriver.F modified: config_cmaq.csh
On branch 5.2.1 modified: CCTM/docs/README.md modified: CCTM/docs/Release_Notes/README.md modified: CCTM/scripts/bldit_cctm.csh modified: CCTM/scripts/run_cctm.csh deleted: DOCS/Known_Issues/CMAQv5.2-i2/LTNG_DEFN.F deleted: DOCS/Known_Issues/CMAQv5.2-i4/advstep.F deleted: DOCS/Known_Issues/CMAQv5.2-i5/AEROSOL_CHEMISTRY.F deleted: DOCS/Known_Issues/CMAQv5.2-i5/AERO_DATA.F deleted: DOCS/Known_Issues/CMAQv5.2-i5/SOA_DEFN.F deleted: DOCS/Known_Issues/CMAQv5.2-i5/aero_driver.F deleted: DOCS/Known_Issues/CMAQv5.2-i5/aero_subs.F deleted: DOCS/Known_Issues/CMAQv5.2-i5/getpar.f deleted: DOCS/Known_Issues/CMAQv5.2-i6/AERO_DATA.F deleted: DOCS/Known_Issues/CMAQv5.2-i6/load_cgrid.F deleted: DOCS/Known_Issues/CMAQv5.2-i6/rdbcon.F modified: DOCS/Known_Issues/README.md modified: DOCS/README.md modified: DOCS/Tutorials/README.md modified: DOCS/User_Manual/README.md modified: README.md modified: bldit_project.csh modified: config_cmaq.csh
kmfoley
pushed a commit
to kmfoley/CMAQ
that referenced
this pull request
Oct 2, 2024
Chogrefe wbd patch 1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 includes all of the minor bug fixes and resolutions to model issues addressed in the CMAQv5.2 release code from June 30, 2017 to Feb 5, 2018. It also includes updates to documentation and the scripts that drive compilation and execution of CMAQ.