Changeset 9655

Timestamp:

09/07/11 13:19:54 (14 years ago)

Author:

seroussi

Message:

removed field nodeonhutter

Location:

issm/trunk

Files:

• src/c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• src/c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (5 diffs)
• src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (modified) (2 diffs)
• src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (modified) (3 diffs)
• src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (modified) (2 diffs)
• src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (modified) (1 diff)
• src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• src/c/objects/Node.cpp (modified) (2 diffs)
• src/m/classes/model/model.m (modified) (1 diff)
• test/NightlyRun/test311.m (modified) (1 diff)
• test/NightlyRun/test312.m (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -439 +439 @@
         NumberOfNodes2DEnum,
         NodeonstokesEnum,
-        NodeonhutterEnum,
         NodeonpattynEnum,
         NodeonmacayealEnum,

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -383 +383 @@
                 case NumberOfNodes2DEnum : return "NumberOfNodes2D";
                 case NodeonstokesEnum : return "Nodeonstokes";
-                case NodeonhutterEnum : return "Nodeonhutter";
                 case NodeonpattynEnum : return "Nodeonpattyn";
                 case NodeonmacayealEnum : return "Nodeonmacayeal";

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp

@@ -24 +24 @@
         double *spcvy           = NULL;
         double *spcvz           = NULL;
-        double *nodeonhutter    = NULL;
         double *nodeonmacayeal  = NULL;
         double *nodeonpattyn    = NULL;
@@ -65 +64 @@
         iomodel->FetchData(&spcvy,NULL,NULL,SpcvyEnum);
         iomodel->FetchData(&spcvz,NULL,NULL,SpcvzEnum);
-        iomodel->FetchData(&nodeonhutter,NULL,NULL,NodeonhutterEnum);
         iomodel->FetchData(&nodeonmacayeal,NULL,NULL,NodeonmacayealEnum);
         if(dim==3)iomodel->FetchData(&nodeonpattyn,NULL,NULL,NodeonpattynEnum);
@@ -201 +199 @@
                                         count++;
                                 }
-                                else if (nodeonhutter[i]){
+                                else if (vertices_type[i]==HutterApproximationEnum){
                                         constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,DiagnosticHorizAnalysisEnum)); 
                                         count++;
@@ -210 +208 @@
                                         count++;
                                 }
-                                else if (nodeonhutter[i]){
+                                else if (vertices_type[i]==HutterApproximationEnum){
                                         constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,DiagnosticHorizAnalysisEnum)); 
                                         count++;
@@ -231 +229 @@
         xfree((void**)&spcvy);
         xfree((void**)&spcvz);
-        xfree((void**)&nodeonhutter);
         xfree((void**)&nodeonmacayeal);
         xfree((void**)&nodeonpattyn);

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp

@@ -45 +45 @@
 
         /*Create nodes: */
-        iomodel->FetchData(10,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,NodeonmacayealEnum,NodeonstokesEnum,
+        iomodel->FetchData(9,NodeonbedEnum,NodeonsurfaceEnum,NodeonmacayealEnum,NodeonstokesEnum,
                                 MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,VerticesTypeEnum,DiagnosticRefEnum);
         
@@ -58 +58 @@
 
         /*Clean fetched data: */
-        iomodel->DeleteData(10,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,NodeonmacayealEnum,NodeonstokesEnum,
+        iomodel->DeleteData(9,NodeonbedEnum,NodeonsurfaceEnum,NodeonmacayealEnum,NodeonstokesEnum,
                                 MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,VerticesTypeEnum,DiagnosticRefEnum);
 

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp

@@ -42 +42 @@
 
         /*Fetch data: */
-        iomodel->FetchData(3,SpcvxEnum,SpcvyEnum,NodeonhutterEnum);
+        iomodel->FetchData(3,SpcvxEnum,SpcvyEnum,VerticesTypeEnum);
 
         /*Initialize conunter*/
@@ -51 +51 @@
                 /*keep only this partition's nodes:*/
                 if((iomodel->my_vertices[i])){
-                        if (!(int)iomodel->Data(NodeonhutterEnum)[i]){
+                        if (!(int)iomodel->Data(VerticesTypeEnum)[i]==HutterApproximationEnum){
 
                                 constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,DiagnosticHutterAnalysisEnum));
@@ -74 +74 @@
 
         /*Free data: */
-        iomodel->DeleteData(3,SpcvxEnum,SpcvyEnum,NodeonhutterEnum);
+        iomodel->DeleteData(3,SpcvxEnum,SpcvyEnum,VerticesTypeEnum);
         
         /*Assign output pointer: */

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp

@@ -44 +44 @@
 
         /*First fetch data: */
-        iomodel->FetchData(8,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
+        iomodel->FetchData(7,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
         CreateNumberNodeToElementConnectivity(iomodel);
 
@@ -57 +57 @@
 
         /*Clean fetched data: */
-        iomodel->DeleteData(8,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
+        iomodel->DeleteData(7,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
 
         /*Assign output pointer: */

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp

@@ -39 +39 @@
         }
         
-        iomodel->FetchDataToInput(elements,NodeonhutterEnum);
         iomodel->FetchDataToInput(elements,ThicknessEnum);
         iomodel->FetchDataToInput(elements,ThicknessCoeffEnum);

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -381 +381 @@
         else if (strcmp(name,"NumberOfNodes2D")==0) return NumberOfNodes2DEnum;
         else if (strcmp(name,"Nodeonstokes")==0) return NodeonstokesEnum;
-        else if (strcmp(name,"Nodeonhutter")==0) return NodeonhutterEnum;
         else if (strcmp(name,"Nodeonpattyn")==0) return NodeonpattynEnum;
         else if (strcmp(name,"Nodeonmacayeal")==0) return NodeonmacayealEnum;

issm/trunk/src/c/objects/Node.cpp

@@ -92 +92 @@
                 }
                 /*spc all nodes on hutter*/
-                if (!iomodel->Data(NodeonhutterEnum)) _error_("iomodel->nodeonhutter is NULL");
-                if (iomodel->Data(NodeonhutterEnum)[io_index]){
+                if (iomodel->Data(VerticesTypeEnum)[io_index]==HutterApproximationEnum){
                         for(k=1;k<=gsize;k++){
                                 this->FreezeDof(k);
@@ -103 +102 @@
         /*Diagnostic Hutter*/
         if (analysis_type==DiagnosticHutterAnalysisEnum){
+                if (!iomodel->Data(VerticesTypeEnum)) _error_("iomodel->vertices_type is NULL");
                 /*Constrain all nodes that are not Hutter*/
-                if (!iomodel->Data(NodeonhutterEnum)) _error_("iomodel->nodeonhutter is NULL");
-                if (!iomodel->Data(NodeonhutterEnum)[io_index]){
+                if (!iomodel->Data(VerticesTypeEnum)[io_index]==HutterApproximationEnum){
                         for(k=1;k<=gsize;k++){
                                 this->FreezeDof(k);

issm/trunk/src/m/classes/model/model.m

@@ -67 +67 @@
 
                  %Nodes
-                 nodeonhutter         = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  nodeonmacayeal       = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  nodeonpattyn         = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);

issm/trunk/test/NightlyRun/test311.m

@@ -5 +5 @@
 md=setelementstype(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal');
 md.cluster=none;
+md.verbose=verbose('module',true,'solution',true,'verbose',true);
 md=solve(md,DiagnosticSolutionEnum);
 

issm/trunk/test/NightlyRun/test312.m

@@ -4 +4 @@
 md=extrude(md,4,2);
 md=setelementstype(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal');
-md.cluster=generic('name',oshostname(),'np',3);
+md.cluster=generic('name',oshostname(),'np',1);
+md.debug.valgrind=1;
+md.verbose=verbose('convergence',true,'solution',true,'module',true);
 md=solve(md,DiagnosticSolutionEnum);