Context Navigation

← Previous Change
Next Change →

Changeset 19105 for issm/trunk/test/Par/SquareThermal.par

Timestamp:

02/12/15 16:48:40 (10 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 19103

Location:

Files:

: 3 edited

. (modified) (2 props)
test (modified) (1 prop)
test/Par/SquareThermal.par (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:ignore

old	new
	1	build-fw
	2	build-ad
1	3	nightlylog
2	4	configure.sh

Property svn:mergeinfo changed
/issm/trunk-jpl merged: 18302-18306,18308-18311,18313-18322,18326-18337,18339-18351,18353-18355,18357-18513,18515-19101

issm/trunk/test

Property svn:mergeinfo changed

/issm/trunk-jpl/test

merged: 18302,18317,18364,18397,18459,18475,18484,18489,18499,18517,18533,18535-18536,18539,18543-18544,18546-18549,18552,18562,18572,18575,18582-18583,18593,18598,18612,18620,18622,18646,18655,18661,18666,18677,18682,18684,18687,18700-18701,18704,18708,18724,18734,18760-18762,18765,18767-18768,18772,18782-18783,18789,18791-18793,18805,18814,18816-18817,18823,18844,18858-18859,18863,18895,18897,18944,18954,18962,18964,18968,18971-18974,18983-18984,18987,18989,18995,19031,19049,19051-19053,19088-19089,19093

issm/trunk/test/Par/SquareThermal.par

-              r18301
+              r19105
 disp('      creating temperatures');
 md.initialization.temperature=(273.-20.)*ones(md.mesh.numberofvertices,1);
+md.initialization.pressure=zeros(md.mesh.numberofvertices,1);
+md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1);
+md.initialization.watercolumn=zeros(md.mesh.numberofvertices,1);
 disp('      creating flow law parameter');

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

Download in other formats: