Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Glads gl #648

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.

Sign up for GitHub

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

Open
wants to merge 75 commits into
base: devel
Choose a base branch
from
Open

Glads gl #648

Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
5162ce5
Adding routine for calculating GlaDS cross GL flux (total from both
RupertGladstone Jan 31, 2024
c26a49d
Renamed "workvar" to human readable names
RupertGladstone Jan 31, 2024
e3ea43f
tidying up "cycelement" decisions
RupertGladstone Jan 31, 2024
53ba4c7
Adding new switches (not active yet)...
RupertGladstone Jan 31, 2024
c9f2a19
New switches implemented for "calving", and masking code moved to fun…
RupertGladstone Feb 5, 2024
9b4e66b
Fixed null pointer to solverparams
RupertGladstone Feb 5, 2024
22e8c7e
Minor bug fixes re indexing
RupertGladstone Feb 19, 2024
a7a789c
Merge branch 'elmerice' into glads_gl
RupertGladstone Mar 26, 2024
db92053
updating grounded melt solver for GlaDS
RupertGladstone Apr 24, 2024
34ebbca
Adding option to not scale As according to effective pressure when co…
RupertGladstone Apr 24, 2024
9815eab
Merge branch 'elmerice' into glads_gl
RupertGladstone Apr 24, 2024
c5aee30
reduce output print in GroundedSolver
chekki2mo May 2, 2024
7119b72
bug fix for nonlinear Budd sliding in SSA
RupertGladstone May 4, 2024
c9d7f45
Add hybrid (between Schoof/Gag and Joughin versions) regularised coul…
RupertGladstone May 8, 2024
f66e2af
Integrated GMvalid with GroundedSolver.
RupertGladstone Jun 5, 2024
186f498
Bug fix 'SSA Friction need N' info statement
RupertGladstone Jun 16, 2024
9289819
updated info message from GroundedSolver
RupertGladstone Jun 17, 2024
ee11e86
Merge branch 'elmerice' into glads_gl
RupertGladstone Jun 17, 2024
0839761
Modifying GlaDS to use specified mask instead of compbined hard coded
RupertGladstone Jun 18, 2024
c3e49a6
Documentation Covariance Utils
fgillet Jun 20, 2024
957e54c
documentation
fgillet Jun 24, 2024
5673efa
add header to solver files
fgillet Jun 24, 2024
677c476
Add test cases for CovarianceVectorMutliply
fgillet Jun 24, 2024
d4e5860
add test BackgroundErrorCostSolver
fgillet Jun 24, 2024
c0c4b80
improve documentation
fgillet Jul 3, 2024
bd1dc91
updating GlaDS masking to optionally use the connectivity mask or gro…
RupertGladstone Jul 3, 2024
c1714a7
A selection of updates to get the calving-hydrology coupled model up-…
Morlocke Jul 3, 2024
9bd1878
Resolve merge conflict - we already get SolverParams before the First…
Morlocke Jul 3, 2024
9a39e40
Update Documentation
fgillet Jul 3, 2024
e5d05db
Update documentation
fgillet Jul 4, 2024
600e768
Further changes to make the calving-hydrology coupling work again - m…
Morlocke Jul 5, 2024
3a7e65e
Add max N to SSA sliding laws
RupertGladstone Jul 5, 2024
6b3d11d
Merge branch 'elmerice' into glads_gl
RupertGladstone Jul 5, 2024
f1bfbe1
tidying glads GL flux calcs
RupertGladstone Jul 15, 2024
77bbe42
Merge branch 'devel' into elmerice
tzwinger Jul 15, 2024
b77bd36
fix a bug in my earlier modifications based on Samuel's "calving" option
RupertGladstone Jul 17, 2024
b101091
GlaDSCoupledSolver: Bug fix to the looping for averaging the contribu…
RupertGladstone Jul 18, 2024
3bfb36c
Merge branch 'elmerice' into glads_gl
RupertGladstone Jul 18, 2024
e6a3590
(attempted to) fix calculation of GlaDS sheet contribution to flow ac…
RupertGladstone Jul 19, 2024
ad89e80
Allow both min and max coupled iterations to be specified for GlaDSCo…
RupertGladstone Jul 26, 2024
ab286f7
Adding connectivity option for grounded mask to remove isolated groun…
RupertGladstone Aug 8, 2024
0516cc9
updating connectivity mask options to allow for removal of isolated
RupertGladstone Aug 9, 2024
203f4e3
Updates to PlumeSolver to fix a case where a plume actually has a co-…
Morlocke Aug 14, 2024
66182aa
Now with all that old code taken out!
Morlocke Aug 14, 2024
c91ae73
Minor tweak to GlaDS and PlumeSolver to allow the plumes to use the n…
Morlocke Aug 16, 2024
e0e220d
Added user option to define mask name for SSA sliding (default still …
RupertGladstone Sep 25, 2024
9a05add
Additional hybrid RC sliding parameterisation for SSA
RupertGladstone Sep 25, 2024
6aa7bc7
Merge branch 'devel' into elmerice
tzwinger Sep 25, 2024
8938d56
Report SSA friction mask name at info level 5
RupertGladstone Sep 26, 2024
613c35d
Merge branch 'elmerice' into glads_gl
RupertGladstone Sep 26, 2024
ee057a9
Allow SSA code to use a different grounded mask by setting
RupertGladstone Oct 4, 2024
b1e79a0
Merge branch 'devel' into elmerice
RupertGladstone Oct 16, 2024
85ff151
Max sheet thickness for GlaDS applied after sheet thickness update.
RupertGladstone Oct 16, 2024
1bd4a7b
Merge branch 'elmerice' into glads_gl
RupertGladstone Oct 16, 2024
d0891c6
Allow 3D velocity for calculting sliding speed in grounded melt solver
RupertGladstone Oct 30, 2024
03c0035
tweaking adaptive timestepping info statements
RupertGladstone Oct 30, 2024
797cae6
reduced info level of adaptivity info from 12 to 7
RupertGladstone Nov 13, 2024
97773a1
Merge branch 'devel' into elmerice
RupertGladstone Nov 13, 2024
d5e3329
Merge branch 'elmerice' into glads_gl
RupertGladstone Nov 13, 2024
1ef1cce
Allow 4D flow solution to be passed to grounded melt solver (ignores …
RupertGladstone Nov 13, 2024
7cd61d8
Committing Yu Wang's option to use regularised Coulomb sliding in SSA…
RupertGladstone Nov 13, 2024
5c94823
Merge branch 'devel' into elmerice
RupertGladstone Dec 23, 2024
522baf2
Merge branch 'elmerice' into glads_gl
RupertGladstone Dec 23, 2024
d5f1b20
resolve minor merge error in GroundedSolver.F90
RupertGladstone Dec 23, 2024
2141fad
Merge branch 'devel' into glads_gl
RupertGladstone Feb 5, 2025
25fff6c
Debug MeshUtils change re InDofs.
RupertGladstone Feb 6, 2025
4190773
Additional optional hydrology-based checks for calculating grounded melt
RupertGladstone Feb 12, 2025
67ce4d8
Merge branch 'devel' into glads_gl
RupertGladstone Feb 18, 2025
5fac6cd
Merge branch 'devel' into glads_gl
RupertGladstone Feb 26, 2025
20a8fc1
Update MeshUtils.F90
Morlocke Mar 4, 2025
250a319
Update SolverUtils.F90
Morlocke Mar 4, 2025
27279f0
Update SolverUtils.F90
Morlocke Mar 5, 2025
f6de99b
Update SolverUtils.F90
Morlocke Mar 5, 2025
7964163
Update SolverUtils.F90
Morlocke Mar 5, 2025
d0c7a38
channels hack for the case of a retreating grounding line
RupertGladstone Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resolve minor merge error in GroundedSolver.F90
  • Loading branch information
@RupertGladstone
RupertGladstone committed Dec 23, 2024
commit d5f1b2072ef40e94202b6b61c6518a6d770f36c8
4 changes: 2 additions & 2 deletions elmerice/Solvers/GroundedSolver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ SUBROUTINE GroundedSolver( Model,Solver,dt,TransientSimulation )
TYPE(Variable_t), POINTER :: PointerToVariable, bedrockVar, FrontVar, LSvar, ConnMaskVar
TYPE(Nodes_t), SAVE :: Nodes

LOGICAL :: AllocationsDone = .FALSE., GotIt, stat,UnFoundFatal=.TRUE.,&
AllGrounded = .FALSE., useLSvar = .FALSE., Active &
LOGICAL :: AllocationsDone = .FALSE., GotIt, stat, UnFoundFatal=.TRUE.,&
AllGrounded = .FALSE., useLSvar = .FALSE., Active, &
CheckConn ! check ocean connectivity (creates separate mask without isolated ungrounded regions)

INTEGER :: ii, mn, en, t, Nn, istat, DIM, MSum, ZSum, bedrockSource, ConnectivityMode
Expand Down
Loading