Changeset 3373


Ignore:
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:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/ConfigureObjectsx/ConfigureObjectsx.cpp

    r3361 r3373  
    1818        extern int my_rank;
    1919       
    20         //_printf_("      Configuring elements...\n");
     20        _printf_("      Configuring elements...\n");
    2121        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        //}
    2326        loads->Configure(elements,loads,nodes,materials,parameters);
    24         //_printf_("      Configuring nodes...\n");
     27        _printf_("      Configuring nodes...\n");
    2528        nodes->Configure(elements,loads,nodes,materials,parameters);
    26         //_printf_("      Configuring parameters...\n");
     29        _printf_("      Configuring parameters...\n");
    2730        parameters->Configure(elements,loads, nodes, materials,parameters);
    2831
  • issm/trunk/src/c/Makefile.am

    r3372 r3373  
    729729                                        ./parallel/ProcessResults.cpp\
    730730                                        ./parallel/prognostic_core.cpp\
     731                                        ./parallel/prognostic2_core.cpp\
    731732                                        ./parallel/balancedthickness_core.cpp\
    732733                                        ./parallel/balancedvelocities_core.cpp\
     
    804805bin_PROGRAMS =
    805806else
    806 bin_PROGRAMS = diagnostic.exe thermal.exe prognostic.exe balancedthickness.exe balancedvelocities.exe transient.exe steadystate.exe slopecompute.exe
     807bin_PROGRAMS = diagnostic.exe thermal.exe prognostic.exe prognostic2.exe balancedthickness.exe balancedvelocities.exe transient.exe steadystate.exe slopecompute.exe
    807808endif
    808809
     
    821822prognostic_exe_CXXFLAGS= -fPIC -D_PARALLEL_
    822823
     824prognostic2_exe_SOURCES = parallel/prognostic2.cpp
     825prognostic2_exe_CXXFLAGS= -fPIC -D_PARALLEL_
     826
    823827balancedthickness_exe_SOURCES = parallel/balancedthickness.cpp
    824828balancedthickness_exe_CXXFLAGS= -fPIC -D_PARALLEL_
  • issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp

    r3371 r3373  
    160160
    161161        /*Used later on: */
    162         my_grids=(int*)xcalloc(iomodel->numberofnodes,sizeof(int));
     162        my_grids=(int*)xcalloc(3*iomodel->numberofelements,sizeof(int));
    163163        #endif
    164164
     
    223223                         into the grid coordinates. If we start plugging 1 into my_grids for each index[n][i] (i=0:2), then my_grids
    224224                         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;
    228228                        #endif
    229229
     
    251251                /*From the element partitioning, we can determine which grids are on the inside of this cpu's
    252252                 *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++){
    256256                        if(my_grids[i])VecSetValue(gridborder,i,1,ADD_VALUES);
    257257                }
  • issm/trunk/src/c/parallel/ProcessResults.cpp

    r3332 r3373  
    123123        if(analysis_type==PrognosticAnalysisEnum()){
    124124                fem_p=model->GetFormulation(PrognosticAnalysisEnum());
     125        }
     126        if(analysis_type==Prognostic2AnalysisEnum()){
     127                fem_p=model->GetFormulation(Prognostic2AnalysisEnum());
    125128        }
    126129        if(analysis_type==TransientAnalysisEnum()){
  • issm/trunk/src/c/parallel/parallel.h

    r3086 r3373  
    1717void diagnostic_core(DataSet* results,Model* model, ParameterInputs* inputs);
    1818void prognostic_core(DataSet* results,Model* model, ParameterInputs* inputs);
     19void prognostic2_core(DataSet* results,Model* model, ParameterInputs* inputs);
    1920void balancedthickness_core(DataSet* results,Model* model, ParameterInputs* inputs);
    2021void balancedvelocities_core(DataSet* results,Model* model, ParameterInputs* inputs);
Note: See TracChangeset for help on using the changeset viewer.