Context Navigation

← Previous Change
Next Change →

Changeset 19105 for issm/trunk/src/c/modules/FloatingiceMeltingRatex

Timestamp:

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

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 19103

Location:

Files:

: 1 deleted
: 6 edited

. (modified) (2 props)
src (modified) (1 prop)
src/c (modified) (1 prop)
src/c/modules (modified) (1 prop)
src/c/modules/FloatingiceMeltingRatex (modified) (1 prop)
src/c/modules/FloatingiceMeltingRatex/.dirstamp (deleted)
src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (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/src

Property svn:mergeinfo changed

/issm/trunk-jpl/src

merged: 18302-18303,18305,18308-18311,18313-18316,18318-18320,18327,18332-18333,18336-18337,18339,18344-18351,18353,18355,18357-18358,18360-18363,18365-18371,18374-18375,18377-18383,18385-18386,18388-18391,18393-18394,18400,18403,18405,18434-18435,18439,18446,18450,18452-18455,18457,18460-18476,18478-18488,18490-18494,18496-18498,18500-18509,18511-18513,18515-18517,18519-18523,18528-18532,18534,18537-18538,18545,18550-18551,18553-18555,18557-18561,18563-18571,18573-18574,18576-18581,18584-18593,18596,18599-18624,18633,18641,18643,18645,18647-18654,18656-18660,18662-18665,18667-18672,18674-18676,18678,18687-18689,18695-18696,18699,18702-18703,18705-18707,18709-18711,18713-18733,18735-18759,18763-18764,18766,18770-18782,18784,18786-18788,18790,18792,18794-18801,18804-18808,18812-18813,18815-18818,18822,18824-18838,18840-18843,18845,18847-18857,18860-18862,18864-18894,18896,18903,18906,18908-18931,18935-18942,18944-18953,18955-18961,18963,18965-18970,18975-18976,18978-18979,18981-18982,18984-18986,18988,18990-18994,18996-19030,19032-19042,19044-19048,19050,19054-19057,19059,19061-19071,19073-19087,19090-19092,19094-19099,19101

issm/trunk/src/c

Property svn:ignore

-              old
+              new
 *.obj
 *.exe
+issm
+kriging
 appscan.*
 ouncemake*
 …
 probe.results
 stXXXX*
 .deps
 .dirstamp
+*.deps
+*.dirstamp
 .libs

issm/trunk/src/c/modules
- Property svn:ignore set to
  .deps

issm/trunk/src/c/modules/FloatingiceMeltingRatex

Property svn:ignore

old	new
1	1	.deps
	2	.dirstamp

issm/trunk/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp

r18093	r19105
33	33
34	34	for(int i=0;i<femmodel->elements->Size();i++){
35		Element* element=~~dynamic_c~~ast<Element*>(femmodel->elements->GetObjectByOffset(i));
	35	Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
36	36	element->LinearFloatingiceMeltingRate();
37	37	}

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

Download in other formats: