Changeset 3373
- Timestamp:
- 04/01/10 16:19:59 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/ConfigureObjectsx/ConfigureObjectsx.cpp
r3361 r3373 18 18 extern int my_rank; 19 19 20 //_printf_(" Configuring elements...\n");20 _printf_(" Configuring elements...\n"); 21 21 elements->Configure(elements,loads,nodes,materials,parameters); 22 //_printf_(" Configuring loads...\n"); 22 _printf_(" Configuring loads...\n"); 23 //if (my_rank==2){ 24 // nodes->Echo(); 25 //} 23 26 loads->Configure(elements,loads,nodes,materials,parameters); 24 //_printf_(" Configuring nodes...\n");27 _printf_(" Configuring nodes...\n"); 25 28 nodes->Configure(elements,loads,nodes,materials,parameters); 26 //_printf_(" Configuring parameters...\n");29 _printf_(" Configuring parameters...\n"); 27 30 parameters->Configure(elements,loads, nodes, materials,parameters); 28 31 -
issm/trunk/src/c/Makefile.am
r3372 r3373 729 729 ./parallel/ProcessResults.cpp\ 730 730 ./parallel/prognostic_core.cpp\ 731 ./parallel/prognostic2_core.cpp\ 731 732 ./parallel/balancedthickness_core.cpp\ 732 733 ./parallel/balancedvelocities_core.cpp\ … … 804 805 bin_PROGRAMS = 805 806 else 806 bin_PROGRAMS = diagnostic.exe thermal.exe prognostic.exe balancedthickness.exe balancedvelocities.exe transient.exe steadystate.exe slopecompute.exe807 bin_PROGRAMS = diagnostic.exe thermal.exe prognostic.exe prognostic2.exe balancedthickness.exe balancedvelocities.exe transient.exe steadystate.exe slopecompute.exe 807 808 endif 808 809 … … 821 822 prognostic_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 822 823 824 prognostic2_exe_SOURCES = parallel/prognostic2.cpp 825 prognostic2_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 826 823 827 balancedthickness_exe_SOURCES = parallel/balancedthickness.cpp 824 828 balancedthickness_exe_CXXFLAGS= -fPIC -D_PARALLEL_ -
issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp
r3371 r3373 160 160 161 161 /*Used later on: */ 162 my_grids=(int*)xcalloc( iomodel->numberofnodes,sizeof(int));162 my_grids=(int*)xcalloc(3*iomodel->numberofelements,sizeof(int)); 163 163 #endif 164 164 … … 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 224 224 will hold which grids belong to this partition*/ 225 my_grids[ (int)*(iomodel->elements+elements_width*i+0)-1]=1;226 my_grids[ (int)*(iomodel->elements+elements_width*i+1)-1]=1;227 my_grids[ (int)*(iomodel->elements+elements_width*i+2)-1]=1;225 my_grids[3*i+0]=1; 226 my_grids[3*i+1]=1; 227 my_grids[3*i+2]=1; 228 228 #endif 229 229 … … 251 251 /*From the element partitioning, we can determine which grids are on the inside of this cpu's 252 252 *element partition, and which are on its border with other nodes:*/ 253 gridborder=NewVec( iomodel->numberofnodes);254 255 for (i=0;i< iomodel->numberofnodes;i++){253 gridborder=NewVec(3*iomodel->numberofelements); 254 255 for (i=0;i<3*iomodel->numberofelements;i++){ 256 256 if(my_grids[i])VecSetValue(gridborder,i,1,ADD_VALUES); 257 257 } -
issm/trunk/src/c/parallel/ProcessResults.cpp
r3332 r3373 123 123 if(analysis_type==PrognosticAnalysisEnum()){ 124 124 fem_p=model->GetFormulation(PrognosticAnalysisEnum()); 125 } 126 if(analysis_type==Prognostic2AnalysisEnum()){ 127 fem_p=model->GetFormulation(Prognostic2AnalysisEnum()); 125 128 } 126 129 if(analysis_type==TransientAnalysisEnum()){ -
issm/trunk/src/c/parallel/parallel.h
r3086 r3373 17 17 void diagnostic_core(DataSet* results,Model* model, ParameterInputs* inputs); 18 18 void prognostic_core(DataSet* results,Model* model, ParameterInputs* inputs); 19 void prognostic2_core(DataSet* results,Model* model, ParameterInputs* inputs); 19 20 void balancedthickness_core(DataSet* results,Model* model, ParameterInputs* inputs); 20 21 void balancedvelocities_core(DataSet* results,Model* model, ParameterInputs* inputs);
Note:
See TracChangeset
for help on using the changeset viewer.