Context Navigation

← Previous Change
Next Change →

Changeset 21729 for issm/trunk/src/m/consistency/ismodelselfconsistent.py

Timestamp:

05/19/17 14:48:02 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21727

Location:

Files:

: 3 edited

. (modified) (1 prop)
src (modified) (1 prop)
src/m/consistency/ismodelselfconsistent.py (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:mergeinfo changed

/issm/trunk-jpl

merged: 21342-21360,21377-21391,21393-21394,21398-21420,21423-21497,21499-21566,21568-21592,21594-21598,21600,21603-21604,21607,21609-21617,21619-21662,21664-21725

issm/trunk/src

Property svn:mergeinfo changed

/issm/trunk-jpl/src

merged: 21342-21345,21347,21349-21350,21353-21358,21377-21382,21385,21388-21391,21393,21398,21401-21403,21405-21407,21410,21415-21420,21425-21464,21467-21476,21478-21479,21481-21482,21484,21487-21491,21493-21497,21499-21504,21506,21508-21532,21535,21540-21565,21568-21570,21572-21579,21582-21584,21586-21588,21591,21594,21597-21598,21600,21603,21609,21611,21615,21619-21620,21623-21626,21628-21629,21631,21641-21657,21659,21661-21662,21664,21667-21670,21672,21674-21683,21690,21696-21715,21717-21722,21724-21725

issm/trunk/src/m/consistency/ismodelselfconsistent.py

r21341	r21729
32	32
33	33	elif solutiontype == 'GiaSolution':
34		analyses=['GiaAnalysis']
	34	analyses=['GiaIvinsAnalysis']
35	35
36	36	elif solutiontype == 'TransientSolution':

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

Download in other formats: