source: issm/oecreview/Archive/16133-16554/ISSM-16329-16330.diff@ 16556

Last change on this file since 16556 was 16556, checked in by Mathieu Morlighem, 11 years ago

NEW: added Archive/16133-16554
File size: 1.7 KB
RevLine 
[16556]1Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16329)
4+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16330)
5@@ -1594,7 +1594,7 @@
6 DatasetInput* datasetinput=new DatasetInput(InversionCostFunctionsCoefficientsEnum);
7 for(i=0;i<num_responses;i++){
8 for(j=0;j<3;j++)nodeinputs[j]=iomodel->Data(InversionCostFunctionsCoefficientsEnum)[(tria_vertex_ids[j]-1)*num_responses+i];
9- datasetinput->AddInput(new TriaInput(InversionCostFunctionsCoefficientsEnum,nodeinputs,P1Enum),int(iomodel->Data(InversionCostFunctionsEnum)[i]));
10+ datasetinput->AddInput(new TriaInput(InversionCostFunctionsCoefficientsEnum,nodeinputs,P1Enum),reCast<int>(iomodel->Data(InversionCostFunctionsEnum)[i]));
11 }
12
13 /*Add datasetinput to element inputs*/
14Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
15===================================================================
16--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16329)
17+++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16330)
18@@ -2282,7 +2282,7 @@
19 DatasetInput* datasetinput=new DatasetInput(InversionCostFunctionsCoefficientsEnum);
20 for(i=0;i<num_responses;i++){
21 for(j=0;j<6;j++)nodeinputs[j]=iomodel->Data(InversionCostFunctionsCoefficientsEnum)[(penta_vertex_ids[j]-1)*num_responses+i];
22- datasetinput->AddInput(new PentaInput(InversionCostFunctionsCoefficientsEnum,nodeinputs,P1Enum),int(iomodel->Data(InversionCostFunctionsEnum)[i]));
23+ datasetinput->AddInput(new PentaInput(InversionCostFunctionsCoefficientsEnum,nodeinputs,P1Enum),reCast<int>(iomodel->Data(InversionCostFunctionsEnum)[i]));
24 }
25
26 /*Add datasetinput to element inputs*/
Note: See TracBrowser for help on using the repository browser.