Changeset 17102

Timestamp:

01/13/14 14:46:26 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing output on nodes for FS

Location:

issm/trunk-jpl/src/c/classes

Files:

• FemModel.cpp (modified) (2 diffs)
• Inputs/PentaInput.cpp (modified) (1 diff)
• Inputs/PentaInput.h (modified) (1 diff)
• Inputs/TriaInput.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -553 +553 @@
                                                 /*Allocate matrices*/
                                                 int         nbe       = this->elements->NumberOfElements();
-                                                IssmDouble* values    = xNew<IssmDouble>(nbe*nodesperelement);
+                                                IssmDouble* values    = xNewZeroInit<IssmDouble>(nbe*nodesperelement);
                                                 IssmDouble* allvalues = xNew<IssmDouble>(nbe*nodesperelement);
 
@@ -567 +567 @@
 
                                                 if(save_results)results->AddResult(new GenericExternalResult<IssmDouble*>(results->Size()+1,output_enum,allvalues,nbe,nodesperelement,step,time));
+                                                xDelete<IssmDouble>(allvalues);
 
                                         }

issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp

@@ -142 +142 @@
 }
 /*}}}*/
+/*FUNCTION PentaInput::ResultToPatch{{{*/
+void PentaInput::ResultToPatch(IssmDouble* values,int nodesperelement,int sid){
+
+        int numnodes = this->NumberofNodes();
+
+        /*Some checks*/
+        _assert_(values);
+        _assert_(numnodes==nodesperelement);
+
+        /*Fill in arrays*/
+        for(int i=0;i<numnodes;i++) values[sid*numnodes + i] = this->values[i];
+}
+/*}}}*/
 
 /*Object functions*/

issm/trunk-jpl/src/c/classes/Inputs/PentaInput.h

@@ -41 +41 @@
                 int  GetResultInterpolation(void);
                 int  GetResultNumberOfNodes(void);
-                void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");};
+                void ResultToPatch(IssmDouble* values,int nodesperelement,int sid);
                 void AddTimeValues(IssmDouble* values,int step,IssmDouble time){_error_("not supported yet");};
                 void Configure(Parameters* parameters);

issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp

@@ -139 +139 @@
 
         /*Fill in arrays*/
-        for(int i=0;i<numnodes;i++){
-                values[sid*numnodes + i] = this->values[i];
-        }
-
-
-
+        for(int i=0;i<numnodes;i++) values[sid*numnodes + i] = this->values[i];
 }
 /*}}}*/