Changeset 17692 for issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp

Timestamp:

04/09/14 13:15:54 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: starting to change iomodel->domaintype to iomodel->meshelementtype when necessary (useful for Tetras)

File:

• issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp

@@ -36 +36 @@
 void L2ProjectionBaseAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
 
-        if(iomodel->domaintype==Mesh3DEnum || iomodel->domaintype==Mesh3DtetrasEnum){
+        if(iomodel->domaintype==Mesh3DEnum){
                 iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
         }
@@ -82 +82 @@
                         break;
                 case Mesh3DEnum:
-                        if(!element->IsOnBase()) return NULL;
-                        basalelement = element->SpawnBasalElement();
-                        break;
-                case Mesh3DtetrasEnum:
                         if(!element->IsOnBase()) return NULL;
                         basalelement = element->SpawnBasalElement();
@@ -145 +141 @@
                         break;
                 case Mesh3DEnum:
-                        if(!element->IsOnBase()) return NULL;
-                        basalelement = element->SpawnBasalElement();
-                        break;
-                case Mesh3DtetrasEnum:
                         if(!element->IsOnBase()) return NULL;
                         basalelement = element->SpawnBasalElement();
@@ -212 +204 @@
 void L2ProjectionBaseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
 
-        int inputenum,domaintype;
+        int inputenum,domaintype,elementtype;
 
         element->FindParam(&inputenum,InputToL2ProjectEnum);
         element->FindParam(&domaintype,DomainTypeEnum);
+        element->FindParam(&elementtype,MeshElementtypeEnum);
         switch(domaintype){
                 case Mesh2DhorizontalEnum:
@@ -221 +214 @@
                         break;
                 case Mesh2DverticalEnum:
-                case Mesh3DtetrasEnum:
                         element->InputUpdateFromSolutionOneDof(solution,inputenum);
                         break;
                 case Mesh3DEnum:
-                        element->InputUpdateFromSolutionOneDofCollapsed(solution,inputenum);
+                        if(elementtype==TetraEnum)
+                         element->InputUpdateFromSolutionOneDof(solution,inputenum);
+                        else
+                         element->InputUpdateFromSolutionOneDofCollapsed(solution,inputenum);
                         break;
                 default: _error_("mesh "<<EnumToStringx(domaintype)<<" not supported yet");