Jgfouca/upstream merge 2024 08 22 #2961
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
Change the longnames for all the joint-histogram variables to make them distinguishable.
We do not use this mode anymore and it is too difficult to maintain.
This merge uses the `landIceDraftObserved`, `landIcePressureObserved` and `landIceFloatingFracObserved` to initialize the corresponding MPAS-Ocean variables. Previously, the `landIcePressure` was being computed in a subroutine and the `landIceFloatingFraction` was required to be identical to `landIceFraction`. This merge also removes the unused variable `landIceGroundedFracObserved`
Instead, it will be read in from the topography file directly, meaning it can be updated (e.g. from ssh adjustment).
this is a more accurate description for how it is uses, since it can determine where we modify either ssh or landIcePressure, depending on the approach.
This could allow us to choose to have melting bleed into cells that are partly open ocean (e.g. for conservation when coupling to MALI).
-Shortened registry description for ocean bgc concentrations -Corrected some unit descriptions -Clean-up in mpas_seaice_icepack bugfix (BFB without bgc/zaerosols)
This is needed because otherwise locations with nonzero ice draft get missed and the Haney number may be too high for model stability.
This provides some minor fixes for the recent zonal mean output capability. The most notable change is in how the zonal mean vertical velocity and theta are modified. [BFB] (except for ZM variables)
based on Fourteau, et al. (2021) - is now density and temp dependent
Add an extra argument, related to CAAS filtering, in iMOAB mapping. [BFB]
Updates mksurfdata and namelist files to generate inputs for TOP solar radiation parameterization in surface data. [BFB]
Fixes gotm interface for vertical mixing If GOTM is enabled surface friction velocity is not calculated at present. This fixes that issue by allowing KPP_input_fields to be calculated for cvmix and gotm Fixes #6507 [BFB]
…(PR #6524) Implemented the new snow thermal conductivity calculation method introduced in [Fourteau, et al. (2021)](https://tc.copernicus.org/articles/15/2739/2021/) in ELM. This improves the current method, introduced in [Jordan (1991)](https://erdc-library.erdc.dren.mil/jspui/handle/11681/11677) which only depends on the snow density. relevant nl changes `use_T_rho_dependent_snowthk = .true. ` [ELM] [BFB] [NML]
Add F2010-SCREAMv1 test to e3sm_gpucxx suite to get test coverage on GPU for EAMxx codebase in main E3SM repo. Fixes #6540. [BFB]
Adding support for PnetCDF for HOMME standalone builds on Anvil and Chrysalis [BFB]
…MMF2 compsets to improve stability and throughput. Some of these required updates to the PAM submodule, but the most important change was the addition of adaptive sub-cycling in the PAM driver. This change allowed the CRM time step to be increased to 10 seconds, which dramatically improved the throughput while also making the model much more resilient to numerically unstable conditions due to unrealistically strong velocities (still not sure why these occur in the first place). List of notable changes for PAM and/or the driver: adaptive subcycling in PAM driver enable variance transport by default disable mean-state acceleration for dry density use crm_nx=45 with exact interpolation for PAM dycor (requires odd CRM columns) increase PAM hyperdiffusion timescale to 60 seconds to reduce over-smoothing Fixes #6363 [non-BFB] only for MMF2 Merge branch 'whannah/mmf/pam-updates'
…merge_2024_08_22 * upstream/master: (388 commits) Revert to external cosp.F90 to fix build error for EAMxx Add F2010-SCREAMv1 test to e3sm_gpucxx suite re-enable MMF2 test minor stylistic change minor stylistic / precision mods removed testing write statements clean up master & feature branch merge changed flag name for new snow thk flag to be more descriptive Added new snow Thermal Conductivity in SoilTemperatureMod.F90 based on Fourteau, et al. (2021) - is now density and temp dependent Adding support for PnetCDF in HOMME on Anvil Adding support for PnetCDF in HOMME on Chrysalis Updates cime imports Update bld files to match Registry Add FOLISIO compset Update mpas.ais4to20km and mpas.ais8to30km meshes to new versions Add mapping files for ais4to20 and ais8to30 Correct filenames in buildnml Add TL319_oQU240wLI_ais8to30 grid add 2 new AIS meshes for MALI Update ANL LCRC Improv ...
jgfouca
added
AT: AUTOMERGE
bartgol
approved these changes
Aug 22, 2024
|
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: SCREAM_PullRequest_Autotester_Mappy
Jenkins Parameters
Build InformationTest Name: SCREAM_PullRequest_Autotester_Weaver
Jenkins Parameters
Using Repos:
Pull Request Author: jgfouca |
|
Status Flag 'Pull Request AutoTester' - Jenkins Testing: 1 or more Jobs FAILED Note: Testing will normally be attempted again in approx. 2 Hrs. If a change to the PR source branch occurs, the testing will be attempted again on next available autotester run. Pull Request Auto Testing has FAILED (click to expand)Build InformationTest Name: SCREAM_PullRequest_Autotester_Mappy
Jenkins Parameters
Build InformationTest Name: SCREAM_PullRequest_Autotester_Weaver
Jenkins Parameters
SCREAM_PullRequest_Autotester_Mappy # 5784 FAILED (click to see last 100 lines of console output)SCREAM_PullRequest_Autotester_Weaver # 6010 PASSED (click to see last 100 lines of console output) |
|
NLFAILs are expected. Merging. |
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.
There were no conflicts.