Skip to content

Commit 12eb6f8

Browse files
cbrightscicbrightsci
committed
fixed rhs
1 parent 90477e7 commit 12eb6f8

File tree

2 files changed

+85
-13
lines changed

2 files changed

+85
-13
lines changed

‎src/ExampleNets/regression/applyFEMVoltageSource.srn5‎

Lines changed: 82 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<networkFile class_id="0" tracking_level="0" version="3">
55
<networkInfo class_id="1" tracking_level="0" version="0">
66
<modules class_id="2" tracking_level="0" version="0">
7-
<count>6</count>
7+
<count>7</count>
88
<item_version>0</item_version>
99
<item class_id="3" tracking_level="0" version="0">
1010
<first>ApplyFEMVoltageSource:0</first>
@@ -34,6 +34,34 @@
3434
</state>
3535
</second>
3636
</item>
37+
<item>
38+
<first>ApplyFEMVoltageSource:1</first>
39+
<second>
40+
<module>
41+
<package_name_>SCIRun</package_name_>
42+
<category_name_>FiniteElements</category_name_>
43+
<module_name_>ApplyFEMVoltageSource</module_name_>
44+
</module>
45+
<state>
46+
<stateMap>
47+
<count>1</count>
48+
<item_version>0</item_version>
49+
<item>
50+
<first>
51+
<name>ApplyDirichlet</name>
52+
</first>
53+
<second>
54+
<name>ApplyDirichlet</name>
55+
<value>
56+
<which>0</which>
57+
<value>0</value>
58+
</value>
59+
</second>
60+
</item>
61+
</stateMap>
62+
</state>
63+
</second>
64+
</item>
3765
<item>
3866
<first>ReadField:0</first>
3967
<second>
@@ -164,22 +192,46 @@
164192
</item>
165193
</modules>
166194
<connections class_id="12" tracking_level="0" version="0">
167-
<count>5</count>
195+
<count>8</count>
168196
<item_version>0</item_version>
169197
<item class_id="13" tracking_level="0" version="0">
170198
<moduleId1_>ApplyFEMVoltageSource:0</moduleId1_>
171199
<port1_ class_id="14" tracking_level="0" version="0">
172200
<name>ForwardMatrix</name>
173201
<id>0</id>
174202
</port1_>
203+
<moduleId2_>ApplyFEMVoltageSource:1</moduleId2_>
204+
<port2_>
205+
<name>StiffnessMatrix</name>
206+
<id>0</id>
207+
</port2_>
208+
</item>
209+
<item>
210+
<moduleId1_>ApplyFEMVoltageSource:0</moduleId1_>
211+
<port1_>
212+
<name>OutputRHS</name>
213+
<id>0</id>
214+
</port1_>
215+
<moduleId2_>ApplyFEMVoltageSource:1</moduleId2_>
216+
<port2_>
217+
<name>RHS</name>
218+
<id>0</id>
219+
</port2_>
220+
</item>
221+
<item>
222+
<moduleId1_>ApplyFEMVoltageSource:1</moduleId1_>
223+
<port1_>
224+
<name>ForwardMatrix</name>
225+
<id>0</id>
226+
</port1_>
175227
<moduleId2_>ReportMatrixInfo:12</moduleId2_>
176228
<port2_>
177229
<name>InputMatrix</name>
178230
<id>0</id>
179231
</port2_>
180232
</item>
181233
<item>
182-
<moduleId1_>ApplyFEMVoltageSource:0</moduleId1_>
234+
<moduleId1_>ApplyFEMVoltageSource:1</moduleId1_>
183235
<port1_>
184236
<name>OutputRHS</name>
185237
<id>0</id>
@@ -202,6 +254,18 @@
202254
<id>0</id>
203255
</port2_>
204256
</item>
257+
<item>
258+
<moduleId1_>ReadField:0</moduleId1_>
259+
<port1_>
260+
<name>Field</name>
261+
<id>0</id>
262+
</port1_>
263+
<moduleId2_>ApplyFEMVoltageSource:1</moduleId2_>
264+
<port2_>
265+
<name>Mesh</name>
266+
<id>0</id>
267+
</port2_>
268+
</item>
205269
<item>
206270
<moduleId1_>ReadMatrix:0</moduleId1_>
207271
<port1_>
@@ -229,7 +293,7 @@
229293
</connections>
230294
</networkInfo>
231295
<modulePositions class_id="15" tracking_level="0" version="0">
232-
<count>6</count>
296+
<count>7</count>
233297
<item_version>0</item_version>
234298
<item class_id="16" tracking_level="0" version="0">
235299
<first>ApplyFEMVoltageSource:0</first>
@@ -238,6 +302,13 @@
238302
<second>-7.60000000000000000e+002</second>
239303
</second>
240304
</item>
305+
<item>
306+
<first>ApplyFEMVoltageSource:1</first>
307+
<second>
308+
<first>-1.52000000000000000e+003</first>
309+
<second>-6.08000000000000000e+002</second>
310+
</second>
311+
</item>
241312
<item>
242313
<first>ReadField:0</first>
243314
<second>
@@ -263,14 +334,14 @@
263334
<first>ReportMatrixInfo:11</first>
264335
<second>
265336
<first>-1.36800000000000000e+003</first>
266-
<second>-6.08000000000000000e+002</second>
337+
<second>-4.56000000000000000e+002</second>
267338
</second>
268339
</item>
269340
<item>
270341
<first>ReportMatrixInfo:12</first>
271342
<second>
272343
<first>-1.67200000000000000e+003</first>
273-
<second>-6.08000000000000000e+002</second>
344+
<second>-4.56000000000000000e+002</second>
274345
</second>
275346
</item>
276347
</modulePositions>
@@ -283,12 +354,16 @@
283354
<item_version>0</item_version>
284355
</connectionNotes>
285356
<moduleTags class_id="19" tracking_level="0" version="0">
286-
<count>6</count>
357+
<count>7</count>
287358
<item_version>0</item_version>
288359
<item class_id="20" tracking_level="0" version="0">
289360
<first>ApplyFEMVoltageSource:0</first>
290361
<second>0</second>
291362
</item>
363+
<item>
364+
<first>ApplyFEMVoltageSource:1</first>
365+
<second>0</second>
366+
</item>
292367
<item>
293368
<first>ReadField:0</first>
294369
<second>0</second>

