Changeset 3732 for issm/trunk/src/c/parallel/ControlInitialization.cpp

Timestamp:

05/12/10 08:19:37 (15 years ago)

Author:

Eric.Larour

Message:

Bulk of solutions

File:

• issm/trunk/src/c/parallel/ControlInitialization.cpp (modified) (6 diffs)

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

@@ -10 +10 @@
 #include "../modules.h"
 
-void ControlInitialization(Model* model, ParameterInputs* inputs){
+void ControlInitialization(Model* model){
 
         extern int my_rank;
@@ -81 +81 @@
         //compute slopes
         if(verbose)_printf_("%s\n","computing bed slope (x and y derivatives)...");
-        diagnostic_core_linear(&slopex,fem_sl,inputs,SlopecomputeAnalysisEnum,BedXAnalysisEnum);
-        diagnostic_core_linear(&slopey,fem_sl,inputs,SlopecomputeAnalysisEnum,BedYAnalysisEnum);
+        diagnostic_core_linear(&slopex,fem_sl,SlopecomputeAnalysisEnum,BedXAnalysisEnum);
+        diagnostic_core_linear(&slopey,fem_sl,SlopecomputeAnalysisEnum,BedYAnalysisEnum);
         FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopex",0);
         FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->vertices,fem_sl->loads,fem_sl->materials,fem_sl->parameters,"slopey",0);
@@ -95 +95 @@
         //horizontal velocity
         if(verbose)_printf_("%s\n"," computing horizontal velocities...");
-        diagnostic_core_nonlinear(&ug,NULL,NULL,NULL,fem_dh,inputs,DiagnosticAnalysisEnum,HorizAnalysisEnum);
+        diagnostic_core_nonlinear(&ug,NULL,NULL,NULL,fem_dh,DiagnosticAnalysisEnum,HorizAnalysisEnum);
         if(verbose)_printf_("%s\n"," extruding horizontal velocities...");
         VecDuplicatePatch(&ug_horiz,ug); FieldExtrudex( ug_horiz,fem_dh->elements,fem_dh->nodes, fem_dh->vertices,fem_dh->loads,fem_dh-> materials,fem_dh->parameters,"velocity",1);
@@ -102 +102 @@
         if(verbose)_printf_("%s\n"," computing vertical velocities...");
         inputs->Add("velocity",ug_horiz,numberofdofspernode_dh,numberofnodes);
-        diagnostic_core_linear(&ug_vert,fem_dv,inputs,DiagnosticAnalysisEnum,VertAnalysisEnum);
+        diagnostic_core_linear(&ug_vert,fem_dv,DiagnosticAnalysisEnum,VertAnalysisEnum);
 
         //Create 3d u_g
@@ -113 +113 @@
         //Create 4d u_g
         if(verbose)_printf_("%s\n"," computing pressure according to Pattyn...");
-        ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh->vertices,fem_dh->loads,  fem_dh->materials, fem_dh->parameters,inputs,DiagnosticAnalysisEnum,HorizAnalysisEnum);
+        ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh->vertices,fem_dh->loads,  fem_dh->materials, fem_dh->parameters,DiagnosticAnalysisEnum,HorizAnalysisEnum);
         VecScale(pg,1.0/stokesreconditioning);
         ug_stokes=NewVec(fem_ds->nodesets->GetGSize());
@@ -133 +133 @@
         if(verbose)_printf_("%s\n"," computing stokes velocities and pressure ...");
         VecFree(&ug);
-        diagnostic_core_nonlinear(&ug,NULL,NULL,NULL,fem_ds,inputs,DiagnosticAnalysisEnum,StokesAnalysisEnum);
+        diagnostic_core_nonlinear(&ug,NULL,NULL,NULL,fem_ds,DiagnosticAnalysisEnum,StokesAnalysisEnum);
 
         //Add in inputs