Changeset 24980

Timestamp:

06/07/20 23:55:19 (5 years ago)

Author:

Eric.Larour

Message:

CHG: case of hydro material was not covered when doing a copy or a reset.

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp ¶

@@ -117 +117 @@
 
         tria->hvertices = (Hook*)this->hvertices->copy();
-        tria->hmaterial = (Hook*)this->hmaterial->copy();
+        if(this->hmaterial)tria->hmaterial = (Hook*)this->hmaterial->copy();
         tria->hneighbors = NULL;
 
@@ -139 +139 @@
 
         tria->vertices = (Vertex**)this->hvertices->deliverp();
-        tria->material = (Material*)this->hmaterial->delivers();
+        if(this->hmaterial)tria->material = (Material*)this->hmaterial->delivers();
 
         return tria;
@@ -3943 +3943 @@
         for(int i=0;i<this->numanalyses;i++) if(this->hnodes[i]) this->hnodes[i]->reset();
         this->hvertices->reset();
-        this->hmaterial->reset();
+        if(this->hmaterial)this->hmaterial->reset();
         if(this->hneighbors) this->hneighbors->reset();