Skip to content
This repository was archived by the owner on Oct 23, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
436 commits
Select commit Hold shift + click to select a range
28a6e75
Add gravity to velocity_solver_set_parameters F/C interface
matthewhoffman Nov 4, 2015
a6b0589
Merge branch 'landice/fem_nunatak_temperature_fix' into landice/develop
matthewhoffman Nov 9, 2015
8e79009
Fix bedtopo field in Interface to actually be bed topo
mperego Nov 11, 2015
25dddc6
Debugged and cleaned up the temperature/enthalpy solver
whlipscomb Nov 17, 2015
eaf9eb9
Moved the heat_dissipation_sia and basal_friction_sia calls
whlipscomb Nov 17, 2015
261db7c
Clean up some XML syntax errors
douglasjacobsen Nov 18, 2015
0050a0d
Merge branch 'landice/xml_cleanup' into landice/develop
matthewhoffman Nov 25, 2015
975639c
More work on basal melting for floating ice
whlipscomb Nov 25, 2015
c38a09c
Merge branch 'landice/fix_bedtopo_in_interface' into landice/develop
matthewhoffman Nov 30, 2015
f097a59
Added an option to advect tracers along with thickness
whlipscomb Dec 1, 2015
ffa9d7f
Merge branch 'landice/temperature3' into landice/develop
matthewhoffman Dec 2, 2015
ca00d10
Merge branch 'develop' into landice/develop
matthewhoffman Dec 3, 2015
ab7316e
Add a definition of rho_water when built in coupled mode
douglasjacobsen Dec 3, 2015
4ebbb3c
Merge branch 'landice/fix_rho_water_definition' into landice/develop
douglasjacobsen Dec 3, 2015
ecbb585
Do not adjust vertical levels on a restart
matthewhoffman Dec 7, 2015
216448c
Merge branch 'landice/vertical_level_restart_bug' into landice/develop
matthewhoffman Dec 7, 2015
fad8dde
Modified new thickness advection code to be BFB relative to older code
whlipscomb Dec 16, 2015
126e7be
Removed some deprecated subroutines in modules li_tendency and li_dia…
whlipscomb Dec 16, 2015
5ee8a4f
Separated the advection code into different modules for old and new code
whlipscomb Dec 16, 2015
8623717
Moved the vertical_remap call for the new advection scheme
whlipscomb Dec 22, 2015
80ae8e4
Combined calculate_tendencies and update_prognostics for new advectio…
whlipscomb Dec 22, 2015
0daf1fd
Added some halo updates required for the new advection scheme
whlipscomb Dec 23, 2015
4ae835c
Added indexToCellID as needed for robust global diagnostics
whlipscomb Dec 23, 2015
536d4a2
Removed tracers var_array structure from thermal pool
whlipscomb Dec 24, 2015
8e09e74
Removed the old thickness advection scheme
whlipscomb Jan 13, 2016
0a3c9d5
Answer-changing cleanup of the thickness-tracer advection scheme
whlipscomb Jan 14, 2016
6116c32
Modified the new advection scheme to support adaptive time steps
whlipscomb Jan 22, 2016
4a10f5a
Changed some diagnostic output from stderrUnit to stdoutUnit
whlipscomb Jan 22, 2016
7139b7f
Add missing pool calls causing segfault for DCFL calculation
matthewhoffman Jan 25, 2016
02c43de
Add calcDiffusivity package to apparentDiffusivity
matthewhoffman Jan 25, 2016
7cb238c
Merge branch 'landice/advection_cleanup' into landice/develop
matthewhoffman Jan 26, 2016
2e20542
update land ice registry to allow for 'data' calving option; update c…
stephenprice Jan 27, 2016
234711d
change syntax in registry and calving code to allow for calving to oc…
stephenprice Jan 27, 2016
4f8346a
Fix units of total calving flux in analysis member (divide by scyr ra…
stephenprice Jan 28, 2016
fdadbbe
Merge branch 'develop' into landice/develop
matthewhoffman Jan 28, 2016
fffa132
minor clean up to some comments
stephenprice Jan 28, 2016
cc3aae1
change type of data calving option to logical; fix where construct fo…
stephenprice Jan 30, 2016
266b2f4
Simplify how calvingThickness updates thickness
matthewhoffman Feb 1, 2016
41a52a6
Fix uninitialized variable error
agsalin Feb 1, 2016
e56452d
Merge branch 'agsalin-patch-1' into landice/develop
matthewhoffman Feb 2, 2016
cd1e17d
Merge branch 'landice_add_data_mode' into landice/develop
matthewhoffman Feb 2, 2016
9ba65a9
Print a summary of config settings to err file
matthewhoffman Jan 20, 2016
7ece42b
Change default config_dynamic_thickness from 100 to 10 m
matthewhoffman Feb 3, 2016
f8e79ec
Change default temperature init to 'file'
matthewhoffman Feb 3, 2016
3cd0c26
Set default number of halos from 3 to 2
matthewhoffman Feb 3, 2016
6e80158
Remove layerThicknessFractions from all streams - already in basicmesh
matthewhoffman Feb 3, 2016
e1c3cc9
Create variable daysSinceStart to complement xtime
matthewhoffman Feb 3, 2016
4142935
Default thermal b.c. fields to come from file
matthewhoffman Feb 3, 2016
1781cb0
Make 'data' config_basal_mass_bal_float option
matthewhoffman Feb 3, 2016
5700477
Change 'data' config_basal_mass_bal_float to 'file', update descriptions
matthewhoffman Feb 4, 2016
808b27a
Merge branch 'landice/print_config_values' into landice/develop
stephenprice Feb 4, 2016
95131ea
Always calculate global ACFL and DCFL time steps
matthewhoffman Feb 4, 2016
dbf0727
Fix clobber of error code preventing model from aborting
matthewhoffman Feb 5, 2016
36d2efb
Only print flat slope diffusivity notice in verbose config
matthewhoffman Feb 5, 2016
6216d2d
Merge branch 'landice/always_calculate_CFL' into landice/develop
whlipscomb Feb 5, 2016
876bd62
Modified thickness and layerThickness calculations for exact restart
whlipscomb Feb 18, 2016
d8c6fbc
Made a separate subroutine for computing a linear temperature profile
whlipscomb Feb 18, 2016
89679c0
Fixed an erroneous error for the case of no advection
whlipscomb Feb 18, 2016
1ae5114
Removed unneeded time levels in thickness and layerThickness fields
whlipscomb Feb 19, 2016
c701286
Always calculate derived velocity variables
matthewhoffman Feb 19, 2016
7c0fe78
Remove unused workTracerLevelCell2 field
matthewhoffman Feb 19, 2016
8eeb4fa
Merge branch 'landice/exact_restart' into landice/develop
matthewhoffman Feb 19, 2016
83e5661
Merge branch 'develop' into landice/develop
matthewhoffman Feb 19, 2016
dbd93b5
Set up LI dome test case
matthewhoffman Jan 21, 2016
ddaad56
Complete dome test
matthewhoffman Feb 2, 2016
ce8f655
Generate mesh with periodic_hex rather than downloading it
matthewhoffman Feb 2, 2016
ee6cf38
Reduce restart interval for dome
matthewhoffman Feb 2, 2016
474b72f
Add circular-shelf LI test case
matthewhoffman Feb 2, 2016
f9f1718
Minor cleanup to visualize_circular_shelf.py
matthewhoffman Feb 2, 2016
d56e72a
Add confined shelf test case
matthewhoffman Feb 2, 2016
0c4c986
Update info needed by general.config.landice
matthewhoffman Feb 2, 2016
bb57e9e
Fix up confined shelf test case setup
matthewhoffman Feb 2, 2016
e04e00b
Add EISMINT-1 Moving Margin 1 test case
matthewhoffman Feb 4, 2016
8254608
Initial attempt at EISMINT-2 experiment A
matthewhoffman Feb 5, 2016
face2bd
Update EISMINT2 setup IC script to work for exp A
matthewhoffman Feb 5, 2016
77558d1
Rename EISMINT test cases
matthewhoffman Feb 11, 2016
5fc931a
Add Halfar analytic case to dome
matthewhoffman Feb 11, 2016
12fe272
Add dome 1 vs 4 proc decomp test
matthewhoffman Feb 11, 2016
ced0ef7
Add dome restart test
matthewhoffman Feb 11, 2016
a61bc7d
Create GIS 20km test
matthewhoffman Feb 16, 2016
f4821fd
Add decomp test for GIS20km
matthewhoffman Feb 16, 2016
690ae39
Add GIS20km restart test
matthewhoffman Feb 16, 2016
bc68cf3
Add dome HO vs SIA test
matthewhoffman Feb 16, 2016
e1c1a06
Add dome restart test using FO velo solver
matthewhoffman Feb 16, 2016
5976a4f
Add circular-shelf decomp test
matthewhoffman Feb 16, 2016
38db539
Add confined shelf decomp test
matthewhoffman Feb 16, 2016
ab1e6f1
Add dome var-res smoke test
matthewhoffman Feb 16, 2016
591d119
Add var res dome Halfar test
matthewhoffman Feb 16, 2016
bb2a63f
Add var res dome decomp test
matthewhoffman Feb 16, 2016
ab0ea15
Add var res dome restart test
matthewhoffman Feb 16, 2016
92ea7d1
Add var res dome HO decomp test
matthewhoffman Feb 16, 2016
6aeb52c
Add varres dome HO restart test
matthewhoffman Feb 16, 2016
d954109
Fix capitalization error in setup mesh steps
matthewhoffman Feb 16, 2016
cd17928
Add basic sia integration regression suite
matthewhoffman Feb 17, 2016
3ce53a7
Remove daysSinceStart from comparisons
matthewhoffman Feb 17, 2016
037e40f
Rename sia integration suite
matthewhoffman Feb 17, 2016
9f664e5
Add HO integration test suite
matthewhoffman Feb 17, 2016
fd371ee
Add 2km dome HO decomp test
matthewhoffman Feb 17, 2016
e5ee8bd
Minor fixes to HO dome tests after running them
matthewhoffman Feb 19, 2016
602730e
Adjust L2 norm tolerance for HO vs SIA Halfar test
matthewhoffman Feb 23, 2016
6750611
Fix incorrect timelevels
matthewhoffman Feb 23, 2016
0318a2e
Updates to EISMINT2, test A to get it running
matthewhoffman Feb 24, 2016
177b1c0
Add PMP temperature variables for output
matthewhoffman Feb 24, 2016
cd47213
Merge branch 'landice/remove_incorrect_timelevels' into landice/develop
matthewhoffman Feb 25, 2016
b623b9a
Merge branch 'landice/add_pmp_vars' into landice/develop
matthewhoffman Feb 25, 2016
f4c24a0
Fixes to EISMINT2 postprocess script
matthewhoffman Mar 1, 2016
4e232d7
Reorg EISMINT2 test structure
matthewhoffman Mar 1, 2016
29b95aa
Add EISMINT2 experiment B
matthewhoffman Mar 1, 2016
1bbc0ac
Update dome setup script
matthewhoffman Mar 1, 2016
d2cc02f
Add EISMINT2 tests C-F
matthewhoffman Mar 3, 2016
5113678
Minor changes to EISMINT scripts for new tests
matthewhoffman Mar 3, 2016
498e61e
Many small fixes for circular and confined shelf tests
matthewhoffman Mar 3, 2016
545ba2e
Merge branch 'develop' into landice/develop
douglasjacobsen Mar 3, 2016
fec08cd
Set adaptive dt force interval to huge for EISMINT2
matthewhoffman Mar 3, 2016
9c35c34
Improved terminal error messages
akturner Mar 3, 2016
17ec243
Make all add_executable destinations explicit
matthewhoffman Mar 3, 2016
6e375db
Merge branch 'landice/setup_test_cases' into landice/develop
matthewhoffman Mar 3, 2016
b3c984e
Merge branch 'landice/error_messages' into landice/develop
matthewhoffman Mar 3, 2016
41eb576
Improved the treatment of tracers at the ice surface
whlipscomb Feb 29, 2016
c5ae87c
Add EISMINT2 decomp test
matthewhoffman Mar 3, 2016
e3add82
Fix two log messages
matthewhoffman Mar 3, 2016
d5a220a
Adjust EISMINT2 decomp test
matthewhoffman Mar 4, 2016
d5ce1fa
Initial set up of MISMIP
matthewhoffman Mar 7, 2016
c93c6e3
Rename namelist.input to be resolution-specific
matthewhoffman Mar 7, 2016
568d885
Add 5000m, 2000m, 1000m, 500m, 250m resolutions
matthewhoffman Mar 7, 2016
2450028
Add minimal_width 'resolution', add albany_input.xml
matthewhoffman Mar 7, 2016
8f5142b
Fix MPI comm 'leak' in Interface
matthewhoffman Mar 8, 2016
59c7c14
Adjust restart intervals for minimal_width runs
matthewhoffman Mar 8, 2016
1be68a8
Change implementation to use MPI_COMM_NULL
matthewhoffman Mar 8, 2016
4b16eda
Merge branch 'landice/ext_dycore_mpi_leak' into landice/develop
matthewhoffman Mar 9, 2016
79b494c
Merge branch 'landice/add_mismip_test' into landice/develop
matthewhoffman Mar 9, 2016
96a2583
Fixed a bug in the upwind advection calculation
whlipscomb Mar 9, 2016
f976ff1
EISMINT2 test updates: adjust tstep for C, update plots
matthewhoffman Mar 10, 2016
559fa14
Add cellProcID variable
matthewhoffman Mar 10, 2016
c5ef15e
Merge branch 'landice/surface_tracers' into landice/develop
matthewhoffman Mar 11, 2016
c516542
Merge branch 'develop' into landice/develop
matthewhoffman Mar 18, 2016
b8e53ec
Widen MISMIP domains that were too narrow
matthewhoffman Apr 1, 2016
2e83d69
Adjust stream intervals for 500m, 250m minimal MISMIP setups
matthewhoffman Apr 1, 2016
ce7d3f1
Update Albany settings to use ML/Belos for MISMIP
matthewhoffman Apr 28, 2016
5016ffd
Merge branch 'develop' into landice/develop
matthewhoffman Apr 28, 2016
367147b
Update dependencies in LI Makefiles
matthewhoffman Apr 28, 2016
fc45a95
Add MISMIP script for setting up perturbation experiments
matthewhoffman Apr 29, 2016
13bab64
Add MISMIP P75S/R plotting script
matthewhoffman May 3, 2016
566b4a6
Add uReconstructX to input file for PxxS experiment if field exists
matthewhoffman May 3, 2016
9593b37
Adjust ny for the 1000m full-width domain
matthewhoffman May 3, 2016
940878d
Add GL time-series plot to MISMIP perturb plot script
matthewhoffman May 3, 2016
aae1b42
Add notes on how to set up P75S/R experiments
matthewhoffman May 3, 2016
acaa9c8
Adjust # of cells in 250m full_width domain
matthewhoffman May 4, 2016
dba86c9
Loosen check on resolution in perturb setup script
matthewhoffman May 6, 2016
8c77096
Merge branch 'landice/enlarge_mismip_test_domains' into landice/develop
matthewhoffman May 13, 2016
7bcf806
Merge branch 'landice/fix_build' into landice/develop
matthewhoffman May 13, 2016
bd15082
Merge branch 'develop' into landice/develop
matthewhoffman May 13, 2016
8bb2a96
Created a new MISMIP+ test case
whlipscomb Jun 10, 2016
4dff415
initial work on adding regional anaysis member (largely templated fro…
stephenprice Sep 28, 2015
3079ae8
finish adding placeholder regional stats calcs (waiting on availabili…
stephenprice Sep 29, 2015
678b8f9
Initial changes to landice core registry to allow for use of regions …
stephenprice Apr 26, 2016
4be24d8
more work on regional stats AM using region masks
stephenprice Apr 27, 2016
85e0738
partially working regional stats AM using region masks
stephenprice Apr 29, 2016
838fad2
confirmed region area calcs. look correct; not computing/writing on s…
stephenprice Apr 29, 2016
9f881a0
Minor clean-up; still problem w/ regionCellMasks = 0 on first time step
stephenprice May 6, 2016
061875d
remove some debug; tidy up registry files; add code to fwd model driv…
stephenprice May 9, 2016
0eed24c
added remaining stats calcs so that regional stats AM now does same s…
stephenprice May 9, 2016
fe78880
fix calc. of max and min thickness
stephenprice May 31, 2016
2cc301b
Merge branch 'landice_analysis_add_regional_stats' into landice/develop
matthewhoffman Jun 14, 2016
176724e
Minor update to MISMIP3D test case
matthewhoffman Jun 27, 2016
7d21f79
Activate 1d mask fn for grounded ice
matthewhoffman Jul 5, 2016
2fc6b38
First attempt at subglacial hydro driver
matthewhoffman Jun 28, 2016
b800fa1
Hydro progress - add calculations of flux and divergence
matthewhoffman Jul 5, 2016
9b7ab05
Add pressure and thickness evolution calc
matthewhoffman Jul 6, 2016
7e5bfd2
Changes to get hydro code to run
matthewhoffman Jul 6, 2016
b0adb79
Enable flowParamA calc when SGH is on
matthewhoffman Jul 6, 2016
c168087
Fix value/units of till leakage factor, Cd
matthewhoffman Jul 6, 2016
65ba869
Add checks for waterThickness and waterPressure limits
matthewhoffman Jul 6, 2016
c432fd6
Adjustments to divergence calculation
matthewhoffman Jul 6, 2016
72f0a8d
Add direction to advective flux in divergence calculation
matthewhoffman Jul 7, 2016
556c5dd
Add calc of timestep limits
matthewhoffman Jul 7, 2016
bd6de75
Adjust 'none' velocity solver to be based on uReconstructX/Y
matthewhoffman Jul 7, 2016
e736cd9
Add waterThickness as an input variable
matthewhoffman Jul 7, 2016
249c7a1
Add reconstructed x/y water velocity on cell centers
matthewhoffman Jul 7, 2016
218b66e
Fix(?) signs on advective and diffusive terms
matthewhoffman Jul 7, 2016
6125ea6
Fix sign on diffusive contribution to divergence
matthewhoffman Jul 11, 2016
5600a3d
Add adaptive time stepper to subglacial hydro model
matthewhoffman Jul 11, 2016
dbc263a
Add hydro-radial test case
matthewhoffman Jul 11, 2016
c0413eb
Update hydro-radial NL settings
matthewhoffman Jul 11, 2016
6c278f1
Add some alternate formulations, commented out
matthewhoffman Jul 11, 2016
b198c4c
New hydro test case: Ramp
matthewhoffman Jul 11, 2016
cc29cfc
Add Pw=Pice pressure calculation option
matthewhoffman Jul 12, 2016
7fd8b63
Add waterFluxDiffu variable
matthewhoffman Jul 12, 2016
ad55a78
Update hydro-ramp test case - mirror across divide
matthewhoffman Jul 12, 2016
f75606b
More changes to hydro-ramp - results close to desired
matthewhoffman Jul 12, 2016
7fb3b53
hydro-ramp test: make N=0 b.c. at margin
matthewhoffman Jul 12, 2016
edcdabb
Make waterThicknessEdge ignore non-grounded cells
matthewhoffman Jul 12, 2016
01b3c09
Fix incorrect description in Registry
matthewhoffman Jul 12, 2016
239cf04
Zero diffusive flux at margins - may be wrong
matthewhoffman Jul 12, 2016
ecc5b97
hydro-ramp test: improve plot script, including analytic N=f(h) soln
matthewhoffman Jul 13, 2016
66baa50
Add waterThicknessTendency variable
matthewhoffman Jul 13, 2016
e7dedf9
Remove a redundant calculation
matthewhoffman Jul 13, 2016
36ba74f
Break meltInput into basalMeltInput and externalWaterInput
matthewhoffman Jul 13, 2016
c0de4bd
Add diagnostic water pressure tendency variable
matthewhoffman Jul 13, 2016
824cf04
Updates to hydro-radial test case
matthewhoffman Jul 18, 2016
b41aa20
Trying to fix SGH adaptive time stepped - hijack master dt
matthewhoffman Jul 18, 2016
7a9392b
Minor updates to hydro-radial test case
matthewhoffman Jul 18, 2016
9cea0f5
Change usage of deltat throughout model
matthewhoffman Jul 18, 2016
06ba72c
Correct SGH adaptive time stepper to correctly relate to model time
matthewhoffman Jul 18, 2016
4168ba1
Add waterPressure as input variable
matthewhoffman Jul 19, 2016
68d4ba6
Clean up of sign conventions and order of operations
matthewhoffman Jul 19, 2016
7802f95
Create pressure diag variable routine to call from init and timestepping
matthewhoffman Jul 19, 2016
df3b2b3
Update nl settings for hydro-ramp test case
matthewhoffman Jul 19, 2016
8b34215
hydro-radial test case - update values to match Bueler, big change to k!
matthewhoffman Jul 20, 2016
7d3cefb
hydro-radial: add Bueler .m files for analytic solution
matthewhoffman Jul 20, 2016
33ec5c5
hydro-radial: updates to .m files, script to interpolate to MPAS IC
matthewhoffman Jul 20, 2016
839edaa
hydro-radial: fully working
matthewhoffman Jul 20, 2016
32c40ad
hydro-radial test: create steady_state_drift_test and spinup_test
matthewhoffman Jul 20, 2016
bc90b34
Truncate state variables to valid range on init
matthewhoffman Jul 20, 2016
0970d06
hydro-radial: Add decomposition test
matthewhoffman Jul 20, 2016
6caaa7f
Add halo update to divergence - decomp test now passes!
matthewhoffman Jul 20, 2016
2bd9647
Add hydro init timer
matthewhoffman Jul 20, 2016
3a8d360
Make 'none' thermal solver actually do nothing
matthewhoffman Jul 20, 2016
003c590
Improve logic about velocity solver-specific calculations
matthewhoffman Jul 20, 2016
53a748f
Improve mask calculation performance
matthewhoffman Jul 20, 2016
d845295
Exact restarts for hydro model
matthewhoffman Jul 21, 2016
24dd111
Add daysSinceStart to dome restart_test
matthewhoffman Jul 21, 2016
ed50694
Dome restart test - clobber_mode=truncate for cold start
matthewhoffman Jul 21, 2016
aab2ad1
Add hydro-radial restart and decomp tests to integration suite
matthewhoffman Jul 25, 2016
844f261
Merge branch 'develop' into landice/develop
matthewhoffman Aug 22, 2016
32dff10
Merge branch 'develop' into landice/develop
douglasjacobsen Aug 23, 2016
ba3311d
Merge branch 'develop' into landice/develop
douglasjacobsen Sep 8, 2016
24ed96b
Source code changes for MISMIP+ experiments
whlipscomb Sep 10, 2016
2fcfc5f
New infrastructure for the MISMIP+ experiments
whlipscomb Sep 10, 2016
ddd16e2
Reorganization and cleanup for MISMIP+ tests
whlipscomb Sep 22, 2016
690449d
More cleanup for MISMIP+
whlipscomb Sep 22, 2016
2e258ed
Changed an instruction in README.mismip+
whlipscomb Sep 22, 2016
8f1a02d
Merge branch 'develop' into landice/develop
matthewhoffman Sep 22, 2016
5fafa6b
Merge branch 'develop' into landice/develop
douglasjacobsen Oct 4, 2016
794a8ca
Minor cleanup based on PR review
matthewhoffman Oct 19, 2016
64f727c
Merge branch 'landice/mismip_plus' into landice/develop
matthewhoffman Oct 20, 2016
9b80c20
Merge 'landice/hydro' into landice/develop
stephenprice Oct 31, 2016
02497be
Add dissipation terms to cpp interface, not yet passed
matthewhoffman Aug 25, 2016
f13221a
Pass Albany dissipationHeat through interface
matthewhoffman Aug 26, 2016
b8dcd0e
Set default value of beta to 1e8
matthewhoffman Aug 27, 2016
1b76d2c
Update HO test cases to include beta in input field
matthewhoffman Aug 27, 2016
b88b109
Create vertex-to-cell interp routine, interp. dissipation
matthewhoffman Aug 29, 2016
be32941
Add basalFrictionFlux calculation for HO velocity
matthewhoffman Aug 29, 2016
b213895
Fix units on beta, calculation of basalFrictionFlux
matthewhoffman Aug 29, 2016
f19f533
Set temperature field default value to 273.15
matthewhoffman Sep 15, 2016
c7a23e7
Set default_value for various thermal fields
matthewhoffman Sep 15, 2016
88c9bea
Added Experiment G in the EISMINT2 test infrastructure
whlipscomb Sep 26, 2016
41499ce
Added config.xml file for Experiment G
whlipscomb Sep 26, 2016
05d1e65
Fix bug in Albany interface - clear triangleToVertex before reserving
matthewhoffman Nov 2, 2016
e49099b
Changes to support MISMIP+ experiments with a GLP
whlipscomb Feb 2, 2017
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
More changes to hydro-ramp - results close to desired
Adjusted the time step, run duration.  Note that using longer time steps
(which are allowed by the CFLs) leads to strange (though not necessarily
wrong?) behavior, so I've capped the adaptive dt at 1 month.

I've also noticed that the porosity value strongly influences the final
pressure field.  It's not clear to me yet if this is a bug or if the
pressure field takes longer to reach SS when porosity is large.  (It
does not appear to be changing much...)  For now, I've found that using
0.001 leads to close to deisred profiles, but further investigation is
warranted.
  • Loading branch information
matthewhoffman committed Jul 12, 2016
commit f75606beb80fb94cd244476376bf64cbd0626802
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<namelist>
<option name="config_dt">'0000-00-10_00:00:00'</option>
<option name="config_stop_time">'0200-01-01_00:00:00'</option>
<option name="config_dt">'0000-01-0_00:00:00'</option>
<option name="config_stop_time">'0500-01-01_00:00:00'</option>
<option name="config_block_decomp_file_prefix">'graph.info.part.'</option>
<option name="config_velocity_solver">'none'</option>
<option name="config_thickness_advection">'none'</option>
Expand All @@ -17,7 +17,7 @@
<option name="config_SGH_till_max">0.0</option>
<option name="config_SGH_bed_roughness_max">10.0</option>
<option name="config_SGH_bed_roughness">0.0000</option>
<option name="config_SGH_englacial_porosity">0.1</option>
<option name="config_SGH_englacial_porosity">0.001</option>
<option name="config_SGH_creep_coefficient">0.04</option>
</namelist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,19 @@

# plot how close to SS we are
fig = plt.figure(2, facecolor='w')
ax1 = fig.add_subplot(211)
for i in ind:
plt.plot(days/365.0, f.variables['waterThickness'][:,i])
plt.xlabel('Years since start')
plt.ylabel('water thickness (m)')

ax = fig.add_subplot(212, sharex=ax1)
for i in ind:
plt.plot(days/365.0, f.variables['effectivePressure'][:,i]/1.0e6)
plt.xlabel('Years since start')
plt.ylabel('effective pressure (MPa)')



print "plotting complete"

Expand Down