Changeset 13608
- Timestamp:
- 10/10/12 23:23:14 (12 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/objects/DependentObject.cpp
r13483 r13608 66 66 int DependentObject::Id(void){ return -1; } 67 67 /*}}}*/ 68 /*FUNCTION DependentObject::MyRank{{{*/69 int DependentObject::MyRank(void){70 extern int my_rank;71 72 return my_rank;73 }74 /*}}}*/75 68 /*FUNCTION DependentObject::ObjectEnum{{{*/ 76 69 int DependentObject::ObjectEnum(void){ -
issm/trunk-jpl/src/c/classes/objects/DependentObject.h
r13483 r13608 35 35 void DeepEcho(); 36 36 int Id(); 37 int MyRank();38 37 int ObjectEnum(); 39 38 Object* copy(void); -
issm/trunk-jpl/src/c/classes/objects/IndependentObject.cpp
r13607 r13608 65 65 int IndependentObject::Id(void){ return -1; } 66 66 /*}}}*/ 67 /*FUNCTION IndependentObject::MyRank{{{*/68 int IndependentObject::MyRank(void){69 extern int my_rank;70 71 return my_rank;72 }73 /*}}}*/74 67 /*FUNCTION IndependentObject::ObjectEnum{{{*/ 75 68 int IndependentObject::ObjectEnum(void){ … … 89 82 void IndependentObject::FetchIndependent(IoModel* iomodel){ 90 83 91 extern int my_rank;84 int my_rank2; 92 85 FILE* fid=NULL; 86 87 /*recover my_rank2:*/ 88 my_rank2=IssmComm::GetRank(); 93 89 94 90 #ifdef _HAVE_ADOLC_ //cannot come here unless you are running AD mode, from DeclaredIndependents: … … 109 105 110 106 /*We have to read a scalar from disk. First read the dimensions of the scalar, then the scalar: */ 111 if(my_rank ==0){107 if(my_rank2==0){ 112 108 if(fread(&pscalar,sizeof(IssmPDouble),1,fid)!=1)_error_("could not read scalar "); 113 109 } … … 147 143 /*We have to read a matrix from disk. First read the dimensions of the matrix, then the whole matrix: */ 148 144 /*numberofelements: */ 149 if(my_rank ==0){145 if(my_rank2==0){ 150 146 if(fread(&M,sizeof(int),1,fid)!=1) _error_("could not read number of rows for matrix "); 151 147 } … … 154 150 #endif 155 151 156 if(my_rank ==0){152 if(my_rank2==0){ 157 153 if(fread(&N,sizeof(int),1,fid)!=1) _error_("could not read number of columns for matrix "); 158 154 } … … 167 163 168 164 /*Read matrix on node 0, then broadcast: */ 169 if(my_rank ==0){165 if(my_rank2==0){ 170 166 if(fread(buffer,M*N*sizeof(IssmPDouble),1,fid)!=1) _error_("could not read matrix "); 171 167 -
issm/trunk-jpl/src/c/classes/objects/IndependentObject.h
r13426 r13608 30 30 void DeepEcho(); 31 31 int Id(); 32 int MyRank();33 32 int ObjectEnum(); 34 33 Object* copy(void); -
issm/trunk-jpl/src/c/classes/objects/Node.cpp
r13414 r13608 979 979 void Node::SetClone(int* minranks){ 980 980 981 extern int my_rank; 982 983 if (minranks[sid]==my_rank){ 981 int my_rank2; 982 983 /*recover my_rank2:*/ 984 my_rank2=IssmComm::GetRank(); 985 986 if (minranks[sid]==my_rank2){ 984 987 indexing.clone=false; 985 988 } -
issm/trunk-jpl/src/c/classes/objects/Params/DataSetParam.cpp
r13425 r13608 57 57 int DataSetParam::Id(void){ return -1; } 58 58 /*}}}*/ 59 /*FUNCTION DataSetParam::MyRank{{{*/60 int DataSetParam::MyRank(void){61 extern int my_rank;62 return my_rank;63 }64 /*}}}*/65 59 /*FUNCTION DataSetParam::ObjectEnum{{{*/ 66 60 int DataSetParam::ObjectEnum(void){ -
issm/trunk-jpl/src/c/classes/objects/Params/DataSetParam.h
r13425 r13608 36 36 void DeepEcho(); 37 37 int Id(); 38 int MyRank();39 38 int ObjectEnum(); 40 39 Object* copy(); -
issm/trunk-jpl/src/c/classes/objects/Vertex.cpp
r13416 r13608 178 178 void Vertex::SetClone(int* minranks){ 179 179 180 extern int my_rank; 180 int my_rank2; 181 182 /*recover my_rank2:*/ 183 my_rank2=IssmComm::GetRank(); 181 184 182 if (minranks[this->sid]==my_rank ){185 if (minranks[this->sid]==my_rank2){ 183 186 this->clone=false; 184 187 } -
issm/trunk-jpl/src/c/solutions/controltao_core.cpp
r13540 r13608 54 54 55 55 /*Initialize TAO*/ 56 TaoCreate( PETSC_COMM_WORLD,&tao);56 TaoCreate(IssmComm::GetComm(),&tao); 57 57 if(VerboseControl()) _pprintLine_(" Initializing the Toolkit for Advanced Optimization (TAO)"); 58 58 TaoSetFromOptions(tao);
Note:
See TracChangeset
for help on using the changeset viewer.