Context Navigation

← Previous Change
Next Change →

Changeset 22758 for issm/trunk/test/NightlyRun/test2002.m

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

Files:

: 4 edited

. (modified) (1 prop)
test (modified) (1 prop)
test/NightlyRun (modified) (1 prop)
test/NightlyRun/test2002.m (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:mergeinfo changed

/issm/trunk-jpl

merged: 21730-21731,21736-21753,21755,21760,21762-21960,21962-21970,21974-22017,22019,22021-22022,22024-22028,22031,22033,22035-22037,22039-22081,22096-22105,22107,22109-22110,22116-22117,22122-22138,22141-22142,22145-22154,22158,22173-22178,22181,22183-22204,22207,22210-22216,22236-22243,22249-22480,22482-22493,22495-22621,22623-22649,22652-22754

issm/trunk/test

Property svn:mergeinfo changed

/issm/trunk-jpl/test

merged: 21730,21753,21785-21787,21790,21795-21796,21800-21801,21807,21817,21820,21823,21825,21827,21833-21836,21839,21841,21843,21868,21870,21877,21879-21880,21885,21887-21888,21893,21896,21901-21904,21909,21918,21921,21923-21925,21927,21937-21938,21943,21947-21948,21950-21952,21955-21957,21959,21965,21968-21970,21981,21985,21997-21999,22041-22042,22046,22060-22063,22068,22070-22071,22079,22081,22096,22100-22101,22104,22109-22110,22126,22132,22134,22142,22145,22148-22150,22158,22184,22187-22188,22191-22192,22198,22215-22216,22249-22250,22254-22258,22263,22267-22268,22271-22272,22274,22287-22289,22309,22311-22313,22315-22319,22321-22322,22331-22335,22337-22338,22341-22344,22346-22348,22350-22351,22355,22358,22373-22374,22377-22378,22381,22384,22390,22392-22393,22395-22398,22400-22401,22411-22412,22429-22432,22436,22440,22442,22444,22449,22451,22453-22455,22457,22462,22464,22479,22482,22500-22501,22504,22512,22514,22520,22525,22532,22539-22540,22545-22546,22563-22570,22572,22574-22575,22577-22579,22592,22615,22623,22625-22627,22629,22632,22635-22636,22640,22644,22648,22652-22653,22655,22657-22658,22669-22670,22672,22681-22684,22687,22693,22695,22705-22708,22712-22714,22720-22723,22726,22732-22735,22743,22745-22746,22748-22749,22752

issm/trunk/test/NightlyRun

Property svn:ignore

old	new
14	14	qmu*
15	15	*.bin
	16	Models
	17	run
	18	run.old
	19	run_matlab

issm/trunk/test/NightlyRun/test2002.m

-              r21729
+              r22758
 md.slr.deltathickness=zeros(md.mesh.numberofelements,1);
 md.slr.sealevel=zeros(md.mesh.numberofvertices,1);
+md.slr.steric_rate=zeros(md.mesh.numberofvertices,1);
 %antarctica
 late=sum(md.mesh.lat(md.mesh.elements),2)/3;
 …
 md.slr.abstol=1e-3;
+% max number of iteration reverted back to 10 (i.e., the original default value)
+md.slr.maxiter=10;
 %eustatic run:
 md.slr.rigid=0; md.slr.elastic=0;

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

Download in other formats: