Skip to content

Xice mpi flake #4

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
permarisk wants to merge 49 commits into
base: development
Choose a base branch
from
Open

Xice mpi flake #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
7f09a07
Added the single-column xice modifications to the github version on b…
jannitzbon Jan 16, 2018
e32e990
removed unnecessary functions from git repo
jannitzbon Jan 16, 2018
45546fb
bugfix in update_SNOW: only air domain adjusted when K-grid has error…
jannitzbon Jan 17, 2018
1bb3b0d
further modifications in updateGRID_snow, now the K grid of snow and …
jannitzbon Jan 23, 2018
da7c8c4
bugfix in all main scripts: snow domain is again considered when dete…
jannitzbon Jan 25, 2018
3ef227c
added analysis script. setup new spinup runs wiht excess ice
jannitzbon Jan 25, 2018
8e91d48
bugfix, such that yearly output is possible.
jannitzbon Jan 26, 2018
ae7f714
modified run_batch for testing
jannitzbon Jan 26, 2018
93d26ad
Merge branch 'xice' of https://github.com/CryoGrid/CryoGrid3 into xice
jannitzbon Jan 26, 2018
72ecf1e
added functionality that the model state is saved together with the o…
jannitzbon Jan 26, 2018
2e48b99
major bugfix. now water contents below residualWC are prohibited. how…
jannitzbon Jan 29, 2018
3a0a9d6
NOT TESTED! included lateral exchange module to xice branch version. …
jannitzbon Jan 30, 2018
c0a9be5
bugfixing last commit such that model is running stable.
jannitzbon Feb 5, 2018
3746bdb
preparing integration of features from branch xice
jannitzbon Feb 6, 2018
1deae9e
integrated bugfixes from branch xice such that the thermal properties…
jannitzbon Feb 6, 2018
cefc3e2
restored previous modifications to initializeSoilThermalProperties.m
jannitzbon Feb 6, 2018
939fe21
fixed problem with previous merge.
jannitzbon Feb 7, 2018
80c5a2a
main.m replaced by my version (including lake)
tomfreeze Feb 12, 2018
e101cff
changes to treating lacking water in bucket scheme.
jannitzbon Feb 12, 2018
fa01702
minor bugfix in bucketScheme.m
jannitzbon Feb 12, 2018
1402107
merge of Flake version with Jan's version for main.m and add_modules.m
tomfreeze Feb 12, 2018
fe3a562
cryoGridLake folder added
tomfreeze Feb 12, 2018
127f192
main updated, makeGrids modified to include Flake
tomfreeze Feb 12, 2018
c5d854c
included updates from single-column version. soil altitude as referen…
jannitzbon Feb 12, 2018
0db0e19
Merge branch 'xice_mpi' of https://github.com/CryoGrid/CryoGrid3 into…
tomfreeze Feb 13, 2018
7a9a00c
source Jan combined with FLAKE settings
tomfreeze Feb 14, 2018
97e6bbe
adjusted get_parallel_variables for hexagonal geometry.
jannitzbon Mar 5, 2018
e2984b9
added plotting during simulation
jannitzbon Mar 5, 2018
eb923d7
bugfix for upper water cells also included on branch xice_mpi.
jannitzbon Mar 6, 2018
0fbfbca
bugfix continued.
jannitzbon Mar 6, 2018
f96b87b
bugfix: vectors with lateral water fluxes are always reinitialized to…
jannitzbon Mar 8, 2018
7bdab5e
Merge branch 'xice_mpi' of https://github.com/CryoGrid/CryoGrid3 into…
jannitzbon Mar 8, 2018
04be7d6
extended for setting lake - nonlake, and several further fixes to get…
tomfreeze Mar 20, 2018
4815383
occurences of GRID.water. replaced by GRID.water.lake.
tomfreeze Mar 20, 2018
32f1029
makeGrids modfied
tomfreeze Mar 20, 2018
80d137d
pull of latest changes from Jan - and solving of merge conflicts
tomfreeze Mar 21, 2018
3f61bcd
checkout of pervious version of get_parallel_variables
tomfreeze Mar 22, 2018
075354e
various fixes applied to prevent problems with updateGRID_snow.m if l…
tomfreeze Apr 4, 2018
795b44d
new branch xice_mpi with FLAKE included (not fully operational so far)
tomfreeze Apr 4, 2018
b69ce21
bug fix u_star, and implementation of c_temp k_temp lwc_temp in initi…
tomfreeze Apr 9, 2018
8b41d51
fixes for lateral heat exchange and some more issues solved
tomfreeze Apr 13, 2018
e91820b
Lstar limited to [-1e-4 1e4], further NAN checks included and some la…
tomfreeze Apr 23, 2018
ecf7f87
running version infiltration on, xice off, lateral heat exchange on (…
tomfreeze May 9, 2018
c743bcf
fix for SEB to account for lateral heat exchange
tomfreeze Jun 13, 2018
dac5764
update of area calculation, ....
tomfreeze Jun 17, 2018
77ed766
new files for batch handling
tomfreeze Jun 25, 2018
7dfebc8
lateral heat exchange scaled to mean value (already in prev commit)
tomfreeze Jun 25, 2018
e61dc89
EUCOP version
tomfreeze Jul 18, 2018
7cee82e
latest EUCÓP version
tomfreeze Jul 18, 2018
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
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
forcing
runs
*.asv
*.docx
*.mat

251 changes: 0 additions & 251 deletions CryoGrid3.m
View file
Open in desktop

This file was deleted.

Loading