Changeset 3622 for issm/trunk/src/c/objects/Sing.cpp

Timestamp:

04/27/10 08:27:06 (15 years ago)

Author:

Mathieu Morlighem

Message:

now iomodel constructor also specifies the id

File:

• issm/trunk/src/c/objects/Sing.cpp (modified) (6 diffs)

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

@@ -22 +22 @@
 
 /*Object constructors and destructor*/
-/*FUNCTION Sing::constructor {{{1*/
+/*FUNCTION Sing::Sing(){{{1*/
 Sing::Sing(){
         this->inputs=NULL;
@@ -29 +29 @@
 }
 /*}}}*/
-/*FUNCTION Sing constructor {{{1*/
+/*FUNCTION Sing::Sing(int sing_id,int* sing_node_ids, int sing_matice_id, int sing_matpar_id, int sing_numpar_id) {{{1*/
 Sing::Sing(int sing_id,int* sing_node_ids, int sing_matice_id, int sing_matpar_id):
         hnodes(sing_node_ids,1),
@@ -44 +44 @@
 }
 /*}}}*/
-/*FUNCTION Sing other constructor {{{1*/
+/*FUNCTION Sing::Sing(int sing_id,Hook* sing_hnodes, Hook* sing_hmatice, Hook* sing_hmatpar, Hook* sing_hnumpar, Inputs* sing_inputs) {{{1*/
 Sing::Sing(int sing_id,Hook* sing_hnodes, Hook* sing_hmatice, Hook* sing_hmatpar, Parameters* sing_parameters,Inputs* sing_inputs):
         hnodes(sing_hnodes),
@@ -63 +63 @@
 }
 /*}}}*/
-/*FUNCTION Sing iomodel constructor {{{1*/
-Sing::Sing(int i, IoModel* iomodel){
+/*FUNCTION Sing::Sing(int sing_id, int i, IoModel* iomodel) {{{1*/
+Sing::Sing(int sing_id, int i, IoModel* iomodel){
 
         int sing_matice_id;
@@ -73 +73 @@
         double sing_k;
 
-
         /*id: */
-        this->id=i+1;
+        this->id=sing_id;
 
         /*hooks: */
-        sing_matice_id=i+1; //refers to the corresponding material property card
+        sing_matice_id=i+1;                        //refers to the corresponding material property card
         sing_matpar_id=iomodel->numberofvertices+1;//refers to the corresponding matpar property card
         sing_g=i+1;
@@ -97 +96 @@
 }
 /*}}}*/
-/*FUNCTION Sing::destructor {{{1*/
+/*FUNCTION Sing::~Sing(){{{1*/
 Sing::~Sing(){
         delete inputs;