Changeset 14971

Timestamp:

05/08/13 21:00:42 (12 years ago)

Author:

adhikari

Message:

CHG: dWdt now assembles solution properly in parallel runs as well

Location:

issm/trunk-jpl/src/c

Files:

• classes/objects/Elements/Tria.cpp (modified) (6 diffs)
• classes/objects/Elements/Tria.h (modified) (1 diff)
• modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp (modified) (1 diff)
• solutions/AnalysisConfiguration.cpp (modified) (1 diff)
• solutions/gia_core.cpp (modified) (3 diffs)

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

@@ -1881 +1881 @@
 void  Tria::InputUpdateFromVector(IssmDouble* vector, int name, int type){
 
-        
         const int   numdof         = NDOF1 *NUMVERTICES;
         int        *doflist        = NULL;
@@ -1890 +1889 @@
 
         switch(type){
+        #ifdef _HAVE_GIA_
+        case GiaAnalysisEnum:
+                InputUpdateFromVectorGia(vector);
+                break;
+        #endif
         case VertexEnum: 
                 /*Get values on the 3 vertices*/
@@ -1902 +1906 @@
                         this->inputs->AddInput(new TriaP1Input(name,values));
                 }
-                return;
+                return; 
 
         case NodesEnum:
@@ -1915 +1919 @@
                 /*Add input to the element: */
                 this->inputs->AddInput(new TriaP1Input(name,values));
+                
                 /*Free ressources:*/
                 xDelete<int>(doflist);
@@ -1920 +1925 @@
 
         default:
-        
-                        _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
-        }
+                _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
+        }
+
 }
 /*}}}*/
@@ -3235 +3240 @@
         /*Add input to the element: */
         this->inputs->AddInput(new TriaP1Input(GiaWEnum,values));
+
+}
+/*}}}*/
+/*FUNCTION Tria::InputUpdateFromVectorGia{{{*/
+void  Tria::InputUpdateFromVectorGia(IssmDouble* vector){
+
+        int vertexsidlist[NUMVERTICES];
+        IssmDouble    values[NUMVERTICES];
+
+        /*Get sid list: */
+        this->GetVertexSidList(&vertexsidlist[0]);
+
+        /*Use the dof list to index into the solution vector: */
+        for(int i=0;i<NUMVERTICES;i++){
+                values[i]=vector[vertexsidlist[i]];
+                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
+        }
+
+        /*Add input to the element: */
+        this->inputs->AddInput(new TriaP1Input(GiadWdtEnum,values));
 
 }

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

@@ -142 +142 @@
                 #ifdef _HAVE_GIA_
                 void   GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y);
-                void   InputUpdateFromSolutionGia(IssmDouble* solution);
+                void   InputUpdateFromSolutionGia(IssmDouble* solution); 
+                void   InputUpdateFromVectorGia(IssmDouble* vector); 
                 #endif
 

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

@@ -176 +176 @@
         }
         else if (irate==1){
+                *pwi=0;
                 dwidt = blocks_.aswokm;
                 *pdwidt=dwidt;
-                *pwi=0;
         }
 
-        //printf("deflection: %g deflection rate %g\n",wi, dwidt);
-
 }

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

@@ -120 +120 @@
                         analyses[7]=EnthalpyAnalysisEnum;
                         analyses[8]=PrognosticAnalysisEnum;
-                        //analyses[9]=GiaAnalysisEnum;
                         break;
 

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

@@ -10 +10 @@
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"
-
 void gia_core(FemModel* femmodel){
 
         int i;
         Vector<IssmDouble>*  wg  = NULL;
-        Vector<IssmDouble>*  dwgdt  = NULL;
+        Vector<IssmDouble>*  dwdtg  = NULL;
         IssmDouble*          x   = NULL;
         IssmDouble*          y   = NULL;
@@ -36 +35 @@
         gsize      = femmodel->nodes->NumberOfDofs(configuration_type,GsetEnum);
         wg = new Vector<IssmDouble>(gsize);
-        dwgdt = new Vector<IssmDouble>(gsize);
+        dwdtg = new Vector<IssmDouble>(gsize);
 
         /*first, recover x and y vectors from vertices: */
@@ -42 +41 @@
 
         /*call the main module: */
-        femmodel->Deflection(wg,dwgdt,x,y);
+        femmodel->Deflection(wg,dwdtg,x,y);
 
         /*assemble vector: */
         wg->Assemble();
-        dwgdt->Assemble();
+        dwdtg->Assemble();
 
         InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,wg); 
-        InputUpdateFromVectorx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,dwgdt,GiadWdtEnum,VertexEnum); 
+        InputUpdateFromVectorx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,dwdtg,GiadWdtEnum,GiaAnalysisEnum);
 
         if(save_results){