‎src/Modules/Legacy/FiniteElements/ApplyFEMVoltageSource.cc‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,16 @@ void ApplyFEMVoltageSource::execute()
125125
SparseRowMatrixHandle mat(matrix_cast::as_sparse(stiffnessMatrix));
126126
DenseColumnMatrixHandle rhs(new DenseColumnMatrix(nsize));
127127

128-
DenseColumnMatrix* rhsIn = 0;
128+
DenseColumnMatrixHandle rhsIn(matrix_cast::as_column((*rhsMatrix)));
129129
if (rhsMatrix)
130130
{
131-
#ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER
132-
rhsIn = rhsMatrix->column();
131+
//rhsIn = rhsMatrix->column();
133132
if (rhsIn && (rhsIn->nrows() == nsize))
134133
{
135134
for (unsigned int i = 0; i < nsize; i++)
136135
(*rhs)[i] = (*rhsIn)[i];
137136
}
138137
else
139-
#endif
140138
{
141139
rhs->Zero(nsize);
142140
}
@@ -153,7 +151,6 @@ void ApplyFEMVoltageSource::execute()
153151
sendOutput(ForwardMatrix, forwardMatrix);
154152

155153
MatrixHandle outputrhs(rhs);
156-
sendOutput(OutputRHS, outputrhs);
157-
154+
sendOutput(OutputRHS, outputrhs);
158155
}
159156
}

0 commit comments

Comments
 (0)