Skip to content

Commit 09acf82

Browse files
dcwhitedcwhite
committed
Fixes #1029 
1 parent 578c224 commit 09acf82

File tree

2 files changed

+303
-3
lines changed

2 files changed

+303
-3
lines changed

‎src/Core/Algorithms/Legacy/Fields/Mapping/MapFieldDataFromNodeToElem.cc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ MapFieldDataFromNodeToElemT(const MapFieldDataFromNodeToElemAlgo* algo,
6464
VField *ifield = input->vfield();
6565
VField *ofield = output->vfield();
6666

67-
/// Make sure that the data vector has the proper length
67+
/// Make sure that the data vector has the same length
68+
ofield->resize_fdata();
69+
6870
VMesh* mesh = input->vmesh();
6971

7072
VMesh::Elem::array_type elems;
@@ -93,7 +95,6 @@ MapFieldDataFromNodeToElemT(const MapFieldDataFromNodeToElemAlgo* algo,
9395
val += tval;
9496
}
9597

96-
ofield->resize_fdata();
9798
val = static_cast<DATA>(val * static_cast<double>((1.0 / static_cast<double>(nsize))));
9899
ofield->set_value(val, *it);
99100
++it;
@@ -209,7 +210,9 @@ MapFieldDataFromNodeToElemT(const MapFieldDataFromNodeToElemAlgo* algo,
209210
algo->update_progress_max(c, sz);
210211
}
211212
}
212-
} else return false;
213+
}
214+
else
215+
return false;
213216

214217
return true;
215218
}

‎src/ExampleNets/regression/largeMapping.srn5‎

