Changeset 4185
- Timestamp:
- 06/24/10 08:24:59 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/DataSet/DataSet.cpp
r4183 r4185 877 877 } 878 878 /*}}}*/ 879 /*FUNCTION DataSet::NumberOf Rgbs{{{1*/880 int DataSet::NumberOf Rgbs(int analysis_type){879 /*FUNCTION DataSet::NumberOfLocalRgbs{{{1*/ 880 int DataSet::NumberOfLocalRgbs(int analysis_type){ 881 881 882 882 vector<Object*>::iterator object; … … 898 898 /*}}}*/ 899 899 /*FUNCTION DataSet::NumberOfNodes{{{1*/ 900 void DataSet::NumberOfNodes(int* pnumberofnodes){900 int DataSet::NumberOfNodes(void){ 901 901 902 902 vector<Object*>::iterator object; … … 924 924 max_sid++; 925 925 926 /* Assign output pointers:*/927 *pnumberofnodes=max_sid;926 /*return*/ 927 return max_sid; 928 928 } 929 929 /*}}}*/ 930 930 /*FUNCTION DataSet::NumberOfVertices{{{1*/ 931 void DataSet::NumberOfVertices(int* pnumberofvertices){931 int DataSet::NumberOfVertices(void){ 932 932 933 933 vector<Object*>::iterator object; … … 955 955 max_sid++; 956 956 957 /*Assign output pointers:*/ 958 *pnumberofvertices=max_sid; 957 /*return:*/ 958 return max_sid; 959 } 960 /*}}}*/ 961 /*FUNCTION DataSet::NumberOfLoads{{{1*/ 962 int DataSet::NumberOfLoads(void){ 963 964 int localloads; 965 int numberofloads; 966 967 /*Get number of local loads*/ 968 localloads=this->Size(); 969 970 /*figure out total number of loads combining all the cpus (no clones here)*/ 971 #ifdef _PARALLEL_ 972 MPI_Reduce(&localloads,&numberofloads,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD ); 973 MPI_Bcast(&numberofloads,1,MPI_INT,0,MPI_COMM_WORLD); 974 #else 975 numberofloads=localloads; 976 #endif 977 978 return numberofloads; 979 } 980 /*}}}*/ 981 /*FUNCTION DataSet::NumberOfConstraints{{{1*/ 982 int DataSet::NumberOfConstraints(void){ 983 984 int localconstraints; 985 int numberofconstraints; 986 987 /*Get number of local constraints*/ 988 localconstraints=this->Size(); 989 990 /*figure out total number of constraints combining all the cpus (no clones here)*/ 991 #ifdef _PARALLEL_ 992 MPI_Reduce(&localconstraints,&numberofconstraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD ); 993 MPI_Bcast(&numberofconstraints,1,MPI_INT,0,MPI_COMM_WORLD); 994 #else 995 numberofconstraints=localconstraints; 996 #endif 997 998 return numberofconstraints; 959 999 } 960 1000 /*}}}*/ -
issm/trunk/src/c/DataSet/DataSet.h
r4147 r4185 57 57 void FlagClones(int numberofnodes); 58 58 int NumberOfDofs(int analysis_type); 59 int NumberOfRgbs(int analysis_type); 60 void NumberOfVertices(int* pnumberofvertices); 61 void NumberOfNodes(int* pnumberofnodes); 59 int NumberOfLocalRgbs(int analysis_type); 60 int NumberOfVertices(void); 61 int NumberOfNodes(void); 62 int NumberOfLoads(void); 63 int NumberOfConstraints(void); 62 64 void SetupSpcs(DataSet* nodes,Vec yg,int analysis_type); 63 65 void SetupMpcs(Mat Rmg,DataSet* nodes,int analysis_type); -
issm/trunk/src/c/modules/ComputePressurex/ComputePressurex.cpp
r4156 r4185 21 21 22 22 /*Recover numberofnodes: */ 23 n odes->NumberOfNodes(&numberofnodes);23 numberofnodes=nodes->NumberOfNodes(); 24 24 25 25 /*Allocate p_g on numberofnodes (only 1 dof): */ -
issm/trunk/src/c/modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp
r4156 r4185 24 24 25 25 /*Initialize intermediary*/ 26 vertices->NumberOfVertices(&numberofvertices);26 numberofvertices=vertices->NumberOfVertices(); 27 27 connectivity=NewVec(numberofvertices); 28 28 fieldsum =NewVec(numberofvertices); -
issm/trunk/src/c/modules/Gradjx/Gradjx.cpp
r4156 r4185 24 24 /*retrieve some parameters: */ 25 25 parameters->FindParam(&dim,DimEnum); 26 vertices->NumberOfVertices(&numberofvertices);26 numberofvertices=vertices->NumberOfVertices(); 27 27 28 28 /*Compute gradients: */ -
issm/trunk/src/c/modules/ModelProcessorx/UpdateCounters.cpp
r4025 r4185 27 27 28 28 29 if(nodes)iomodel->nodecounter=nodes-> Size();29 if(nodes)iomodel->nodecounter=nodes->NumberOfNodes(); 30 30 else iomodel->nodecounter=0; 31 31 32 if(loads)iomodel->loadcounter=loads-> Size();32 if(loads)iomodel->loadcounter=loads->NumberOfLoads(); 33 33 else iomodel->loadcounter=0; 34 34 35 if(constraints)iomodel->constraintcounter=constraints-> Size();35 if(constraints)iomodel->constraintcounter=constraints->NumberOfConstraints(); 36 36 else iomodel->constraintcounter=0; 37 37 -
issm/trunk/src/c/modules/MpcNodesx/MpcNodesx.cpp
r4003 r4185 31 31 32 32 /*Get number of equations from number of constraints: */ 33 numberofequations=constraints->NumberOf Rgbs(analysis_type);33 numberofequations=constraints->NumberOfLocalRgbs(analysis_type); 34 34 35 35 if(numberofequations){ -
issm/trunk/src/c/modules/NodesDofx/NodesDofx.cpp
r4156 r4185 20 20 int numberofdofspernode; 21 21 22 /*First, recover number of vertices and nodes from parameters: */23 n odes->NumberOfNodes(&numberofnodes);22 /*First, recover number of vertices and nodes: */ 23 numberofnodes=nodes->NumberOfNodes(); 24 24 25 25 /*Recover number of dofs per node: */ -
issm/trunk/src/c/modules/VerticesDofx/VerticesDofx.cpp
r4168 r4185 28 28 29 29 /*figure out how many vertices we have: */ 30 vertices->NumberOfVertices(&numberofvertices);30 numberofvertices=vertices->NumberOfVertices(); 31 31 32 32 /*Ensure that only for each cpu, the partition border vertices only will be taken into account once -
issm/trunk/src/c/objects/Node.cpp
r4180 r4185 250 250 printf(" analysis_type: %s\n",EnumAsString(analysis_type)); 251 251 indexing.Echo(); 252 hvertex.Echo(); 253 hupper_node.Echo(); 254 printf(" inputs\n"); 255 inputs->Echo(); 252 printf(" hvertex: not displayed\n"); 253 printf(" hupper_node: not displayed\n"); 254 printf(" inputs: %p\n",inputs); 256 255 257 256 -
issm/trunk/src/c/solvers/solver_diagnostic_nonlinear.cpp
r4156 r4185 42 42 /*Recover parameters: */ 43 43 kflag=1; pflag=1; 44 femmodel->nodes->NumberOfNodes(&numberofnodes);44 numberofnodes=femmodel->nodes->NumberOfNodes(); 45 45 femmodel->parameters->FindParam(&solver_string,SolverStringEnum); 46 46 femmodel->parameters->FindParam(&dim,DimEnum); -
issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp
r4156 r4185 42 42 kflag=1; pflag=1; 43 43 44 fem->nodes->NumberOfNodes(&numberofnodes);44 numberofnodes=fem->nodes->NumberOfNodes(); 45 45 fem->parameters->FindParam(&solver_string,SolverStringEnum); 46 46 fem->parameters->FindParam(&verbose,VerboseEnum);
Note:
See TracChangeset
for help on using the changeset viewer.