Changeset 14589

Timestamp:

04/15/13 15:56:42 (12 years ago)

Author:

Eric.Larour

Message:

CHG: implemented an empty kernel for the gia solution

Location:

issm/trunk-jpl

Files:

• src/c/classes/FemModel.cpp (modified) (1 diff)
• src/c/classes/FemModel.h (modified) (1 diff)
• src/c/classes/objects/Elements/Element.h (modified) (1 diff)
• src/c/classes/objects/Elements/Penta.cpp (modified) (1 diff)
• src/c/classes/objects/Elements/Penta.h (modified) (1 diff)
• src/c/classes/objects/Elements/Tria.cpp (modified) (1 diff)
• src/c/classes/objects/Elements/Tria.h (modified) (1 diff)
• src/c/solutions/gia_core.cpp (modified) (1 diff)
• test/NightlyRun/test330.m (modified) (1 diff)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1543 +1543 @@
 /*}}}*/
 #endif
+#ifdef _HAVE_GIA_
+void FemModel::Deflection(Vector<IssmDouble>* wg){ /*{{{*/
+
+        int      i;
+
+        /*intermediary: */
+        Element *element     = NULL;
+
+        /*Go through elements, and add contribution from each element to the deflection vector wg:*/
+        for (i=0;i<elements->Size();i++){
+                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+                element->Deflection(wg);
+        }
+}
+/*}}}*/
+#endif

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -93 +93 @@
                 void ThicknessAbsGradientx( IssmDouble* pJ, bool process_units,int weight_index);
                 #endif
+                #ifdef _HAVE_GIA_
+                void Deflection(Vector<IssmDouble>* wg);
+                #endif
                 void SystemMatricesx(Matrix<IssmDouble>** pKff, Matrix<IssmDouble>** pKfs, Vector<IssmDouble>** ppf, Vector<IssmDouble>** pdf, IssmDouble* pkmax);
                 void TimeAdaptx(IssmDouble* pdt);

issm/trunk-jpl/src/c/classes/objects/Elements/Element.h

@@ -100 +100 @@
                 #endif
 
+                #ifdef _HAVE_GIA_
+                virtual void   Deflection(Vector<IssmDouble>* wg)=0;
+                #endif
+
                 #ifdef _HAVE_CONTROL_
                 virtual void   Gradj(Vector<IssmDouble>* gradient,int control_type,int control_index)=0;

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp

@@ -3359 +3359 @@
 #endif
 
+#ifdef _HAVE_GIA_
+/*FUNCTION Penta::Deflection {{{*/
+void Penta::Deflection(Vector<IssmDouble>* wg){
+
+        return;
+}
+/*}}}*/
+#endif
+
 #ifdef _HAVE_THERMAL_
 /*FUNCTION Penta::CreateKMatrixEnthalpy {{{*/

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.h

@@ -140 +140 @@
                 void   MaxVy(IssmDouble* pmaxvy, bool process_units);
                 void   MaxVz(IssmDouble* pmaxvz, bool process_units);
+                #endif
+
+                #ifdef _HAVE_GIA_
+                void   Deflection(Vector<IssmDouble>* wg);
                 #endif
 

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -3035 +3035 @@
         /*Return: */
         return Total_Smb;
+}
+/*}}}*/
+#endif
+
+#ifdef _HAVE_GIA_
+/*FUNCTION Tria::Deflection {{{*/
+void Tria::Deflection(Vector<IssmDouble>* wg){
+
+        return;
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h

@@ -140 +140 @@
                 #endif
 
+                #ifdef _HAVE_GIA_
+                void   Deflection(Vector<IssmDouble>* wg);
+                #endif
+
                 #ifdef _HAVE_CONTROL_
                 IssmDouble DragCoefficientAbsGradient(bool process_units,int weight_index);

issm/trunk-jpl/src/c/solutions/gia_core.cpp

@@ -34 +34 @@
 
         /*call the main module: */
-        //Deflection();
+        femmodel->Deflection(wg);
         
         InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,wg); 

issm/trunk-jpl/test/NightlyRun/test330.m

@@ -5 +5 @@
 md=setflowequation(md,'macayeal','all');
 md.verbose=verbose('solution',true,'convergence',true,'mprocessor',true,'module',true);
-md.cluster=generic('name',oshostname(),'np',1);
+md.cluster=generic('name',oshostname(),'np',3);
 md=solve(md,GiaSolutionEnum());