Changeset 22361 for issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp

Timestamp:

01/18/18 09:21:32 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: sid is actually id

File:

• issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp

@@ -18 +18 @@
 }
 /*}}}*/
-SpcStatic::SpcStatic(int spc_sid,int spc_nodeid, int spc_dof,IssmDouble spc_value,int spc_analysis_type){/*{{{*/
+SpcStatic::SpcStatic(int spc_id,int spc_nodeid, int spc_dof,IssmDouble spc_value,int spc_analysis_type){/*{{{*/
 
-        sid           = spc_sid;
+        id           = spc_id;
         nodeid        = spc_nodeid;
         dof           = spc_dof;
@@ -40 +40 @@
         SpcStatic* spcstat = new SpcStatic(*this); 
 
-        spcstat->sid=this->sid;
+        spcstat->id=this->id;
         spcstat->nodeid=this->nodeid;
         spcstat->dof=this->dof;
@@ -52 +52 @@
 
         _printf_("SpcStatic:\n");
-        _printf_("   sid: " << sid << "\n");
+        _printf_("   id: " << id << "\n");
         _printf_("   nodeid: " << nodeid << "\n");
         _printf_("   dof: " << dof << "\n");
@@ -63 +63 @@
 
         _printf_("SpcStatic:\n");
-        _printf_("   sid: " << sid << "\n");
+        _printf_("   id: " << id << "\n");
         _printf_("   nodeid: " << nodeid << "\n");
         _printf_("   dof: " << dof << "\n");
@@ -71 +71 @@
 }
 /*}}}*/
-int     SpcStatic::Id(void){ return sid; }/*{{{*/
+int     SpcStatic::Id(void){ return id; }/*{{{*/
 /*}}}*/
 void    SpcStatic::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
@@ -77 +77 @@
         MARSHALLING_ENUM(SpcStaticEnum);
 
-        MARSHALLING(sid);
+        MARSHALLING(id);
         MARSHALLING(nodeid);
         MARSHALLING(dof);