Changeset 22758 for issm/trunk/src/c/classes/Constraints/SpcStatic.cpp

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Constraints/SpcStatic.cpp (modified) (8 diffs)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

issm/trunk/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);
@@ -100 +100 @@
 void SpcStatic::ConstrainNode(Nodes* nodes,Parameters* parameters){/*{{{*/
 
-        Node* node=NULL;
-
         /*Chase through nodes and find the node to which this SpcStatic applys: */
-        node=(Node*)nodes->GetObjectById(NULL,nodeid);
+        Node* node=(Node*)nodes->GetObjectById(NULL,nodeid);
 
         /*Apply constraint: */
@@ -114 +112 @@
         if (in_analysis_type==this->analysis_type) return true;
         else return false;
+}
+/*}}}*/
+void SpcStatic::InputUpdateFromVectorDakota(IssmDouble* vector,Nodes* nodes,int name,int type){/*{{{*/
+
+        /*Only update if this is a constraint parameter*/
+        if(name != BalancethicknessSpcthicknessEnum) return;
+
+        /*Chase through nodes and find the node to which this SpcStatic applys: */
+        Node* node=(Node*)nodes->GetObjectById(NULL,nodeid);
+
+        /*Apply constraint: */
+        if(node){ //in case the spc is dealing with a node on another cpu
+                int sid = node->Sid();
+                this->value = vector[sid];
+                _assert_(!xIsNan<IssmDouble>(this->value)); 
+        }
 }
 /*}}}*/

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod