Context Navigation

← Previous Change
Next Change →

Changeset 16137 for issm/trunk/test/NightlyRun/test601.m

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

Files:

: 3 edited

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

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:ignore

old	new
	1	nightlylog
	2	configure.sh
1	3	par
2	4	ad

Property svn:mergeinfo changed
/issm/trunk-jpl merged: 15397-15401,15403-15487,15489-15701,15704-15735,15737-16076,16082-16133

issm/trunk/test

Property svn:mergeinfo changed

/issm/trunk-jpl/test

merged: 15397,15460,15469,15498-15500,15524,15526,15532,15534,15536,15547-15548,15550-15552,15554-15555,15558,15560-15563,15565-15566,15569,15577-15582,15585-15593,15597-15599,15605-15610,15614,15620,15646-15648,15668-15669,15671,15675,15686-15687,15691,15693,15708-15709,15719,15725,15729,15733,15735,15766-15767,15771,15791,15800,15803-15804,15811,15818-15820,15833,15854,15871,15874-15875,15901-15902,15910,15920,15922,15926-15928,15948-15950,15953,15975,15977,15981,15984-15985,15988,15994,15996-15997,16000-16001,16004-16006,16039,16041,16044,16054,16061,16063-16064,16072-16073,16075,16089,16092-16093

issm/trunk/test/NightlyRun/test601.m

-              r13975
+              r16137
 md=setmask(md,'../Exp/79NorthShelf.exp','');
 md=parameterize(md,'../Par/79North.par');
 md=setflowequation(md,'macayeal','all');
+md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
 md=solve(md,PrognosticSolutionEnum());
+md=solve(md,MasstransportSolutionEnum());
 %Fields and tolerances to track changes
 …
 field_tolerances={1e-13};
 field_values={...
         (md.results.PrognosticSolution.Thickness),...
+        (md.results.MasstransportSolution.Thickness),...
         };

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

Download in other formats: