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

Latest updates to develop-sundials that include enthalpy options #559

Merged
merged 336 commits into from
May 16, 2024

Conversation

ashleymedin
Copy link
Contributor

@ashleymedin ashleymedin commented Feb 19, 2024

This update includes refactor and clean up of the opSplittin routines from Sean, the option to have nrgConserv = closedForm (traditional method) or nrgConserv = enthalpyFD or nrgConserv = enthalpyFDlu, the enthalpy method to conserve energy using the soil enthalpy from the analytical solution or the lookup tables, respectively.
New output variables that give balance errors can be computed by adding to the outputControl.txt

balanceCasNrg         | 1
balanceVegNrg         | 1
balanceSnowNrg        | 1
balanceSoilNrg        | 1
balanceVegMass        | 1
balanceSnowMass       | 1
balanceSoilMass       | 1
balanceAqMass         | 1

Other notable changes are the constraints scale the linesearch in numMethod = numrec or numMethod = kinsol only on the state variable they are violating, not the entire vector, and the feasiblity/constraints have been corrected for previous bugs in their values. Two end member cases that led to decisions being based on unintialized values (one in the SummaBE solve loop in summaSolv, one in opSplittin) have been fixed, as well as 6 cases of allocation type errors that caused gcc13 to have an internal compiler segfault.

ashleymedin and others added 30 commits January 20, 2024 02:14
…py related) -- this means maxiter param does not do anything
Hotfix for error message issue in varSubstep.
Hotfix for error message truncation problem
ashleymedin and others added 28 commits April 22, 2024 19:49
Update cmakelists to include c netcdf library for actors.
* ent_state: (77 commits)
  clean up aquiferIni decision
  change lyr_wght
  change to snow balance is realMissing if never a snow state in the data window, not just at end
  remove scaledBalance variable, decision name clarify-- now closedForm, enthalpyFormLU, or enthalpyForm
  banded enthalpy Jacobian needed different index
  account for missing vegetation in jacobian
  a bit more Brent speed up
  calculate snow merge detection outside of brent
  better bounds for brent function
  need to put snow merge condition on enthalpy as well as temperature
  need to change root finding to be on enthalpy
  ...

# Conflicts:
#	build/source/driver/summa_setup.f90
#	build/source/engine/coupled_em.f90
#	build/source/engine/enthalpyTemp.f90
#	build/source/engine/eval8summaWithPrime.f90
#	build/source/engine/layerMerge.f90
#	build/source/engine/systemSolv.f90
#	build/source/engine/varSubstep.f90
#	utils/bal_per_GRU.py
…parameters to match V3.

I have added some new files to Summa-Actors and now leverage the restart and setup files from summa.

I have also edited the order of paremeters for vegPhenlgy to match what is now a pull request in V3
Edit cmake lists file to reflect updates to summa-actors, and adjust …
…lit, can lose them in the middle of a run when snow buries the canopy
@wknoben
Copy link
Collaborator

wknoben commented May 16, 2024

Merging as per Ashley's request.

@wknoben wknoben merged commit 905f085 into CH-Earth:develop_sundials May 16, 2024
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.

4 participants