Changeset 3751 for issm/trunk/src/c/parallel/diagnostic_core.cpp

Timestamp:

05/15/10 19:36:18 (15 years ago)

Author:

Eric.Larour

Message:

Final build that compiles in serial and parallel model

File:

• issm/trunk/src/c/parallel/diagnostic_core.cpp (modified) (5 diffs)

issm/trunk/src/c/parallel/diagnostic_core.cpp

@@ -31 +31 @@
         Vec ug_stokes=NULL;
         Vec pg=NULL;
-        Vec slopex=NULL;
-        Vec slopey=NULL;
         Vec riftproperties=NULL;
         double* u_g_initial=NULL;
@@ -52 +50 @@
         int numrifts=0;
 
+        /*slopes: */
+        Vec surfaceslopex=NULL;
+        Vec surfaceslopey=NULL;
+        Vec bedslopex=NULL;
+        Vec bedslopey=NULL;
+
         double stokesreconditioning;
 
@@ -87 +91 @@
         //for qmu analysis, be sure the velocity input we are starting from  is the one in the parameters: */
         if(qmu_analysis){
-                model->FindParam(&vx,&dummy,VxEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
-                model->FindParam(&vy,&dummy,VyEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
-                model->FindParam(&vz,&dummy,VzEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vz,VzEnum,VertexEnum);
+                model->FindParamByAnalysisAndSub(&vx,&dummy,VxEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
+                model->FindParamByAnalysisAndSub(&vy,&dummy,VyEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vy,VyEnum,VertexEnum);
+                model->FindParamByAnalysisAndSub(&vz,&dummy,VzEnum,DiagnosticAnalysisEnum,HorizAnalysisEnum); model->UpdateInputsFromVector(vz,VzEnum,VertexEnum);
         }
 
         /*Compute slopes: */
-        slope_core(&surfaceslopex,&surfaceslopey,model,SurfaceAnalysisEnum);
-        slope_core(&bedslopex,&bedslopey,model,BedAnalysisEnum);
+        slope_core(&surfaceslopex,&surfaceslopey,fem_sl,SurfaceAnalysisEnum);
+        slope_core(&bedslopex,&bedslopey,fem_sl,BedAnalysisEnum);
                 
         /*Update: */
@@ -102 +106 @@
         model->UpdateInputsFromVector(bedslopey,BedSlopeyEnum,VertexEnum);
 
+        
         if(ishutter){
                         
@@ -189 +194 @@
         xfree((void**)&dofset);
         xfree((void**)&u_g_initial);
+        
+        VecFree(&surfaceslopex);
+        VecFree(&surfaceslopey);
+        VecFree(&bedslopex);
+        VecFree(&bedslopey);
+
 
 }