Changeset 21701

Timestamp:

05/03/17 17:49:42 (8 years ago)

Author:

felicity

Message:

NEW: ESTAR for inversion capabilities

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.cpp (modified) (6 diffs)
• datastructures/DataSet.cpp (modified) (1 diff)

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

@@ -652 +652 @@
 
         /*Intermediaries*/
+        int materialstype;
         IssmDouble dmudB;
         IssmDouble epsilon3d[6];/* epsilon=[exx,eyy,exy,exy,exz,eyz];    */
@@ -669 +670 @@
         }
         /*Get viscosity*/
-        material->GetViscosity_B(&dmudB,eps_eff);
+        materialstype=this->material->ObjectEnum();
+        switch(materialstype){
+                case MaticeEnum:
+                        material->GetViscosity_B(&dmudB,eps_eff);
+                        break;
+                case MatestarEnum:
+                        material->ViscosityBFS(&dmudB,dim,xyz_list,gauss,vx_input,vy_input,vz_input);
+                        break;
+                default: _error_("not supported");
+        }
 
         /*Assign output pointer*/
@@ -679 +689 @@
 
         /*Intermediaries*/
+        int materialstype;
         IssmDouble dmudB;
         IssmDouble epsilon3d[5];/* epsilon=[exx,eyy,exy,exy,exz,eyz];    */
@@ -696 +707 @@
         }
         /*Get viscosity*/
-        material->GetViscosity_B(&dmudB,eps_eff);
+        materialstype=this->material->ObjectEnum();
+        switch(materialstype){
+                case MaticeEnum:
+                        material->GetViscosity_B(&dmudB,eps_eff);
+                        break;
+                case MatestarEnum:
+                        material->ViscosityBHO(&dmudB,dim,xyz_list,gauss,vx_input,vy_input);
+                        break;
+                default: _error_("not supported");
+        }
 
         /*Assign output pointer*/
@@ -706 +726 @@
 
         /*Intermediaries*/
+        int materialstype;
         IssmDouble dmudB;
         IssmDouble epsilon2d[3];/* epsilon=[exx,eyy,exy];    */
@@ -723 +744 @@
 
         /*Get viscosity*/
-        material->GetViscosity_B(&dmudB,eps_eff);
+        materialstype=this->material->ObjectEnum();
+        switch(materialstype){
+                case MaticeEnum:
+                        material->GetViscosity_B(&dmudB,eps_eff);
+                        break;
+                case MatestarEnum:
+                        material->ViscosityBSSA(&dmudB,dim,xyz_list,gauss,vx_input,vy_input);
+                        break;
+                default: _error_("not supported");
+        }
 
         /*Assign output pointer*/

issm/trunk-jpl/src/c/datastructures/DataSet.cpp

@@ -167 +167 @@
                                 this->AddObject(matice);
                         }
+                        else if(obj_enum==MatestarEnum){
+                                Matestar* matestar=NULL;
+                                matestar=new Matestar();
+                                matestar->Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+                                this->AddObject(matestar);
+                        }
                         else if(obj_enum==MatparEnum){
                                 Matpar* matpar=NULL;