Context Navigation

← Previous Change
Next Change →

Changeset 20500 for issm/trunk/test/Par/SquareShelfConstrained.py

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

Files:

: 3 edited

. (modified) (2 props)
test (modified) (1 prop)
test/Par/SquareShelfConstrained.py (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:ignore

old	new
	1	build-js
	2	build-esmf
	3	build-gcm
1	4	build-fw
2	5	build-ad

Property svn:mergeinfo changed
/issm/trunk-jpl merged: 19104,19106-19126,19128-19134,19136-19170,19172-19299,19302,19306-19405,19407-19604,19606-19668,19670-20496

issm/trunk/test

Property svn:mergeinfo changed

/issm/trunk-jpl/test

merged: 19106,19119,19144,19147,19158,19167,19173-19175,19184,19186-19187,19200,19206,19226,19229,19243,19246-19247,19249-19250,19253,19263,19265-19266,19269-19273,19277-19278,19280,19308,19315,19320,19329,19337-19338,19364,19370,19372-19374,19382-19383,19393,19475,19481,19483-19484,19487,19498,19517-19519,19521-19523,19525-19529,19537,19554,19577,19589,19595,19614,19641,19646,19648,19658,19663,19680,19702,19711,19718,19722-19723,19726,19728,19743,19750-19751,19753,19756,19764-19765,19768-19769,19774,19776-19777,19781-19782,19785-19789,19791,19793,19796-19797,19816,19824,19833,19835,19842,19868,19928,19930,19932-19933,19942,19966,19994,19999,20001-20002,20019-20020,20049,20068,20072,20079,20082,20092-20094,20096,20099,20107,20117-20119,20140-20141,20155,20157-20158,20161-20164,20170-20171,20182-20183,20185,20188,20190,20202,20209,20212,20215-20216,20218,20220-20221,20224,20226,20243-20245,20247,20273,20286,20308,20310-20311,20313,20326-20327,20334-20335,20350-20351,20366,20368,20408,20411,20416-20417,20421-20422,20452,20459,20468,20475,20477,20483-20484,20488

issm/trunk/test/Par/SquareShelfConstrained.py

r18301	r20500
41	41
42	42	#Surface mass balance and basal melting
43		md.s~~urfaceforcings~~.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1))
	43	md.smb.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1))
44	44	md.basalforcings.groundedice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
45	45	md.basalforcings.floatingice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: