Changeset 3591

Timestamp:

04/21/10 11:17:27 (15 years ago)

Author:

seroussi

Message:

no matice, matpar or node configuration in beam and sing elements

Location:

issm/trunk/src/c/objects

Files:

• Beam.cpp (modified) (2 diffs)
• Beam.h (modified) (1 diff)
• Sing.cpp (modified) (1 diff)
• Sing.h (modified) (1 diff)

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

@@ -738 +738 @@
 }
 /*}}}*/
-/*FUNCTION Beam::MaticeConfiguration{{{1*/
-void  Beam::MaticeConfiguration(Matice* beam_matice,int beam_matice_offset){
-
-        /*dynamic objects pointed to by hooks: */
-        Matice* matice=NULL;
-
-        /*recover objects from hooks: */
-        matice=(Matice*)hmatice.delivers();
-        
-        ISSMERROR("not supported yet!");
-
-        /*matice=beam_matice;
-        matice_offset=beam_matice_offset;*/
-}
-/*}}}*/
-/*FUNCTION Beam::MatparConfiguration{{{1*/
-void  Beam::MatparConfiguration(Matpar* beam_matpar,int beam_matpar_offset){
-
-        /*dynamic objects pointed to by hooks: */
-        Matpar* matpar=NULL;
-
-        /*recover objects from hooks: */
-        matpar=(Matpar*)hmatpar.delivers();
-
-        ISSMERROR("not supported yet!");
-
-        /*matpar=beam_matpar;
-        matpar_offset=beam_matpar_offset;*/
-
-}
-/*}}}*/
 /*FUNCTION Beam::Misfit{{{1*/
 double Beam::Misfit(void*,int,int){
@@ -780 +749 @@
 }
 /*}}}*/
-/*FUNCTION Beam::NodeConfiguration{{{1*/
-void  Beam::NodeConfiguration(int* beam_node_ids,Node* beam_nodes[2],int* beam_node_offsets){
-
-        /*dynamic objects pointed to by hooks: */
-        Node**  nodes=NULL;
-
-        /*recover objects from hooks: */
-        nodes=(Node**)hnodes.deliverp();
-
-        ISSMERROR("not supported yet!");
-
-        /*int i;
-        for(i=0;i<2;i++){
-                node_ids[i]=beam_node_ids[i];
-                nodes[i]=beam_nodes[i];
-                node_offsets[i]=beam_node_offsets[i];
-        }*/
-
-}
-/*}}}*/
 /*FUNCTION Beam::SurfaceArea{{{1*/
 double Beam::SurfaceArea(void*,int,int){

issm/trunk/src/c/objects/Beam.h

@@ -71 +71 @@
                 void* GetMatPar();
 
-                void  NodeConfiguration(int* beam_node_ids,Node* beam_nodes[2],int* beam_node_offsets);
-                void  MaticeConfiguration(Matice* matice,int matice_offset);
-                void  MatparConfiguration(Matpar* matpar,int matpar_offset);
                 void  ComputeBasalStress(Vec sigma_b,void* inputs,int analysis_type,int sub_analysis_type);
                 void  ComputePressure(Vec p_g,void* inputs,int analysis_type,int sub_analysis_type);

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

@@ -590 +590 @@
 }
 /*}}}*/
-/*FUNCTION Sing::MaticeConfiguration {{{1*/
-void  Sing::MaticeConfiguration(Matice* sing_matice,int sing_matice_offset){
-
-        /*dynamic objects pointed to by hooks: */
-        Matice* matice=NULL;
-
-        /*recover objects from hooks: */
-        matice=(Matice*)hmatice.delivers();
-        
-        ISSMERROR("not supported yet!");
-
-        /*matice=sing_matice;
-        matice_offset=sing_matice_offset;*/
-}
-/*}}}*/
-/*FUNCTION Sing::MatparConfiguration {{{1*/
-void  Sing::MatparConfiguration(Matpar* sing_matpar,int sing_matpar_offset){
-
-        /*dynamic objects pointed to by hooks: */
-        Matpar* matpar=NULL;
-
-        /*recover objects from hooks: */
-        matpar=(Matpar*)hmatpar.delivers();
-
-        ISSMERROR("not supported yet!");
-
-        /*matpar=sing_matpar;
-        matpar_offset=sing_matpar_offset;*/
-
-}
-/*}}}*/
 /*FUNCTION Sing::Misfit {{{1*/
 double Sing::Misfit(void*, int,int){

issm/trunk/src/c/objects/Sing.h

@@ -65 +65 @@
                 void  CreatePVectorDiagnosticHutter(Vec pg,void* inputs,int analysis_type,int sub_analysis_type);
                 void* GetMatPar();
-                void  NodeConfiguration(int sing_node_id,Node* sing_node,int sing_node_offset);
-                void  MaticeConfiguration(Matice* matice,int matice_offset);
-                void  MatparConfiguration(Matpar* matpar,int matpar_offset);
                 void  ComputeBasalStress(Vec sigma_b,void* inputs,int analysis_type,int sub_analysis_type);
                 void  ComputePressure(Vec p_g,void* inputs,int analysis_type,int sub_analysis_type);