Changeset 3373

Timestamp:

04/01/10 16:19:59 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added parallel version of pragnostic2 (to be completed)

Location:

issm/trunk/src/c

Files:

• ConfigureObjectsx/ConfigureObjectsx.cpp (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp (modified) (3 diffs)
• parallel/ProcessResults.cpp (modified) (1 diff)
• parallel/parallel.h (modified) (1 diff)
• parallel/prognostic2.cpp (added)
• parallel/prognostic2_core.cpp (added)

issm/trunk/src/c/ConfigureObjectsx/ConfigureObjectsx.cpp

@@ -18 +18 @@
         extern int my_rank;
         
-        //_printf_("      Configuring elements...\n");
+        _printf_("      Configuring elements...\n");
         elements->Configure(elements,loads,nodes,materials,parameters);
-        //_printf_("      Configuring loads...\n");
+        _printf_("      Configuring loads...\n");
+        //if (my_rank==2){
+        //      nodes->Echo();
+        //}
         loads->Configure(elements,loads,nodes,materials,parameters);
-        //_printf_("      Configuring nodes...\n");
+        _printf_("      Configuring nodes...\n");
         nodes->Configure(elements,loads,nodes,materials,parameters);
-        //_printf_("      Configuring parameters...\n");
+        _printf_("      Configuring parameters...\n");
         parameters->Configure(elements,loads, nodes, materials,parameters);
 

issm/trunk/src/c/Makefile.am

@@ -729 +729 @@
                                         ./parallel/ProcessResults.cpp\
                                         ./parallel/prognostic_core.cpp\
+                                        ./parallel/prognostic2_core.cpp\
                                         ./parallel/balancedthickness_core.cpp\
                                         ./parallel/balancedvelocities_core.cpp\
@@ -804 +805 @@
 bin_PROGRAMS = 
 else 
-bin_PROGRAMS = diagnostic.exe thermal.exe prognostic.exe balancedthickness.exe balancedvelocities.exe transient.exe steadystate.exe slopecompute.exe
+bin_PROGRAMS = diagnostic.exe thermal.exe prognostic.exe prognostic2.exe balancedthickness.exe balancedvelocities.exe transient.exe steadystate.exe slopecompute.exe
 endif
 
@@ -821 +822 @@
 prognostic_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
 
+prognostic2_exe_SOURCES = parallel/prognostic2.cpp
+prognostic2_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
+
 balancedthickness_exe_SOURCES = parallel/balancedthickness.cpp
 balancedthickness_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 

issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp

@@ -160 +160 @@
 
         /*Used later on: */
-        my_grids=(int*)xcalloc(iomodel->numberofnodes,sizeof(int));
+        my_grids=(int*)xcalloc(3*iomodel->numberofelements,sizeof(int));
         #endif
 
@@ -223 +223 @@
                          into the grid coordinates. If we start plugging 1 into my_grids for each index[n][i] (i=0:2), then my_grids 
                          will hold which grids belong to this partition*/
-                        my_grids[(int)*(iomodel->elements+elements_width*i+0)-1]=1;
-                        my_grids[(int)*(iomodel->elements+elements_width*i+1)-1]=1;
-                        my_grids[(int)*(iomodel->elements+elements_width*i+2)-1]=1;
+                        my_grids[3*i+0]=1;
+                        my_grids[3*i+1]=1;
+                        my_grids[3*i+2]=1;
                         #endif
 
@@ -251 +251 @@
                 /*From the element partitioning, we can determine which grids are on the inside of this cpu's 
                  *element partition, and which are on its border with other nodes:*/
-                gridborder=NewVec(iomodel->numberofnodes);
-
-                for (i=0;i<iomodel->numberofnodes;i++){
+                gridborder=NewVec(3*iomodel->numberofelements);
+
+                for (i=0;i<3*iomodel->numberofelements;i++){
                         if(my_grids[i])VecSetValue(gridborder,i,1,ADD_VALUES);
                 }

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

@@ -123 +123 @@
         if(analysis_type==PrognosticAnalysisEnum()){
                 fem_p=model->GetFormulation(PrognosticAnalysisEnum());
+        }
+        if(analysis_type==Prognostic2AnalysisEnum()){
+                fem_p=model->GetFormulation(Prognostic2AnalysisEnum());
         }
         if(analysis_type==TransientAnalysisEnum()){

issm/trunk/src/c/parallel/parallel.h

@@ -17 +17 @@
 void diagnostic_core(DataSet* results,Model* model, ParameterInputs* inputs);
 void prognostic_core(DataSet* results,Model* model, ParameterInputs* inputs);
+void prognostic2_core(DataSet* results,Model* model, ParameterInputs* inputs);
 void balancedthickness_core(DataSet* results,Model* model, ParameterInputs* inputs);
 void balancedvelocities_core(DataSet* results,Model* model, ParameterInputs* inputs);