Skip to content

Version tags #31

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

Closed
wants to merge 7 commits into from
Closed

Version tags #31

wants to merge 7 commits into from

Conversation

markwoodhouse
Copy link
Collaborator

Addresses #2

  • Gets version from git tags in configure.ac, passed through -D flags in compilation, (clunky) read in cversion.cpp and passed to fortran version.f90.

  • Version tag added to RunInfo.txt and netcdf files as a global attribute in Output.f90

  • Version tag checked when reading files in Restart.f90 -- warning issued if stored version different from current installed Kestrel version.

jakelangham and others added 7 commits August 29, 2024 15:49
It should no longer be necessary to return zero friction when velocities
or heights are low. Such conditional friction expressions were left over
from old code.
These changes give a universal user-settable interface to the various
desingularisation choices made in the numerics and were cherry-picked
from  dc67611.

Co-authored-by: Jake Langham <jacob.langham@manchester.ac.uk>
* New TopogFunc flume that generalizes USGS

* corrected flume walls

* Document general usgs flume geometry

+ small clarification to usgs geometry documentation.

* Add new topos: trislope and 2 simple channels

* xtrislope missing x index

---------

Co-authored-by: Mark Woodhouse <mark.woodhouse@bristol.ac.uk>
* Add GDAL dependency linker flags

These extra linker flags are needed for builds on some systems.

* Avoid -march flags on non-linux builds
This action automatically checks that kestrel builds successfully and that all tests pass, triggered when trying to update testing or main. Test logs are saved as artifacts in case of failure.
@markwoodhouse markwoodhouse added the enhancement New feature or request label Sep 4, 2024
@jakelangham
Copy link
Owner

Hi @markwoodhouse - as it stands, this would merge in some things into main from testing that may be unintentional, like the desingularisation stuff. If you want to create a pull request with just the 'version tags' changes, the way to do it (or one way at least) is to branch off main with something like git checkout main && git checkout -b patch-version_tags, then git cherry-pick 64be109 and create a pull request to merge that branch into main. This extra care that's needed is a side-effect of having these two concurrent main and testing branches. We can decide somewhere down the line if this strategy is paying off, but the idea is that testing will only be fully merged into main 'every so often' so that more volatile changes are kept back.

@markwoodhouse
Copy link
Collaborator Author

Ok, thanks. I'll do this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants