Changeset 9655
- Timestamp:
- 09/07/11 13:19:54 (14 years ago)
- Location:
- issm/trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r9650 r9655 439 439 NumberOfNodes2DEnum, 440 440 NodeonstokesEnum, 441 NodeonhutterEnum,442 441 NodeonpattynEnum, 443 442 NodeonmacayealEnum, -
issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp
r9650 r9655 383 383 case NumberOfNodes2DEnum : return "NumberOfNodes2D"; 384 384 case NodeonstokesEnum : return "Nodeonstokes"; 385 case NodeonhutterEnum : return "Nodeonhutter";386 385 case NodeonpattynEnum : return "Nodeonpattyn"; 387 386 case NodeonmacayealEnum : return "Nodeonmacayeal"; -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp
r9641 r9655 24 24 double *spcvy = NULL; 25 25 double *spcvz = NULL; 26 double *nodeonhutter = NULL;27 26 double *nodeonmacayeal = NULL; 28 27 double *nodeonpattyn = NULL; … … 65 64 iomodel->FetchData(&spcvy,NULL,NULL,SpcvyEnum); 66 65 iomodel->FetchData(&spcvz,NULL,NULL,SpcvzEnum); 67 iomodel->FetchData(&nodeonhutter,NULL,NULL,NodeonhutterEnum);68 66 iomodel->FetchData(&nodeonmacayeal,NULL,NULL,NodeonmacayealEnum); 69 67 if(dim==3)iomodel->FetchData(&nodeonpattyn,NULL,NULL,NodeonpattynEnum); … … 201 199 count++; 202 200 } 203 else if ( nodeonhutter[i]){201 else if (vertices_type[i]==HutterApproximationEnum){ 204 202 constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,DiagnosticHorizAnalysisEnum)); 205 203 count++; … … 210 208 count++; 211 209 } 212 else if ( nodeonhutter[i]){210 else if (vertices_type[i]==HutterApproximationEnum){ 213 211 constraints->AddObject(new SpcDynamic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,DiagnosticHorizAnalysisEnum)); 214 212 count++; … … 231 229 xfree((void**)&spcvy); 232 230 xfree((void**)&spcvz); 233 xfree((void**)&nodeonhutter);234 231 xfree((void**)&nodeonmacayeal); 235 232 xfree((void**)&nodeonpattyn); -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp
r9641 r9655 45 45 46 46 /*Create nodes: */ 47 iomodel->FetchData( 10,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,NodeonmacayealEnum,NodeonstokesEnum,47 iomodel->FetchData(9,NodeonbedEnum,NodeonsurfaceEnum,NodeonmacayealEnum,NodeonstokesEnum, 48 48 MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,VerticesTypeEnum,DiagnosticRefEnum); 49 49 … … 58 58 59 59 /*Clean fetched data: */ 60 iomodel->DeleteData( 10,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,NodeonmacayealEnum,NodeonstokesEnum,60 iomodel->DeleteData(9,NodeonbedEnum,NodeonsurfaceEnum,NodeonmacayealEnum,NodeonstokesEnum, 61 61 MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,VerticesTypeEnum,DiagnosticRefEnum); 62 62 -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp
r9641 r9655 42 42 43 43 /*Fetch data: */ 44 iomodel->FetchData(3,SpcvxEnum,SpcvyEnum, NodeonhutterEnum);44 iomodel->FetchData(3,SpcvxEnum,SpcvyEnum,VerticesTypeEnum); 45 45 46 46 /*Initialize conunter*/ … … 51 51 /*keep only this partition's nodes:*/ 52 52 if((iomodel->my_vertices[i])){ 53 if (!(int)iomodel->Data( NodeonhutterEnum)[i]){53 if (!(int)iomodel->Data(VerticesTypeEnum)[i]==HutterApproximationEnum){ 54 54 55 55 constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,DiagnosticHutterAnalysisEnum)); … … 74 74 75 75 /*Free data: */ 76 iomodel->DeleteData(3,SpcvxEnum,SpcvyEnum, NodeonhutterEnum);76 iomodel->DeleteData(3,SpcvxEnum,SpcvyEnum,VerticesTypeEnum); 77 77 78 78 /*Assign output pointer: */ -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp
r9641 r9655 44 44 45 45 /*First fetch data: */ 46 iomodel->FetchData( 8,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);46 iomodel->FetchData(7,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum); 47 47 CreateNumberNodeToElementConnectivity(iomodel); 48 48 … … 57 57 58 58 /*Clean fetched data: */ 59 iomodel->DeleteData( 8,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);59 iomodel->DeleteData(7,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum); 60 60 61 61 /*Assign output pointer: */ -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp
r9641 r9655 39 39 } 40 40 41 iomodel->FetchDataToInput(elements,NodeonhutterEnum);42 41 iomodel->FetchDataToInput(elements,ThicknessEnum); 43 42 iomodel->FetchDataToInput(elements,ThicknessCoeffEnum); -
issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp
r9650 r9655 381 381 else if (strcmp(name,"NumberOfNodes2D")==0) return NumberOfNodes2DEnum; 382 382 else if (strcmp(name,"Nodeonstokes")==0) return NodeonstokesEnum; 383 else if (strcmp(name,"Nodeonhutter")==0) return NodeonhutterEnum;384 383 else if (strcmp(name,"Nodeonpattyn")==0) return NodeonpattynEnum; 385 384 else if (strcmp(name,"Nodeonmacayeal")==0) return NodeonmacayealEnum; -
issm/trunk/src/c/objects/Node.cpp
r9641 r9655 92 92 } 93 93 /*spc all nodes on hutter*/ 94 if (!iomodel->Data(NodeonhutterEnum)) _error_("iomodel->nodeonhutter is NULL"); 95 if (iomodel->Data(NodeonhutterEnum)[io_index]){ 94 if (iomodel->Data(VerticesTypeEnum)[io_index]==HutterApproximationEnum){ 96 95 for(k=1;k<=gsize;k++){ 97 96 this->FreezeDof(k); … … 103 102 /*Diagnostic Hutter*/ 104 103 if (analysis_type==DiagnosticHutterAnalysisEnum){ 104 if (!iomodel->Data(VerticesTypeEnum)) _error_("iomodel->vertices_type is NULL"); 105 105 /*Constrain all nodes that are not Hutter*/ 106 if (!iomodel->Data(NodeonhutterEnum)) _error_("iomodel->nodeonhutter is NULL"); 107 if (!iomodel->Data(NodeonhutterEnum)[io_index]){ 106 if (!iomodel->Data(VerticesTypeEnum)[io_index]==HutterApproximationEnum){ 108 107 for(k=1;k<=gsize;k++){ 109 108 this->FreezeDof(k); -
issm/trunk/src/m/classes/model/model.m
r9650 r9655 67 67 68 68 %Nodes 69 nodeonhutter = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);70 69 nodeonmacayeal = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); 71 70 nodeonpattyn = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); -
issm/trunk/test/NightlyRun/test311.m
r9641 r9655 5 5 md=setelementstype(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal'); 6 6 md.cluster=none; 7 md.verbose=verbose('module',true,'solution',true,'verbose',true); 7 8 md=solve(md,DiagnosticSolutionEnum); 8 9 -
issm/trunk/test/NightlyRun/test312.m
r9641 r9655 4 4 md=extrude(md,4,2); 5 5 md=setelementstype(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal'); 6 md.cluster=generic('name',oshostname(),'np',3); 6 md.cluster=generic('name',oshostname(),'np',1); 7 md.debug.valgrind=1; 8 md.verbose=verbose('convergence',true,'solution',true,'module',true); 7 9 md=solve(md,DiagnosticSolutionEnum); 8 10
Note:
See TracChangeset
for help on using the changeset viewer.