Context Navigation

← Previous Change
Next Change →

Changeset 17806 for issm/trunk/src/c/solutionsequences/solutionsequence_linear.cpp

Timestamp:

04/22/14 10:39:19 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 17804

Location:

Files:

: 4 edited

. (modified) (1 prop)
src (modified) (1 prop)
src/c (modified) (1 prop)
src/c/solutionsequences/solutionsequence_linear.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk
- Property svn:mergeinfo changed
  /issm/trunk-jpl merged: 16565-17015,17017-17381,17383-17422,17424-17619,17621-17657,17659-17672,17674-17801,17804

issm/trunk/src

Property svn:mergeinfo changed

/issm/trunk-jpl/src

merged: 16565,16568-16574,16576-16577,16587-16593,16599-16601,16604-16605,16607,16611-16614,16620-16621,16636-16641,16647-16648,16653,16655-16660,16668-16670,16675-16682,16684-16686,16690-16691,16693-16700,16702,16714-16718,16720-16729,16733-16735,16737,16739-16740,16742-16746,16748,16750-16762,16764-16785,16787-16794,16798-16813,16815-16824,16826-16855,16857-16866,16868,16870,16872-16876,16882,16886-16916,16918,16921-16922,16926,16928-16929,16931-16932,16936,16939-16940,16942-16943,16947-16951,16953-16965,16967-16969,16972-16982,16986-16997,16999-17007,17009-17010,17012,17014-17015,17017-17018,17020-17022,17024,17026-17033,17035-17038,17040-17059,17062-17065,17068,17070-17076,17078-17080,17083,17085-17087,17089,17092-17100,17102-17118,17120-17130,17135,17137-17147,17151,17155-17160,17162-17167,17169,17171-17184,17191-17194,17196,17199,17201-17204,17207-17208,17210-17212,17214,17222-17233,17235-17250,17253-17262,17264-17271,17274-17279,17281-17289,17291,17293-17310,17314-17315,17317,17319,17321-17325,17327-17343,17345-17372,17375,17379-17381,17383-17384,17386,17388-17392,17394-17399,17401-17409,17411-17414,17416-17422,17425-17436,17442,17444-17446,17449-17450,17455-17457,17459-17461,17463,17465-17466,17471-17477,17479-17480,17482-17498,17500-17504,17506-17519,17521-17523,17525-17529,17532,17535-17543,17546-17549,17551,17553,17555-17556,17558-17572,17574-17591,17593,17596-17598,17600,17602-17605,17608-17612,17614-17615,17617-17619,17621-17624,17626-17629,17632-17638,17640-17657,17659-17662,17664-17665,17668-17672,17674-17682,17684,17686-17688,17690-17694,17696-17700,17703-17727,17729-17745,17748-17750,17754,17756-17761,17763,17765-17766,17768,17771,17773-17774,17776-17780,17782,17784-17786,17790-17795,17797-17798,17801,17804

issm/trunk/src/c

Property svn:ignore

old	new
16	16	.deps
17	17	.dirstamp
	18	.libs

issm/trunk/src/c/solutionsequences/solutionsequence_linear.cpp

r16137	r17806
23	23	femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
24	24	femmodel->UpdateConstraintsx();
25
26	25	SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
27	26	CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);

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

Download in other formats: