Changeset 22200

Timestamp:

10/30/17 09:47:18 (7 years ago)

Author:

erobo

Message:

NEW: added inflow constraint as a possible variable for dakota, only working for MC for now

Location:

issm/trunk-jpl/src/c

Files:

• classes/Constraints/Constraint.h (modified) (1 diff)
• classes/Constraints/SpcDynamic.h (modified) (1 diff)
• classes/Constraints/SpcStatic.cpp (modified) (2 diffs)
• classes/Constraints/SpcStatic.h (modified) (1 diff)
• classes/Constraints/SpcTransient.h (modified) (1 diff)
• classes/Elements/Element.cpp (modified) (1 diff)
• modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/classes/Constraints/Constraint.h

@@ -24 +24 @@
                 virtual bool InAnalysis(int analysis_type)=0;
                 virtual void PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters)=0;
+                virtual void InputUpdateFromVectorDakota(IssmDouble* vector,Nodes* nodes,int name,int type) = 0;
 
 };

issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h

@@ -42 +42 @@
                 bool InAnalysis(int analysis_type);
                 void PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters){_error_("not implemented yet");};
+                void InputUpdateFromVectorDakota(IssmDouble* vector,Nodes* nodes,int name,int type){_error_("not implemented yet");};
 
                 /*SpcDynamic management*/

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

@@ -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){/*{{{*/
+
+        /*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)); 
+        }
 }
 /*}}}*/

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

@@ -38 +38 @@
                 /*Constraint virtual functions definitions: {{{*/
                 void ActivatePenaltyMethod(void);
-                void   ConstrainNode(Nodes* nodes,Parameters* parameters);
-                bool   InAnalysis(int analysis_type);
-                void   PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters){_error_("not implemented yet");};
+                void ConstrainNode(Nodes* nodes,Parameters* parameters);
+                bool InAnalysis(int analysis_type);
+                void PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters){_error_("not implemented yet");};
+                void InputUpdateFromVectorDakota(IssmDouble* vector,Nodes* nodes,int name,int type);
                 /*}}}*/
                 /*SpcStatic management:{{{ */

issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h

@@ -43 +43 @@
                 bool   InAnalysis(int analysis_type);
                 void   PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters);
+                void InputUpdateFromVectorDakota(IssmDouble* vector,Nodes* nodes,int name,int type){_error_("not implemented yet");};
                 /*}}}*/
                 /*SpcTransient management:{{{ */

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -1792 +1792 @@
                                 name==DeviatoricStresseffectiveEnum ||
                                 name==VxAverageEnum ||
-                                name==VyAverageEnum
+                                name==VyAverageEnum ||
+                                name==BalancethicknessSpcthicknessEnum
 
                                 ) {

issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp

@@ -18 +18 @@
 void InputUpdateFromVectorDakotax(FemModel* femmodel,IssmDouble* vector, int name, int type){
 
-        int i;
-
         /*Update elements, nodes, loads and materials from inputs: */
-        for(i=0;i<femmodel->elements->Size();i++){
+        for(int i=0;i<femmodel->elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 element->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<femmodel->loads->Size();i++){
+        for(int i=0;i<femmodel->loads->Size();i++){
                 Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
                 load->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<femmodel->materials->Size();i++){
+        for(int i=0;i<femmodel->materials->Size();i++){
                 Material* material=(Material*)femmodel->materials->GetObjectByOffset(i);
                 material->InputUpdateFromVectorDakota(vector,name,type);
         }
+        for(int i=0;i<femmodel->constraints->Size();i++){
+                Constraint* constraint=(Constraint*)femmodel->constraints->GetObjectByOffset(i);
+                constraint->InputUpdateFromVectorDakota(vector,femmodel->nodes,name,type);
+        }
 }

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -378 +378 @@
         TransientNumRequestedOutputsEnum,
         TransientRequestedOutputsEnum,
+        BalancethicknessSpcthicknessEnum,
         BalancethicknessApparentMassbalanceEnum,
         BalancethicknessDiffusionCoefficientEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -384 +384 @@
                 case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs";
                 case TransientRequestedOutputsEnum : return "TransientRequestedOutputs";
+                case BalancethicknessSpcthicknessEnum : return "BalancethicknessSpcthickness";
                 case BalancethicknessApparentMassbalanceEnum : return "BalancethicknessApparentMassbalance";
                 case BalancethicknessDiffusionCoefficientEnum : return "BalancethicknessDiffusionCoefficient";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -393 +393 @@
               else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
               else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
+              else if (strcmp(name,"BalancethicknessSpcthickness")==0) return BalancethicknessSpcthicknessEnum;
               else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum;
               else if (strcmp(name,"BalancethicknessDiffusionCoefficient")==0) return BalancethicknessDiffusionCoefficientEnum;
@@ -505 +506 @@
               else if (strcmp(name,"SmbBMax")==0) return SmbBMaxEnum;
               else if (strcmp(name,"SmbBMin")==0) return SmbBMinEnum;
-              else if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"Adjointx")==0) return AdjointxEnum;
+              if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
+              else if (strcmp(name,"Adjointx")==0) return AdjointxEnum;
               else if (strcmp(name,"Adjointy")==0) return AdjointyEnum;
               else if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
@@ -628 +629 @@
               else if (strcmp(name,"Outputdefinition9")==0) return Outputdefinition9Enum;
               else if (strcmp(name,"Outputdefinition10")==0) return Outputdefinition10Enum;
-              else if (strcmp(name,"Outputdefinition11")==0) return Outputdefinition11Enum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Outputdefinition12")==0) return Outputdefinition12Enum;
+              if (strcmp(name,"Outputdefinition11")==0) return Outputdefinition11Enum;
+              else if (strcmp(name,"Outputdefinition12")==0) return Outputdefinition12Enum;
               else if (strcmp(name,"Outputdefinition13")==0) return Outputdefinition13Enum;
               else if (strcmp(name,"Outputdefinition14")==0) return Outputdefinition14Enum;
@@ -751 +752 @@
               else if (strcmp(name,"Gradient3")==0) return Gradient3Enum;
               else if (strcmp(name,"Gradient")==0) return GradientEnum;
-              else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"Gset")==0) return GsetEnum;
+              if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum;
+              else if (strcmp(name,"Gset")==0) return GsetEnum;
               else if (strcmp(name,"Index")==0) return IndexEnum;
               else if (strcmp(name,"Indexed")==0) return IndexedEnum;
@@ -874 +875 @@
               else if (strcmp(name,"AmrGroundingLineDistance")==0) return AmrGroundingLineDistanceEnum;
               else if (strcmp(name,"AmrIceFrontResolution")==0) return AmrIceFrontResolutionEnum;
-              else if (strcmp(name,"AmrIceFrontDistance")==0) return AmrIceFrontDistanceEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"AmrThicknessErrorResolution")==0) return AmrThicknessErrorResolutionEnum;
+              if (strcmp(name,"AmrIceFrontDistance")==0) return AmrIceFrontDistanceEnum;
+              else if (strcmp(name,"AmrThicknessErrorResolution")==0) return AmrThicknessErrorResolutionEnum;
               else if (strcmp(name,"AmrThicknessErrorThreshold")==0) return AmrThicknessErrorThresholdEnum;
               else if (strcmp(name,"AmrDeviatoricErrorResolution")==0) return AmrDeviatoricErrorResolutionEnum;
@@ -997 +998 @@
               else if (strcmp(name,"GiaSolution")==0) return GiaSolutionEnum;
               else if (strcmp(name,"GiaIvinsAnalysis")==0) return GiaIvinsAnalysisEnum;
-              else if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
+              if (strcmp(name,"EsaSolution")==0) return EsaSolutionEnum;
+              else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
               else if (strcmp(name,"LoveSolution")==0) return LoveSolutionEnum;
               else if (strcmp(name,"LoveAnalysis")==0) return LoveAnalysisEnum;