Index: /issm/trunk/src/c/objects/Penpair.cpp =================================================================== --- /issm/trunk/src/c/objects/Penpair.cpp (revision 1896) +++ /issm/trunk/src/c/objects/Penpair.cpp (revision 1897) @@ -22,6 +22,5 @@ } -Penpair::Penpair(int penpair_id, double penpair_penalty_offset,int penpair_penalty_lock,int penpair_numdofs,int penpair_node_ids[2],int penpair_dof, - int penpair_element_ids[2],double penpair_friction,int penpair_fill,double penpair_normal[2],double penpair_length){ +Penpair::Penpair(int penpair_id, double penpair_penalty_offset,int penpair_penalty_lock,int penpair_node_ids[2],int penpair_dof){ int i; @@ -29,5 +28,4 @@ penalty_offset =penpair_penalty_offset; penalty_lock =penpair_penalty_lock; - numdofs =penpair_numdofs; for(i=0;i<2;i++){ @@ -36,16 +34,7 @@ nodes[i]=NULL; - element_ids[i]=penpair_element_ids[i]; - element_offsets[i]=UNDEF; - elements[i]=NULL; } dof=penpair_dof; - friction =penpair_friction; - fill =penpair_fill; - normal[0]=penpair_normal[0]; - normal[1]=penpair_normal[1]; - length=penpair_length; - return; } @@ -63,18 +52,10 @@ printf(" penalty_offset: %g\n",penalty_offset); printf(" penalty_lock: %i\n",penalty_lock); - printf(" numdofs: %i\n",numdofs); printf(" node_ids: [%i %i]\n",node_ids[0],node_ids[1]); printf(" node_offsets: [%i %i]\n",node_offsets[0],node_offsets[1]); printf(" dof: %i\n",dof); - printf(" element_ids: [%i %i]\n",element_ids[0],element_ids[1]); - printf(" element_offsets: [%i %i]\n",element_offsets[0],element_offsets[1]); - printf(" friction: %g\n",friction); - printf(" fill: %i\n",fill); - printf(" normal: %g %g\n",normal[0],normal[1]); - printf(" length: %g\n",length); for(i=0;i<2;i++){ if(nodes[i])nodes[i]->Echo(); - if(elements[i])elements[i]->Echo(); } return; @@ -88,18 +69,10 @@ printf(" penalty_offset: %g\n",penalty_offset); printf(" penalty_lock: %i\n",penalty_lock); - printf(" numdofs: %i\n",numdofs); printf(" node_ids: [%i %i]\n",node_ids[0],node_ids[1]); printf(" node_offsets: [%i %i]\n",node_offsets[0],node_offsets[1]); printf(" dof: %i\n",dof); - printf(" element_ids: [%i %i]\n",element_ids[0],element_ids[1]); - printf(" element_offsets: [%i %i]\n",element_offsets[0],element_offsets[1]); - printf(" friction: %g\n",friction); - printf(" fill: %i\n",fill); - printf(" normal: %g %g\n",normal[0],normal[1]); - printf(" length: %g\n",length); for(i=0;i<2;i++){ if(nodes[i])nodes[i]->Echo(); - if(elements[i])elements[i]->Echo(); } return; @@ -123,14 +96,7 @@ memcpy(marshalled_dataset,&penalty_offset,sizeof(penalty_offset));marshalled_dataset+=sizeof(penalty_offset); memcpy(marshalled_dataset,&penalty_lock,sizeof(penalty_lock));marshalled_dataset+=sizeof(penalty_lock); - memcpy(marshalled_dataset,&numdofs,sizeof(numdofs));marshalled_dataset+=sizeof(numdofs); memcpy(marshalled_dataset,&dof,sizeof(dof));marshalled_dataset+=sizeof(dof); memcpy(marshalled_dataset,&node_ids,sizeof(node_ids));marshalled_dataset+=sizeof(node_ids); memcpy(marshalled_dataset,&node_offsets,sizeof(node_offsets));marshalled_dataset+=sizeof(node_offsets); - memcpy(marshalled_dataset,&element_ids,sizeof(element_ids));marshalled_dataset+=sizeof(element_ids); - memcpy(marshalled_dataset,&element_offsets,sizeof(element_offsets));marshalled_dataset+=sizeof(element_offsets); - memcpy(marshalled_dataset,&friction,sizeof(friction));marshalled_dataset+=sizeof(friction); - memcpy(marshalled_dataset,&fill,sizeof(fill));marshalled_dataset+=sizeof(fill); - memcpy(marshalled_dataset,&normal,sizeof(normal));marshalled_dataset+=sizeof(normal); - memcpy(marshalled_dataset,&length,sizeof(length));marshalled_dataset+=sizeof(length); *pmarshalled_dataset=marshalled_dataset; @@ -143,14 +109,7 @@ sizeof(penalty_offset)+ sizeof(penalty_lock)+ - sizeof(numdofs)+ sizeof(dof)+ sizeof(node_ids)+ sizeof(node_offsets)+ - sizeof(element_ids)+ - sizeof(element_offsets)+ - sizeof(friction)+ - sizeof(fill)+ - sizeof(normal)+ - sizeof(length)+ sizeof(int); //sizeof(int) for enum type } @@ -175,17 +134,9 @@ memcpy(&penalty_offset,marshalled_dataset,sizeof(penalty_offset));marshalled_dataset+=sizeof(penalty_offset); memcpy(&penalty_lock,marshalled_dataset,sizeof(penalty_lock));marshalled_dataset+=sizeof(penalty_lock); - memcpy(&numdofs,marshalled_dataset,sizeof(numdofs));marshalled_dataset+=sizeof(numdofs); memcpy(&dof,marshalled_dataset,sizeof(dof));marshalled_dataset+=sizeof(dof); memcpy(&node_ids,marshalled_dataset,sizeof(node_ids));marshalled_dataset+=sizeof(node_ids); memcpy(&node_offsets,marshalled_dataset,sizeof(node_offsets));marshalled_dataset+=sizeof(node_offsets); - memcpy(&element_ids,marshalled_dataset,sizeof(element_ids));marshalled_dataset+=sizeof(element_ids); - memcpy(&element_offsets,marshalled_dataset,sizeof(element_offsets));marshalled_dataset+=sizeof(element_offsets); - memcpy(&friction,marshalled_dataset,sizeof(friction));marshalled_dataset+=sizeof(friction); - memcpy(&fill,marshalled_dataset,sizeof(fill));marshalled_dataset+=sizeof(fill); - memcpy(&normal,marshalled_dataset,sizeof(normal));marshalled_dataset+=sizeof(normal); - memcpy(&length,marshalled_dataset,sizeof(length));marshalled_dataset+=sizeof(length); - - for(i=0;i<2;i++){ - elements[i]=NULL; + + for(i=0;i<2;i++){ nodes[i]=NULL; } @@ -206,7 +157,6 @@ return my_rank; } -void Penpair::DistributeNumDofs(int* numdofspernode,int analysis_type,int sub_analysis_type){return;} - -#undef __FUNCT__ + +#undef __FUNCT__ #define __FUNCT__ "Penpair::Configure" @@ -222,10 +172,5 @@ ResolvePointers((Object**)nodes,node_ids,node_offsets,2,nodesin); - if(numdofs==2){ - /* This is a rift so we need to link the load with the elements*/ - ResolvePointers((Object**)&elements,element_ids,element_offsets,2,elementsin); - } -} - +} #undef __FUNCT__ @@ -256,13 +201,7 @@ #define __FUNCT__ "Penpair::PenaltyCreateKMatrix" void Penpair::PenaltyCreateKMatrix(Mat Kgg,void* inputs,double kmax,int analysis_type,int sub_analysis_type){ - if(numdofs==1){ - - /*No loads applied, do nothing: */ - return; - - } - else if (numdofs==2){ - throw ErrorException(__FUNCT__," not implemented yet!"); - } + + /*No loads applied, do nothing: */ + return; } @@ -270,13 +209,6 @@ #define __FUNCT__ "Penpair::PenaltyCreatePVector" void Penpair::PenaltyCreatePVector(Vec pg,void* inputs,double kmax,int analysis_type,int sub_analysis_type){ - if(numdofs==1){ - - /*No loads applied, do nothing: */ - return; - - } - else if (numdofs==2){ - throw ErrorException(__FUNCT__," not implemented yet!"); - } + /*No loads applied, do nothing: */ + return; } @@ -284,7 +216,3 @@ return new Penpair(*this); } - -int Penpair::GetNumDofs(){ - return numdofs; -} - + Index: /issm/trunk/src/c/objects/Penpair.h =================================================================== --- /issm/trunk/src/c/objects/Penpair.h (revision 1896) +++ /issm/trunk/src/c/objects/Penpair.h (revision 1897) @@ -17,5 +17,4 @@ double penalty_offset; //penalty used int penalty_lock; //maximum counter can go until locks the penalty. - int numdofs; //switch from penalty pairing of 1 or 2 dofs. /*nodes: */ @@ -27,18 +26,8 @@ int dof; - /*penalty pairing of two dofs: */ - int element_ids[2];//elements for those two grids - Element* elements[2]; - int element_offsets[2]; - - double friction; //friction coefficient - int fill; - double normal[2]; - double length; - public: Penpair(); - Penpair(int id, double penalty_offset,int penalty_lock,int numdofs,int nodes_ids[2],int dof,int element_ids[2],double friction,int fill,double normal[2],double length); + Penpair(int id, double penalty_offset,int penalty_lock,int nodes_ids[2],int dof); ~Penpair(); @@ -52,5 +41,4 @@ int GetId(); int MyRank(); - void DistributeNumDofs(int* numdofspernode,int analysis_type,int sub_analysis_type); void Configure(void* elements,void* nodes,void* materials); void CreateKMatrix(Mat Kgg,void* inputs,int analysis_type,int sub_analysis_type); @@ -59,5 +47,4 @@ void PenaltyCreateKMatrix(Mat Kgg,void* inputs,double kmax,int analysis_type,int sub_analysis_type); void PenaltyCreatePVector(Vec pg,void* inputs,double kmax,int analysis_type,int sub_analysis_type); - int GetNumDofs(); Object* copy(); };