Lines changed: 297 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,297 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
2+
<!DOCTYPE boost_serialization>
3+
<boost_serialization signature="serialization::archive" version="12">
4+
<networkFile class_id="0" tracking_level="0" version="3">
5+
<networkInfo class_id="1" tracking_level="0" version="0">
6+
<modules class_id="2" tracking_level="0" version="0">
7+
<count>4</count>
8+
<item_version>0</item_version>
9+
<item class_id="3" tracking_level="0" version="0">
10+
<first>CreateFieldData:0</first>
11+
<second class_id="4" tracking_level="0" version="0">
12+
<module class_id="5" tracking_level="0" version="0">
13+
<package_name_>SCIRun</package_name_>
14+
<category_name_>ChangeFieldData</category_name_>
15+
<module_name_>CreateFieldData</module_name_>
16+
</module>
17+
<state class_id="6" tracking_level="0" version="0">
18+
<stateMap class_id="7" tracking_level="0" version="0">
19+
<count>3</count>
20+
<item_version>0</item_version>
21+
<item class_id="8" tracking_level="0" version="0">
22+
<first class_id="9" tracking_level="0" version="0">
23+
<name>BasisString</name>
24+
</first>
25+
<second class_id="10" tracking_level="0" version="0">
26+
<name>BasisString</name>
27+
<value class_id="11" tracking_level="0" version="0">
28+
<which>2</which>
29+
<value>Linear</value>
30+
</value>
31+
</second>
32+
</item>
33+
<item>
34+
<first>
35+
<name>FormatString</name>
36+
</first>
37+
<second>
38+
<name>FormatString</name>
39+
<value>
40+
<which>2</which>
41+
<value>Scalar</value>
42+
</value>
43+
</second>
44+
</item>
45+
<item>
46+
<first>
47+
<name>FunctionString</name>
48+
</first>
49+
<second>
50+
<name>FunctionString</name>
51+
<value>
52+
<which>2</which>
53+
<value>RESULT = X+Y+Z;</value>
54+
</value>
55+
</second>
56+
</item>
57+
</stateMap>
58+
</state>
59+
</second>
60+
</item>
61+
<item>
62+
<first>CreateLatVol:0</first>
63+
<second>
64+
<module>
65+
<package_name_>SCIRun</package_name_>
66+
<category_name_>NewField</category_name_>
67+
<module_name_>CreateLatVol</module_name_>
68+
</module>
69+
<state>
70+
<stateMap>
71+
<count>6</count>
72+
<item_version>0</item_version>
73+
<item>
74+
<first>
75+
<name>DataAtLocation</name>
76+
</first>
77+
<second>
78+
<name>DataAtLocation</name>
79+
<value>
80+
<which>0</which>
81+
<value>0</value>
82+
</value>
83+
</second>
84+
</item>
85+
<item>
86+
<first>
87+
<name>ElementSizeNormalized</name>
88+
</first>
89+
<second>
90+
<name>ElementSizeNormalized</name>
91+
<value>
92+
<which>0</which>
93+
<value>0</value>
94+
</value>
95+
</second>
96+
</item>
97+
<item>
98+
<first>
99+
<name>PadPercent</name>
100+
</first>
101+
<second>
102+
<name>PadPercent</name>
103+
<value>
104+
<which>1</which>
105+
<value>0.00000000000000000e+00</value>
106+
</value>
107+
</second>
108+
</item>
109+
<item>
110+
<first>
111+
<name>XSize</name>
112+
</first>
113+
<second>
114+
<name>XSize</name>
115+
<value>
116+
<which>0</which>
117+
<value>256</value>
118+
</value>
119+
</second>
120+
</item>
121+
<item>
122+
<first>
123+
<name>YSize</name>
124+
</first>
125+
<second>
126+
<name>YSize</name>
127+
<value>
128+
<which>0</which>
129+
<value>256</value>
130+
</value>
131+
</second>
132+
</item>
133+
<item>
134+
<first>
135+
<name>ZSize</name>
136+
</first>
137+
<second>
138+
<name>ZSize</name>
139+
<value>
140+
<which>0</which>
141+
<value>256</value>
142+
</value>
143+
</second>
144+
</item>
145+
</stateMap>
146+
</state>
147+
</second>
148+
</item>
149+
<item>
150+
<first>MapFieldDataFromNodeToElem:0</first>
151+
<second>
152+
<module>
153+
<package_name_>SCIRun</package_name_>
154+
<category_name_>ChangeFieldData</category_name_>
155+
<module_name_>MapFieldDataFromNodeToElem</module_name_>
156+
</module>
157+
<state>
158+
<stateMap>
159+
<count>1</count>
160+
<item_version>0</item_version>
161+
<item>
162+
<first>
163+
<name>Method</name>
164+
</first>
165+
<second>
166+
<name>Method</name>
167+
<value>
168+
<which>2</which>
169+
<value>Interpolation</value>
170+
</value>
171+
</second>
172+
</item>
173+
</stateMap>
174+
</state>
175+
</second>
176+
</item>
177+
<item>
178+
<first>ReportFieldInfo:0</first>
179+
<second>
180+
<module>
181+
<package_name_>SCIRun</package_name_>
182+
<category_name_>MiscField</category_name_>
183+
<module_name_>ReportFieldInfo</module_name_>
184+
</module>
185+
<state>
186+
<stateMap>
187+
<count>0</count>
188+
<item_version>0</item_version>
189+
</stateMap>
190+
</state>
191+
</second>
192+
</item>
193+
</modules>
194+
<connections class_id="12" tracking_level="0" version="0">
195+
<count>3</count>
196+
<item_version>0</item_version>
197+
<item class_id="13" tracking_level="0" version="0">
198+
<moduleId1_>CreateFieldData:0</moduleId1_>
199+
<port1_ class_id="14" tracking_level="0" version="0">
200+
<name>OutputField</name>
201+
<id>0</id>
202+
</port1_>
203+
<moduleId2_>MapFieldDataFromNodeToElem:0</moduleId2_>
204+
<port2_>
205+
<name>InputField</name>
206+
<id>0</id>
207+
</port2_>
208+
</item>
209+
<item>
210+
<moduleId1_>CreateLatVol:0</moduleId1_>
211+
<port1_>
212+
<name>OutputField</name>
213+
<id>0</id>
214+
</port1_>
215+
<moduleId2_>CreateFieldData:0</moduleId2_>
216+
<port2_>
217+
<name>InputField</name>
218+
<id>0</id>
219+
</port2_>
220+
</item>
221+
<item>
222+
<moduleId1_>MapFieldDataFromNodeToElem:0</moduleId1_>
223+
<port1_>
224+
<name>OutputField</name>
225+
<id>0</id>
226+
</port1_>
227+
<moduleId2_>ReportFieldInfo:0</moduleId2_>
228+
<port2_>
229+
<name>InputField</name>
230+
<id>0</id>
231+
</port2_>
232+
</item>
233+
</connections>
234+
</networkInfo>
235+
<modulePositions class_id="15" tracking_level="0" version="0">
236+
<count>4</count>
237+
<item_version>0</item_version>
238+
<item class_id="16" tracking_level="0" version="0">
239+
<first>CreateFieldData:0</first>
240+
<second class_id="17" tracking_level="0" version="0">
241+
<first>-2.04000000000000000e+02</first>
242+
<second>-2.15000000000000000e+02</second>
243+
</second>
244+
</item>
245+
<item>
246+
<first>CreateLatVol:0</first>
247+
<second>
248+
<first>-3.04000000000000000e+02</first>
249+
<second>-3.80000000000000000e+02</second>
250+
</second>
251+
</item>
252+
<item>
253+
<first>MapFieldDataFromNodeToElem:0</first>
254+
<second>
255+
<first>-1.39000000000000000e+02</first>
256+
<second>-8.00000000000000000e+01</second>
257+
</second>
258+
</item>
259+
<item>
260+
<first>ReportFieldInfo:0</first>
261+
<second>
262+
<first>-1.22000000000000000e+02</first>
263+
<second>7.90000000000000000e+01</second>
264+
</second>
265+
</item>
266+
</modulePositions>
267+
<moduleNotes class_id="18" tracking_level="0" version="0">
268+
<count>0</count>
269+
<item_version>0</item_version>
270+
</moduleNotes>
271+
<connectionNotes>
272+
<count>0</count>
273+
<item_version>0</item_version>
274+
</connectionNotes>
275+
<moduleTags class_id="19" tracking_level="0" version="0">
276+
<count>4</count>
277+
<item_version>0</item_version>
278+
<item class_id="20" tracking_level="0" version="0">
279+
<first>CreateFieldData:0</first>
280+
<second>0</second>
281+
</item>
282+
<item>
283+
<first>CreateLatVol:0</first>
284+
<second>0</second>
285+
</item>
286+
<item>
287+
<first>MapFieldDataFromNodeToElem:0</first>
288+
<second>0</second>
289+
</item>
290+
<item>
291+
<first>ReportFieldInfo:0</first>
292+
<second>0</second>
293+
</item>
294+
</moduleTags>
295+
</networkFile>
296+
</boost_serialization>
297+

0 commit comments

Comments
 (0)