Index: /issm/trunk-jpl/src/c/Container/Constraints.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Constraints.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/Container/Constraints.cpp (revision 13622) @@ -54,5 +54,4 @@ numberofconstraints=localconstraints; #endif - return numberofconstraints; Index: /issm/trunk-jpl/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 13622) @@ -30,5 +30,5 @@ /*FUNCTION DataSet::DataSet(){{{*/ DataSet::DataSet(){ - + sorted=0; sorted_ids=NULL; @@ -40,5 +40,5 @@ DataSet::DataSet(int dataset_enum){ enum_type=dataset_enum; - + sorted=0; sorted_ids=NULL; @@ -130,5 +130,4 @@ void DataSet::DeepEcho(){ - vector::iterator object; Index: /issm/trunk-jpl/src/c/Container/Elements.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 13622) @@ -65,5 +65,5 @@ /*FUNCTION Elements::DeleteResults{{{*/ void Elements::DeleteResults(void){ - + for (int i=0;iSize();i++){ Element* element=(Element*)this->GetObjectByOffset(i); @@ -108,5 +108,5 @@ * We will use the Patch object, which will store all of the information needed, and will be able * to output itself to disk on its own. See object/Patch.h for format of this object.*/ - + /*First, determine maximum number of vertices, nodes, and number of results: */ numrows=0; @@ -167,5 +167,5 @@ int i; - + int my_rank; int num_procs; @@ -184,5 +184,5 @@ int rank; int minrank; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); Index: /issm/trunk-jpl/src/c/Container/Inputs.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 13622) @@ -207,5 +207,5 @@ /*FUNCTION Inputs::ConstrainMin{{{*/ void Inputs::ConstrainMin(int constrain_enum, IssmDouble minimum){ - + Input* constrain_input=NULL; /*Find x and y inputs: */ @@ -407,5 +407,5 @@ /*FUNCTION Inputs::AXPY{{{*/ void Inputs::AXPY(int MeshYEnum, IssmDouble scalar, int MeshXEnum){ - + Input* xinput=NULL; Input* yinput=NULL; Index: /issm/trunk-jpl/src/c/Container/Loads.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Loads.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/Container/Loads.cpp (revision 13622) @@ -70,5 +70,4 @@ #endif - return numberofloads; } Index: /issm/trunk-jpl/src/c/Container/Nodes.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Nodes.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/Container/Nodes.cpp (revision 13622) @@ -66,5 +66,5 @@ int* alltruedofs=NULL; int numnodes=0; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); @@ -235,5 +235,5 @@ int i; - + int numdofs=0; int allnumdofs; @@ -271,5 +271,5 @@ int i; - + int numnodes=0; int allnumnodes=0; @@ -326,5 +326,5 @@ /*sid starts at 0*/ max_sid++; - + /*return*/ return max_sid; @@ -337,5 +337,5 @@ int my_rank; int sid; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); Index: /issm/trunk-jpl/src/c/Container/Options.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Options.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/Container/Options.cpp (revision 13622) @@ -42,5 +42,5 @@ char* name=NULL; - + vector::iterator object; Option* option=NULL; Index: /issm/trunk-jpl/src/c/Container/Parameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Parameters.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/Container/Parameters.cpp (revision 13622) @@ -53,5 +53,5 @@ /*FUNCTION Parameters::FindParam(bool* pbool,int enum_type){{{*/ void Parameters::FindParam(bool* pbool,int enum_type){ _assert_(this); - + vector::iterator object; Param* param=NULL; @@ -70,5 +70,5 @@ /*FUNCTION Parameters::FindParam(int* pinteger,int enum_type){{{*/ void Parameters::FindParam(int* pinteger,int enum_type){ _assert_(this); - + vector::iterator object; Param* param=NULL; @@ -87,5 +87,5 @@ /*FUNCTION Parameters::FindParam(IssmDouble* pscalar, int enum_type){{{*/ void Parameters::FindParam(IssmDouble* pscalar, int enum_type){ _assert_(this); - + vector::iterator object; Param* param=NULL; @@ -121,5 +121,5 @@ /*FUNCTION Parameters::FindParam(char** pstring,int enum_type){{{*/ void Parameters::FindParam(char** pstring,int enum_type){ _assert_(this); - + vector::iterator object; Param* param=NULL; @@ -139,5 +139,5 @@ /*FUNCTION Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){{{*/ void Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){ _assert_(this); - + vector::iterator object; Param* param=NULL; @@ -229,5 +229,5 @@ /*FUNCTION Parameters::FindParam(IssmDouble*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){{{*/ void Parameters::FindParam(IssmDouble*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){ _assert_(this); - + vector::iterator object; Param* param=NULL; @@ -246,5 +246,5 @@ /*FUNCTION Parameters::FindParam(Vector** pvec,int enum_type){{{*/ void Parameters::FindParam(Vector** pvec,int enum_type){ _assert_(this); - + vector::iterator object; Param* param=NULL; @@ -264,5 +264,5 @@ /*FUNCTION Parameters::FindParam(Matrix** pmat,int enum_type){{{*/ void Parameters::FindParam(Matrix** pmat,int enum_type){ _assert_(this); - + vector::iterator object; Param* param=NULL; @@ -320,5 +320,5 @@ Param* param=NULL; - + /*first, figure out if the param has already been created: */ param=(Param*)this->FindParamObject(enum_type); @@ -332,5 +332,5 @@ Param* param=NULL; - + /*first, figure out if the param has already been created: */ param=(Param*)this->FindParamObject(enum_type); @@ -344,5 +344,5 @@ Param* param=NULL; - + /*first, figure out if the param has already been created: */ param=(Param*)this->FindParamObject(enum_type); @@ -356,5 +356,5 @@ Param* param=NULL; - + /*first, figure out if the param has already been created: */ param=(Param*)this->FindParamObject(enum_type); @@ -368,5 +368,5 @@ Param* param=NULL; - + /*first, figure out if the param has already been created: */ param=(Param*)this->FindParamObject(enum_type); @@ -380,5 +380,5 @@ Param* param=NULL; - + /*first, figure out if the param has already been created: */ param=(Param*)this->FindParamObject(enum_type); @@ -392,5 +392,5 @@ Param* param=NULL; - + /*first, figure out if the param has already been created: */ param=(Param*)this->FindParamObject(enum_type); @@ -428,5 +428,5 @@ Param* param=NULL; - + /*first, figure out if the param has already been created: */ param=(Param*)this->FindParamObject(enum_type); @@ -440,5 +440,5 @@ Param* param=NULL; - + /*first, figure out if the param has already been created: */ param=(Param*)this->FindParamObject(enum_type); Index: /issm/trunk-jpl/src/c/Container/Results.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Results.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/Container/Results.cpp (revision 13622) @@ -66,5 +66,5 @@ /*FUNCTION Results::Write{{{*/ void Results::Write(Parameters* parameters){ - + int i; FILE *fid = NULL; Index: /issm/trunk-jpl/src/c/Container/Vertices.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Vertices.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/Container/Vertices.cpp (revision 13622) @@ -49,5 +49,5 @@ int *truepids = NULL; int *alltruepids = NULL; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); @@ -119,5 +119,5 @@ int* ranks=NULL; int* minranks=NULL; - + /*recover num_procs:*/ num_procs=IssmComm::GetSize(); @@ -186,5 +186,5 @@ int my_rank; int sid; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); Index: /issm/trunk-jpl/src/c/classes/DofIndexing.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/DofIndexing.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/DofIndexing.cpp (revision 13622) @@ -164,5 +164,5 @@ _printLine_(" ssize: " << ssize); _printLine_(" clone: " << clone); - + _printLine_(" set membership: f,s sets "); for(i=0;iparameters->FindParam(&outbinfilename,OutputFileNameEnum); pfclose(output_fid,outbinfilename); - + /*Write lock file if requested: */ this->parameters->FindParam(&waitonlock,SettingsWaitonlockEnum); @@ -214,5 +214,5 @@ /*FUNCTION FemModel::OutputResults {{{*/ void FemModel::OutputResults(void){ - + _pprintLine_("write results to disk:"); @@ -253,5 +253,5 @@ int solution_type; void (*solutioncore)(FemModel*)=NULL; //core solution function pointer - + _pprintLine_("call computational core:"); Index: /issm/trunk-jpl/src/c/classes/Hook.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Hook.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/Hook.cpp (revision 13622) @@ -126,5 +126,5 @@ output->offsets = xNew(output->num); } - + for(int i=0;inum;i++){ output->objects[i] = this->objects[i]; @@ -182,5 +182,5 @@ /*FUNCTION Hook::delivers{{{*/ Object* Hook::delivers(void){ - + /*first, check that we only have one T object in our object list: */ if (this->num!=1) _error_("trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n"); Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 13622) @@ -28,5 +28,5 @@ this->independents=NULL; this->constants=NULL; - + this->my_elements=NULL; this->my_nodes=NULL; @@ -34,5 +34,5 @@ this->singlenodetoelementconnectivity=NULL; this->numbernodetoelementconnectivity=NULL; - + this->nodecounter=0; this->loadcounter=0; @@ -68,5 +68,5 @@ this->singlenodetoelementconnectivity=NULL; this->numbernodetoelementconnectivity=NULL; - + this->nodecounter=0; this->loadcounter=0; @@ -205,5 +205,4 @@ void IoModel::DeclareIndependents(void){ - int i; bool autodiff = false; @@ -217,5 +216,4 @@ bool keep=false; - /*Initialize array detecting whether data[i] is an independent AD mode variable: */ this->independents=xNew(MaximumNumberOfEnums); @@ -226,5 +224,5 @@ this->FetchData(&numberofvertices,MeshNumberofverticesEnum); - + #ifdef _HAVE_ADOLC_ @@ -266,5 +264,4 @@ else this->independent_objects=NULL; - } /*}}}*/ @@ -283,5 +280,5 @@ dataenum=va_arg(ap, int); _assert_(dataenumindependents[dataenum]) xDelete(this->data[dataenum]); @@ -300,5 +297,5 @@ int my_rank; - + /*record descriptions; */ int record_enum; @@ -323,5 +320,5 @@ /*Go find in the binary file, the position of the data we want to fetch: */ if(my_rank==0){ //cpu 0{{{ - + /*First set FILE* position to the beginning of the file: */ fseek(this->fid,0,SEEK_SET); @@ -339,9 +336,9 @@ } else{ - + /* Read the record length and the data type code: */ fread(&record_length,sizeof(int),1,this->fid); fread(&record_code,sizeof(int),1,this->fid); - + #ifdef _HAVE_MPI_ /*Tell other cpus what we are doing: */ @@ -352,5 +349,5 @@ MPI_Bcast(&record_length,1,MPI_INT,0,IssmComm::GetComm()); #endif - + switch(record_code){ case 1: @@ -416,5 +413,5 @@ string[0]='\0'; } - + /*Add string to parameters: */ this->constants->AddObject(new StringParam(record_enum,string)); @@ -478,5 +475,5 @@ /*boolean. get it from cpu 0 */ MPI_Bcast(&booleanint,1,MPI_INT,0,IssmComm::GetComm()); - + /*create BoolParam: */ this->constants->AddObject(new BoolParam(record_enum,(bool)booleanint)); //cast to a boolean @@ -486,5 +483,5 @@ /*integer. get it from cpu 0 */ MPI_Bcast(&integer,1,MPI_INT,0,IssmComm::GetComm()); - + /*create IntParam: */ this->constants->AddObject(new IntParam(record_enum,integer)); @@ -494,5 +491,5 @@ /*scalar. get it from cpu 0 */ MPI_Bcast(&scalar,1,MPI_DOUBLE,0,IssmComm::GetComm()); - + /*create DoubleParam: */ this->constants->AddObject(new DoubleParam(record_enum,scalar)); @@ -530,5 +527,4 @@ } - } } @@ -541,19 +537,17 @@ int my_rank; - /*output: */ int booleanint; int code; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); - /*Set file pointer to beginning of the data: */ fid=this->SetFilePointerToData(&code,NULL,data_enum); if(code!=1)_error_("expecting a boolean for enum " << EnumToStringx(data_enum)); - + /*We have to read a boolean from disk. */ if(my_rank==0){ @@ -578,13 +572,13 @@ int integer; int code; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); - + /*Set file pointer to beginning of the data: */ fid=this->SetFilePointerToData(&code,NULL,data_enum); - + if(code!=2)_error_("expecting an integer for enum " << EnumToStringx(data_enum)); - + /*We have to read a integer from disk. First read the dimensions of the integer, then the integer: */ if(my_rank==0){ @@ -603,12 +597,10 @@ void IoModel::FetchData(IssmDouble* pscalar,int data_enum){ - int my_rank; - /*output: */ IssmPDouble scalar; int code; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); @@ -616,7 +608,7 @@ /*Set file pointer to beginning of the data: */ fid=this->SetFilePointerToData(&code,NULL,data_enum); - + if(code!=3)_error_("expecting a IssmDouble for enum " << EnumToStringx(data_enum)); - + /*We have to read a scalar from disk. First read the dimensions of the scalar, then the scalar: */ if(my_rank==0){ @@ -629,5 +621,5 @@ /*Assign output pointers: */ *pscalar=scalar; - + } /*}}}*/ @@ -636,5 +628,4 @@ int my_rank; - /*output: */ @@ -642,5 +633,5 @@ int string_size; int code=0; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); @@ -648,9 +639,9 @@ /*Set file pointer to beginning of the data: */ fid=this->SetFilePointerToData(&code,NULL,data_enum); - + if(code!=4)_error_("expecting a string for enum " << EnumToStringx(data_enum)); - + /*Now fetch: */ - + /*We have to read a string from disk. First read the dimensions of the string, then the string: */ if(my_rank==0){ @@ -679,5 +670,4 @@ string[0]='\0'; } - /*Assign output pointers: */ @@ -697,5 +687,5 @@ int code=0; int vector_type=0; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); @@ -705,5 +695,5 @@ if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum)); - + /*Now fetch: */ @@ -733,5 +723,5 @@ if(fread(matrix,M*N*sizeof(IssmPDouble),1,fid)!=1) _error_("could not read matrix "); } - + #ifdef _HAVE_MPI_ MPI_Bcast(matrix,M*N,MPI_DOUBLE,0,IssmComm::GetComm()); @@ -771,5 +761,5 @@ int code=0; int vector_type=0; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); @@ -778,5 +768,5 @@ fid=this->SetFilePointerToData(&code,&vector_type,data_enum); if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum)); - + /*Now fetch: */ @@ -832,5 +822,5 @@ int my_rank; - + int i; @@ -838,10 +828,10 @@ int numstrings=0; char** strings=NULL; - + /*intermediary: */ char* string=NULL; int string_size; int code; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); @@ -849,7 +839,7 @@ /*Set file pointer to beginning of the data: */ fid=this->SetFilePointerToData(&code,NULL,data_enum); - + if(code!=9)_error_("expecting a string array for enum " << EnumToStringx(data_enum)); - + /*We have to read a bunch of strings from disk. First read the number of strings, and allocate: */ if(my_rank==0){ @@ -867,5 +857,5 @@ /*Go through strings, and read: */ for(i=0;iSetFilePointerToData(&code,NULL,data_enum); if(code!=8)_error_("expecting a IssmDouble mat array for enum " << EnumToStringx(data_enum)); - + /*Now fetch: */ if(my_rank==0){ @@ -1000,5 +990,5 @@ int code; char *name = NULL; - + /*First get option name*/ this->FetchData(&name,index); @@ -1051,10 +1041,10 @@ /*Go through the entire list of enums and fetch the corresponding data. Add it to the iomodel->data dataset. Everything *we fetch is a IssmDouble* : */ - + va_start(ap,num); for(i=0; iindependents[dataenum]){ /*this data has already been checked out! Continue: */ @@ -1095,5 +1085,4 @@ int nel; int numberofelements; - /*variables being fetched: */ @@ -1282,5 +1271,5 @@ int lastindex,index; int record_length; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); Index: /issm/trunk-jpl/src/c/classes/Patch.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Patch.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/Patch.cpp (revision 13622) @@ -119,5 +119,5 @@ MPI_Status status; #endif - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); Index: /issm/trunk-jpl/src/c/classes/bamg/AdjacentTriangle.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/AdjacentTriangle.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/bamg/AdjacentTriangle.cpp (revision 13622) @@ -8,5 +8,4 @@ namespace bamg { - /*Constructors/Destructors*/ Index: /issm/trunk-jpl/src/c/classes/bamg/BamgQuadtree.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/BamgQuadtree.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/bamg/BamgQuadtree.cpp (revision 13622) @@ -428,5 +428,4 @@ } - if ( n0 > 0) { Index: /issm/trunk-jpl/src/c/classes/bamg/EigenMetric.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/EigenMetric.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/bamg/EigenMetric.cpp (revision 13622) @@ -29,5 +29,4 @@ b=-a11-a22; delta=b*b - 4*(a11*a22-a21*a21); - /*Compute norm of M to avoid round off errors*/ Index: /issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp (revision 13622) @@ -173,5 +173,5 @@ } delete [] verticeslength; - + } else{ @@ -905,5 +905,4 @@ } - if ((*eg0)(direction0)==(GeomVertex*)vg0) vg0=VertexOnGeom(*(BamgVertex*) vg0,*eg0,direction0); //vg0 = absisce Index: /issm/trunk-jpl/src/c/classes/bamg/ListofIntersectionTriangles.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/ListofIntersectionTriangles.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/bamg/ListofIntersectionTriangles.cpp (revision 13622) @@ -319,6 +319,4 @@ ilast=NewItem(t,ba[0],ba[1],ba[2]); } } // outside departure - - // recherche the intersection of [a,b] with Bh Mesh. @@ -392,5 +390,4 @@ Icoor2 detbij = bamg::det((*t)[i],(*t)[j],b); - if (detbij >= 0) { //we find the triangle contening b dt[0]=bamg::det((*t)[1],(*t)[2],b); Index: /issm/trunk-jpl/src/c/classes/bamg/Mesh.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/Mesh.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/bamg/Mesh.cpp (revision 13622) @@ -200,5 +200,4 @@ VertexOnBThEdge=0; } - if(nbe) @@ -1245,5 +1244,4 @@ tt[2]->SetSingleVertexToTriangleConnectivity(); - // swap if the point s is on a edge if(izerodet>=0) { @@ -1574,5 +1572,5 @@ //initialize subdomains[isd].head as 0 for (isd=0;isd5) _printLine_(" do nothing: costheta > 1"); } - long nbqq = (nbt*3)/2; @@ -4273,5 +4268,4 @@ newedges[ie].adj[1]=newedges + ie +1; R2 A = edges[i][0],B = edges[i][1]; - kk += (i == edge4->SortAndAdd(GetId(edges[i][0]),GetId(edges[i][1]))); @@ -4343,5 +4337,4 @@ nbv = k; - kedge = new long[3*nbt+1]; ksplitarray = new long[nbt+1]; @@ -4412,5 +4405,4 @@ const Triangle & tt = ta; - const BamgVertex & v0 = t[VerticesOfTriangularEdge[j][0]]; const BamgVertex & v1 = t[VerticesOfTriangularEdge[j][1]]; @@ -4648,5 +4640,4 @@ BTh.vertices[i].m = BTh.vertices[i].m*2.; - ret = 2; if (nbt>= maxnbt) goto Error; // bug @@ -5001,5 +4992,5 @@ _assert_(nbvCurveNumber; - + //_printLine_("Dealing with curve number " << nc); //_printLine_("edge on geometry is same as GhCurve? " << (ei.GeomEdgeHook==Gh.curves[nc].FirstEdge || ei.GeomEdgeHook==Gh.curves[nc].LastEdge)?"yes":"no"); @@ -5419,5 +5410,5 @@ /*Get edge of Bth with index iedge*/ Edge &ei = BTh.edges[iedge]; - + /*Initialize variables*/ double Lstep=0,Lcurve=0; // step between two points (phase==1) @@ -5536,5 +5527,4 @@ }// for(;;) end of the curve } - if (phase){ // construction of the last edge @@ -5787,5 +5777,4 @@ BamgVertex & s2= (*t2)[OppositeVertex[a2]]; - Icoor2 dets2 = det(*pva,*pvb,s2); Icoor2 det1=t1->det , det2=t2->det ; Index: /issm/trunk-jpl/src/c/classes/bamg/Metric.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/Metric.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/bamg/Metric.cpp (revision 13622) @@ -16,9 +16,9 @@ /*FUNCTION Metric::Metric(double a){{{*/ Metric::Metric(double a): a11(1/(a*a)),a21(0),a22(1/(a*a)){ - + }/*}}}*/ /*FUNCTION Metric::Metric(double a,double b,double c){{{*/ Metric::Metric(double a,double b,double c) :a11(a),a21(b),a22(c){ - + }/*}}}*/ /*FUNCTION Metric::Metric(const double a[3],const Metric& m0, const Metric& m1,const Metric& m2 ){{{*/ Index: /issm/trunk-jpl/src/c/classes/bamg/Triangle.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/Triangle.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/bamg/Triangle.cpp (revision 13622) @@ -424,5 +424,4 @@ sinb12 = double(det2), sinba2 = double(t2->det); - // angle b12 > angle ba2 => cotg(angle b12) < cotg(angle ba2) Index: /issm/trunk-jpl/src/c/classes/bamg/VertexOnVertex.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/bamg/VertexOnVertex.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/bamg/VertexOnVertex.cpp (revision 13622) @@ -17,5 +17,5 @@ /*FUNCTION VertexOnVertex::VertexOnVertex(BamgVertex * w,BamgVertex *bw){{{*/ VertexOnVertex::VertexOnVertex(BamgVertex * w,BamgVertex *bw) :v(w),bv(bw){ - + }/*}}}*/ Index: /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 13622) @@ -14,5 +14,4 @@ * the entire computations. */ - #ifdef HAVE_CONFIG_H @@ -77,5 +76,4 @@ memcpy(variable_descriptor,label.c_str(),(strlen(label.c_str())+1)*sizeof(char)); - variable_descriptors[i]=variable_descriptor; } @@ -109,4 +107,3 @@ } // namespace SIM - #endif //only works if dakota library has been compiled in. Index: /issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/matrix/ElementMatrix.cpp (revision 13622) @@ -230,5 +230,5 @@ /*FUNCTION ElementMatrix::~ElementMatrix(){{{*/ ElementMatrix::~ElementMatrix(){ - + xDelete(this->values); xDelete(this->gglobaldoflist); @@ -278,5 +278,4 @@ } - if((this->row_ssize!=0) && (this->row_fsize!=0)){ /*first, retrieve values that are in the f and s-set from the g-set values matrix: */ Index: /issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/matrix/ElementVector.cpp (revision 13622) @@ -139,5 +139,5 @@ /*fill values with 0: */ this->values=xNewZeroInit(this->nrows); - + /*g list*/ this->gglobaldoflist=GetGlobalDofList(nodes,numnodes,GsetEnum,approximation); @@ -151,5 +151,5 @@ /*FUNCTION ElementVector::~ElementVector(){{{*/ ElementVector::~ElementVector(){ - + xDelete(this->values); xDelete(this->gglobaldoflist); @@ -181,5 +181,5 @@ xDelete(localvalues); } - + } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcDynamic.cpp (revision 13622) @@ -41,5 +41,5 @@ } /*}}}*/ - + /*Object virtual functions definitions:*/ /*FUNCTION SpcDynamic::Echo {{{*/ @@ -111,5 +111,5 @@ /*FUNCTION SpcDynamic::GetNodeId {{{*/ int SpcDynamic::GetNodeId(){ - + return nodeid; } Index: /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcStatic.cpp (revision 13622) @@ -40,5 +40,5 @@ } /*}}}*/ - + /*Object virtual functions definitions:*/ /*FUNCTION SpcStatic::Echo {{{*/ @@ -112,5 +112,5 @@ /*FUNCTION SpcStatic::GetNodeId {{{*/ int SpcStatic::GetNodeId(){ - + return nodeid; } Index: /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Constraints/SpcTransient.cpp (revision 13622) @@ -54,5 +54,5 @@ } /*}}}*/ - + /*Object virtual functions definitions:*/ /*FUNCTION SpcTransient::Echo {{{*/ @@ -97,5 +97,5 @@ /*FUNCTION SpcTransient::InAnalysis{{{*/ bool SpcTransient::InAnalysis(int in_analysis_type){ - + if (in_analysis_type==this->analysis_type) return true; else return false; @@ -114,5 +114,5 @@ /*Chase through nodes and find the node to which this SpcTransient applys: */ node=(Node*)nodes->GetObjectById(NULL,nodeid); - + if(node){ //in case the spc is dealing with a node on another cpu @@ -159,5 +159,5 @@ /*FUNCTION SpcTransient::GetNodeId {{{*/ int SpcTransient::GetNodeId(){ - + return nodeid; } @@ -168,3 +168,2 @@ } /*}}}*/ - Index: /issm/trunk-jpl/src/c/classes/objects/DependentObject.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/DependentObject.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/DependentObject.cpp (revision 13622) @@ -41,5 +41,4 @@ } /*}}}*/ - /*Object virtual functions definitions:*/ @@ -100,5 +99,5 @@ parameters->SetParam(this->index,IndexEnum); } - + ::Responsex(poutput_value,elements,nodes,vertices,loads,materials,parameters,this->name,false,0); Index: /issm/trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/ElementResults/BoolElementResult.cpp (revision 13622) @@ -110,5 +110,5 @@ /*FUNCTION BoolElementResult::PatchFill{{{*/ void BoolElementResult::PatchFill(int row, Patch* patch){ - + /*Here, we fill the result information into the patch object. First, let's remember what is in a row * of the patch object: enum_type step time element_id interpolation vertices_ids nodal_values Index: /issm/trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/ElementResults/DoubleElementResult.cpp (revision 13622) @@ -100,5 +100,5 @@ /*FUNCTION DoubleElementResult::ProcessUnits{{{*/ void DoubleElementResult::ProcessUnits(Parameters* parameters){ - + this->value=UnitConversion(this->value,IuToExtEnum,this->enum_type); @@ -112,5 +112,5 @@ /*FUNCTION DoubleElementResult::PatchFill{{{*/ void DoubleElementResult::PatchFill(int row, Patch* patch){ - + /*Here, we fill the result information into the patch object. First, let's remember what is in a row * of the patch object: enum_type step time element_id interpolation vertices_ids nodal_values Index: /issm/trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/ElementResults/PentaP1ElementResult.cpp (revision 13622) @@ -70,5 +70,5 @@ /*FUNCTION PentaP1ElementResult::copy{{{*/ Object* PentaP1ElementResult::copy() { - + return new PentaP1ElementResult(this->enum_type,this->values,this->step,this->time); @@ -111,5 +111,5 @@ /*FUNCTION PentaP1ElementResult::ProcessUnits{{{*/ void PentaP1ElementResult::ProcessUnits(Parameters* parameters){ - + UnitConversion(this->values,6,IuToExtEnum,this->enum_type); @@ -123,5 +123,5 @@ /*FUNCTION PentaP1ElementResult::PatchFill{{{*/ void PentaP1ElementResult::PatchFill(int row, Patch* patch){ - + /*Here, we fill the result information into the patch object. First, let's remember what is in a row * of the patch object: enum_type step time element_id interpolation vertices_ids nodal_values Index: /issm/trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/ElementResults/TriaP1ElementResult.cpp (revision 13622) @@ -49,5 +49,5 @@ /*FUNCTION TriaP1ElementResult::DeepEcho{{{*/ void TriaP1ElementResult::DeepEcho(void){ - + _printLine_("TriaP1ElementResult:"); _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); @@ -69,5 +69,5 @@ /*FUNCTION TriaP1ElementResult::copy{{{*/ Object* TriaP1ElementResult::copy() { - + return new TriaP1ElementResult(this->enum_type,this->values,this->step,this->time); @@ -99,5 +99,5 @@ /*FUNCTION TriaP1ElementResult::ProcessUnits{{{*/ void TriaP1ElementResult::ProcessUnits(Parameters* parameters){ - + UnitConversion(this->values,3,IuToExtEnum,this->enum_type); @@ -111,5 +111,5 @@ /*FUNCTION TriaP1ElementResult::PatchFill{{{*/ void TriaP1ElementResult::PatchFill(int row, Patch* patch){ - + /*Here, we fill the result information into the patch object. First, let's remember what is in a row * of the patch object: enum_type step time element_id interpolation vertices_ids nodal_values Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (revision 13622) @@ -82,5 +82,5 @@ this->inputs=new Inputs(); this->results=new Results(); - + /*initialize pointers:*/ this->nodes=NULL; @@ -186,5 +186,4 @@ GaussPenta* gauss=NULL; - /* Basal friction can only be found at the base of an ice sheet: */ if (!IsOnBed() || IsFloating()){ @@ -199,5 +198,4 @@ Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - /*Build friction element, needed later: */ friction=new Friction("3d",inputs,matpar,DiagnosticHorizAnalysisEnum); @@ -216,5 +214,5 @@ count++; } - + /*Create PentaVertex input, which will hold the basal friction:*/ this->inputs->AddInput(new PentaP1Input(BasalFrictionEnum,&basalfriction[0])); @@ -257,5 +255,5 @@ /*retrieve some parameters: */ this->parameters->FindParam(&stokesreconditioning,DiagnosticStokesreconditioningEnum); - + if(!IsOnBed()){ //put zero @@ -364,5 +362,5 @@ sigma_yz[iv]=2*viscosity*epsilon[5]; } - + /*Add Stress tensor components into inputs*/ this->inputs->AddInput(new PentaP1Input(StressTensorxxEnum,&sigma_xx[0])); @@ -381,5 +379,5 @@ int analysis_counter; - + /*go into parameters and get the analysis_counter: */ parametersin->FindParam(&analysis_counter,AnalysisCounterEnum); @@ -421,5 +419,5 @@ _assert_(this->nodes && this->material && this->matpar && this->verticalneighbors && this->parameters && this->inputs); /*}}}*/ - + /*Skip if water element*/ if(IsOnWater()) return; @@ -652,5 +650,5 @@ int i; - + _printLine_("Penta:"); _printLine_(" id: " << id); @@ -1191,5 +1189,5 @@ /*FUNCTION Penta::Sid {{{*/ int Penta::Sid(){ - + return sid; @@ -1251,5 +1249,5 @@ /*Check that name is an element input*/ if (!IsInput(name)) return; - + if ((code==5) || (code==1)){ //boolean this->inputs->AddInput(new BoolInput(name,reCast(scalar))); @@ -1873,5 +1871,5 @@ penta=penta->GetUpperElement(); _assert_(penta->Id()!=this->id); } - + /*Free ressources:*/ xDelete(doflist); @@ -1897,5 +1895,5 @@ /*Add input to the element: */ this->inputs->AddInput(new PentaP1Input(enum_type,values)); - + /*Free ressources:*/ xDelete(doflist); @@ -1937,5 +1935,5 @@ penta=penta->GetUpperElement(); _assert_(penta->Id()!=this->id); } - + /*Free ressources:*/ xDelete(doflist); @@ -2170,5 +2168,5 @@ rho_ice=matpar->GetRhoIce(); density=rho_ice/rho_water; - + /*go through vertices, and update inputs, considering them to be PentaVertex type: */ for(i=0;iIsFloating() && elementonshelf==true){ @@ -2293,5 +2291,5 @@ /*recover pointer: */ count=*pcount; - + /*will be needed later: */ for(i=0;i<6;i++) vertices_ids[i]=nodes[i]->GetVertexId(); //vertices id start at column 3 of the patch. @@ -2502,5 +2500,5 @@ /*FUNCTION Penta::RequestedOutput{{{*/ void Penta::RequestedOutput(int output_enum,int step,IssmDouble time){ - + if(IsInput(output_enum)){ /*just transfer this input to results, and we are done: */ @@ -2677,5 +2675,5 @@ GetInputListOnVertices(&a_neg[0],SurfaceforcingsANegEnum); GetInputListOnVertices(&b_neg[0],SurfaceforcingsBNegEnum); - + /*Recover surface elevatio at vertices: */ GetInputListOnVertices(&h[0],ThicknessEnum); @@ -2685,5 +2683,5 @@ rho_ice=matpar->GetRhoIce(); rho_water=matpar->GetRhoFreshwater(); - + // loop over all vertices for(i=0;i(vertices_potentially_ungrounding[nodes[i]->Sid()])){ vec_nodes_on_iceshelf->SetValue(nodes[i]->Sid(),1,INS_VAL); - + /*If node was not on ice shelf, we flipped*/ if(nodes_on_iceshelf[nodes[i]->Sid()]==0){ @@ -3013,5 +3011,5 @@ for (int iv=0;ivGaussVertex(iv); - + thickness_input->GetInputValue(&thickness,gauss); @@ -3019,5 +3017,4 @@ material->GetViscosity3dStokes(&viscosity,&epsilon[0]); GetPhi(&phi, &epsilon[0], viscosity); - viscousheating[iv]=phi*thickness; @@ -3274,5 +3271,5 @@ if(IsOnWater() || !IsOnSurface()) return 0.; - + GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); @@ -3286,8 +3283,8 @@ smb_input->GetInputAverage(&smb); Total_Smb=rho_ice*base*smb;// smb on element in kg s-1 - + /*Process units: */ Total_Smb=UnitConversion(Total_Smb,IuToExtEnum,TotalSmbEnum);// smb on element in GigaTon yr-1 - + /*Return: */ return Total_Smb; @@ -3299,10 +3296,10 @@ /*FUNCTION Penta::CreateKMatrixEnthalpy {{{*/ ElementMatrix* Penta::CreateKMatrixEnthalpy(void){ - + /*compute all stiffness matrices for this element*/ ElementMatrix* Ke1=CreateKMatrixEnthalpyVolume(); ElementMatrix* Ke2=CreateKMatrixEnthalpyShelf(); ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - + /*clean-up and return*/ delete Ke1; @@ -3504,8 +3501,8 @@ gauss->GaussPoint(ig); - + GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); GetNodalFunctionsP1(&basis[0], gauss); - + D_scalar=gauss->weight*Jdet2d*rho_water*mixed_layer_capacity*thermal_exchange_velocity/(rho_ice*heatcapacity); if(reCast(dt)) D_scalar=dt*D_scalar; @@ -3516,5 +3513,5 @@ &Ke->values[0],1); } - + /*Clean up and return*/ delete gauss; @@ -3536,10 +3533,10 @@ /*FUNCTION Penta::CreateKMatrixThermal {{{*/ ElementMatrix* Penta::CreateKMatrixThermal(void){ - + /*compute all stiffness matrices for this element*/ ElementMatrix* Ke1=CreateKMatrixThermalVolume(); ElementMatrix* Ke2=CreateKMatrixThermalShelf(); ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - + /*clean-up and return*/ delete Ke1; @@ -3703,5 +3700,4 @@ ElementMatrix* Penta::CreateKMatrixThermalShelf(void){ - /*Constants*/ const int numdof=NDOF1*NUMVERTICES; @@ -3737,8 +3733,8 @@ gauss->GaussPoint(ig); - + GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0], gauss); GetNodalFunctionsP1(&basis[0], gauss); - + D_scalar=gauss->weight*Jdet2d*rho_water*mixed_layer_capacity*thermal_exchange_velocity/(heatcapacity*rho_ice); if(reCast(dt)) D_scalar=dt*D_scalar; @@ -3749,5 +3745,5 @@ &Ke->values[0],1); } - + /*Clean up and return*/ delete gauss; @@ -4409,5 +4405,5 @@ GetInputListOnVertices(&pressure[0],PressureEnum); Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); - + this->inputs->GetInputValue(&converged,ConvergedEnum); if(converged){ @@ -4418,5 +4414,5 @@ //if(waterfraction[i]>1) _error_("Water fraction >1 found in solution vector"); } - + this->inputs->AddInput(new PentaP1Input(EnthalpyEnum,values)); this->inputs->AddInput(new PentaP1Input(WaterfractionEnum,waterfraction)); @@ -4473,5 +4469,5 @@ input=(Input*)material->inputs->GetInput(MaterialsRheologyZEnum); } - + else{ input=inputs->GetInput(enum_type); @@ -5533,5 +5529,4 @@ new_input = new PentaP1Input(control_enum,values); - if(control_enum==MaterialsRheologyBbarEnum){ input=(Input*)material->inputs->GetInput(control_enum); _assert_(input); @@ -5553,5 +5548,5 @@ /*FUNCTION Penta::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type);{{{*/ void Penta::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){ - + int i,j; @@ -5580,5 +5575,5 @@ IssmDouble surface[6]; IssmDouble bed[6]; - + /*retrieve inputs: */ GetInputListOnVertices(&thickness_init[0],ThicknessEnum); @@ -5665,5 +5660,5 @@ /*FUNCTION Penta::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type);{{{*/ void Penta::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){ - + int i,j,t; TransientInput* transientinput=NULL; @@ -5679,7 +5674,7 @@ case VertexEnum: - + /*Create transient input: */ - + parameters->FindParam(&yts,ConstantsYtsEnum); @@ -5752,10 +5747,10 @@ /*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattyn{{{*/ ElementMatrix* Penta::CreateKMatrixCouplingMacAyealPattyn(void){ - + /*compute all stiffness matrices for this element*/ ElementMatrix* Ke1=CreateKMatrixCouplingMacAyealPattynViscous(); ElementMatrix* Ke2=CreateKMatrixCouplingMacAyealPattynFriction(); ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); - + /*clean-up and return*/ delete Ke1; @@ -5864,5 +5859,5 @@ const int numdof = NDOF2 *NUMVERTICES; const int numdoftotal = NDOF4 *NUMVERTICES; - + /*Intermediaries */ int i,j,ig,analysis_type; @@ -5933,5 +5928,5 @@ DL_scalar=alpha2*gauss->weight*Jdet2d; for (i=0;i<2;i++) DL[i][i]=DL_scalar; - + /* Do the triple producte tL*D*L: */ TripleMultiply( &L[0][0],2,numdof,1, @@ -6165,5 +6160,5 @@ DLStokesMacAyeal[2][2]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[0]*bed_normal[2]; DLStokesMacAyeal[3][3]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[1]*bed_normal[2]; - + TripleMultiply( &LMacAyealStokes[0][0],8,numdof2dm,1, &DLMacAyealStokes[0][0],8,8,0, @@ -6700,5 +6695,5 @@ /*Constants*/ const int numdof = NDOF2*NUMVERTICES; - + /*Intermediaries */ int i,j,ig; @@ -6751,8 +6746,8 @@ alpha2=pow((IssmDouble)10,MOUNTAINKEXPONENT); } - + DL_scalar=alpha2*gauss->weight*Jdet; for (i=0;i<2;i++) DL[i][i]=DL_scalar; - + TripleMultiply( &L[0][0],2,numdof,1, &DL[0][0],2,2,0, @@ -6926,5 +6921,5 @@ /*DO NOT Transform Coordinate System: this stiffness matrix is already expressed in tangential coordinates*/ //TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYZPEnum); - + /*Clean up and return*/ delete gauss; @@ -6935,5 +6930,5 @@ /*FUNCTION Penta::CreateKMatrixDiagnosticVert {{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticVert(void){ - + /*compute all stiffness matrices for this element*/ ElementMatrix* Ke1=CreateKMatrixDiagnosticVertVolume(); @@ -7816,5 +7811,4 @@ ElementVector* Penta::CreatePVectorDiagnosticVertBase(void){ - /*Constants*/ const int numdof=NDOF1*NUMVERTICES; @@ -8415,5 +8409,5 @@ penta=penta->GetUpperElement(); _assert_(penta->Id()!=this->id); } - + /*Free ressources:*/ xDelete(doflist); @@ -8687,5 +8681,5 @@ /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticPattyn {{{*/ void Penta::InputUpdateFromSolutionDiagnosticPattyn(IssmDouble* solution){ - + const int numdof=NDOF2*NUMVERTICES; @@ -8855,5 +8849,5 @@ /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticHutter {{{*/ void Penta::InputUpdateFromSolutionDiagnosticHutter(IssmDouble* solution){ - + const int numdof=NDOF2*NUMVERTICES; @@ -8920,5 +8914,5 @@ const int numdof=NDOF1*NUMVERTICES; - + int i; int approximation; @@ -8937,5 +8931,4 @@ int* doflist = NULL; - /*Get the approximation and do nothing if the element in Stokes or None*/ inputs->GetInputValue(&approximation,ApproximationEnum); @@ -9022,5 +9015,5 @@ /*FUNCTION Penta::InputUpdateFromSolutionDiagnosticStokes {{{*/ void Penta::InputUpdateFromSolutionDiagnosticStokes(IssmDouble* solution){ - + const int numdof=NDOF4*NUMVERTICES; @@ -9062,5 +9055,5 @@ for(i=0;iConstant(&matpar_id,MeshNumberofelementsEnum); matpar_id++; Index: /issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/PentaRef.cpp (revision 13622) @@ -699,5 +699,4 @@ IssmDouble l1l2l3[NUMNODESP1_2d]; - /*Get l1l2l3 in actual coordinate system: */ l1l2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; @@ -812,5 +811,4 @@ IssmDouble l1l2l3[NUMNODESP1_2d]; - /*Get l1l2l3 in actual coordinate system: */ l1l2l3[0]=gauss->coord1*(1-gauss->coord4)/2.0; Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 13622) @@ -42,5 +42,5 @@ :TriaRef(nummodels) ,TriaHook(nummodels,index+1,iomodel){ - + int i; /*id: */ @@ -175,5 +175,5 @@ _assert_(this->nodes && this->material && this->matpar && this->parameters && this->inputs); /*}}}*/ - + /*Skip if water element*/ if(IsOnWater()) return; @@ -499,5 +499,5 @@ gauss->GaussPoint(ig); - + GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss); D=gauss->weight*Jdet; @@ -528,5 +528,5 @@ _assert_(this->nodes && this->material && this->matpar && this->parameters && this->inputs); /*}}}*/ - + /*Skip if water element*/ if(IsOnWater()) return; @@ -691,5 +691,5 @@ /*Constants*/ const int numdof=NDOF1*NUMVERTICES; - + /*Intermediaries */ int i,j,ig; @@ -714,5 +714,5 @@ slope_input=inputs->GetInput(BedEnum); _assert_(slope_input); } - + /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); @@ -820,5 +820,5 @@ sigma_xy[iv]=2*viscosity*epsilon[2]; } - + /*Add Stress tensor components into inputs*/ this->inputs->AddInput(new TriaP1Input(StressTensorxxEnum,&sigma_xx[0])); @@ -835,5 +835,5 @@ /*FUNCTION Tria::Configure {{{*/ void Tria::Configure(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){ - + /*go into parameters and get the analysis_counter: */ int analysis_counter; @@ -894,5 +894,5 @@ _printLine_("neighboor sids: "); _printLine_(" " << horizontalneighborsids[0] << " " << horizontalneighborsids[1] << " " << horizontalneighborsids[2]); - + return; } @@ -946,5 +946,5 @@ this->parameters->FindParam(&Delta18oSurfaceLgm,SurfaceforcingsDelta18oSurfaceEnum,(finaltime-(21000*yts))); this->parameters->FindParam(&Delta18oSurfaceTime,SurfaceforcingsDelta18oSurfaceEnum,time); - + /*Compute the temperature and precipitation*/ for(int iv=0;iv0); return (x2*y3 - y2*x3 + x1*y2 - y1*x2 + x3*y1 - y3*x1)/2; @@ -1284,5 +1284,5 @@ /*FUNCTION Tria::Id {{{*/ int Tria::Id(){ - + return id; @@ -1291,5 +1291,5 @@ /*FUNCTION Tria::Sid {{{*/ int Tria::Sid(){ - + return sid; @@ -1404,5 +1404,5 @@ * object out of the input, with the additional step and time information: */ this->results->AddObject((Object*)input->SpawnResult(step,time)); - + #ifdef _HAVE_CONTROL_ if(input->ObjectEnum()==ControlInputEnum){ @@ -1452,5 +1452,5 @@ IssmDouble yts; int num_cm_responses; - + /*Get parameters: */ iomodel->Constant(&yts,ConstantsYtsEnum); @@ -1719,5 +1719,5 @@ /*Check that name is an element input*/ if (!IsInput(name)) return; - + if ((code==5) || (code==1)){ //boolean this->inputs->AddInput(new BoolInput(name,reCast(scalar))); @@ -1746,5 +1746,4 @@ int numberofelements; IssmDouble yts; - /*Fetch parameters: */ @@ -1861,5 +1860,5 @@ /*FUNCTION Tria::IsOnBed {{{*/ bool Tria::IsOnBed(){ - + bool onbed; inputs->GetInputValue(&onbed,MeshElementonbedEnum); @@ -1984,5 +1983,5 @@ rho_ice=matpar->GetRhoIce(); density=rho_ice/rho_water; - + /*go through vertices, and update inputs, considering them to be TriaVertex type: */ for(i=0;iIsFloating() && elementonshelf==true){ @@ -2081,5 +2080,5 @@ /*recover pointer: */ row=*prow; - + for(i=0;i<3;i++) vertices_ids[i]=nodes[i]->GetVertexId(); //vertices id start at column 3 of the patch. @@ -2283,5 +2282,5 @@ GetInputListOnVertices(&a_neg[0],SurfaceforcingsANegEnum); GetInputListOnVertices(&b_neg[0],SurfaceforcingsBNegEnum); - + /*Recover surface elevatio at vertices: */ GetInputListOnVertices(&h[0],ThicknessEnum); @@ -2291,5 +2290,5 @@ rho_ice=matpar->GetRhoIce(); rho_water=matpar->GetRhoFreshwater(); - + // loop over all vertices for(i=0;i(vertices_potentially_ungrounding[nodes[i]->Sid()])){ vec_nodes_on_iceshelf->SetValue(nodes[i]->Sid(),1,INS_VAL); - + /*If node was not on ice shelf, we flipped*/ if(nodes_on_iceshelf[nodes[i]->Sid()]==0){ @@ -2849,8 +2848,8 @@ smb_input->GetInputAverage(&smb); // average smb on element in m ice s-1 Total_Smb=rho_ice*base*smb; // smb on element in kg s-1 - + /*Process units: */ Total_Smb=UnitConversion(Total_Smb,IuToExtEnum,TotalSmbEnum); // smb on element in GigaTon yr-1 - + /*Return: */ return Total_Smb; @@ -2867,5 +2866,5 @@ ElementMatrix* Ke2=CreateKMatrixDiagnosticMacAyealFriction(); ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); - + /*clean-up and return*/ delete Ke1; @@ -2991,5 +2990,5 @@ DL_scalar=alpha2*gauss->weight*Jdet; for (i=0;i<2;i++) DL[i][i]=DL_scalar; - + TripleMultiply( &L[0][0],2,numdof,1, &DL[0][0],2,2,0, @@ -3278,5 +3277,5 @@ /*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHoriz {{{*/ void Tria::InputUpdateFromSolutionDiagnosticHoriz(IssmDouble* solution){ - + const int numdof=NDOF2*NUMVERTICES; @@ -3291,5 +3290,5 @@ IssmDouble pressure[NUMVERTICES]; IssmDouble thickness[NUMVERTICES]; - + /*Get dof list: */ GetDofList(&doflist,NoneApproximationEnum,GsetEnum); @@ -3341,7 +3340,7 @@ /*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHutter {{{*/ void Tria::InputUpdateFromSolutionDiagnosticHutter(IssmDouble* solution){ - + const int numdof=NDOF2*NUMVERTICES; - + int i; int* doflist=NULL; @@ -3354,5 +3353,5 @@ IssmDouble pressure[NUMVERTICES]; IssmDouble thickness[NUMVERTICES]; - + /*Get dof list: */ GetDofList(&doflist,NoneApproximationEnum,GsetEnum); @@ -3800,5 +3799,5 @@ /*Build alpha_complement_list: */ friction->GetAlphaComplement(&alpha_complement, gauss,VxEnum,VyEnum,VzEnum); - + dragcoefficient_input->GetInputValue(&drag, gauss); adjointx_input->GetInputValue(&lambda, gauss); @@ -3812,5 +3811,5 @@ grade_g_gaussian[i]=-2*drag*alpha_complement*((lambda*vx+mu*vy))*Jdet*gauss->weight*basis[i]; } - + /*Add gradje_g_gaussian vector to gradje_g: */ for(i=0;iGetInputDerivativeValue(&Dlambda[0],&xyz_list[0][0],gauss); thickness_input->GetInputValue(&thickness, gauss); @@ -4197,5 +4196,5 @@ Input* vxobs_input =inputs->GetInput(InversionVxObsEnum); _assert_(vxobs_input); Input* vyobs_input =inputs->GetInput(InversionVyObsEnum); _assert_(vyobs_input); - + /* Start looping on the number of gaussian points: */ gauss=new GaussTria(4); @@ -5303,5 +5302,5 @@ /* compute VelocityFactor */ VelocityFactor= n_man*CR*CR*rho_water*g/mu_water; - + gauss=new GaussTria(); for (int iv=0;ivvalues[i]+=Jdettria*gauss->weight*basal_melting_g*basis[i]; } - + /*Clean up and return*/ delete gauss; @@ -5548,5 +5547,5 @@ /*FUNCTION Tria::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type);{{{*/ void Tria::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){ - + int i,j; @@ -5574,5 +5573,5 @@ IssmDouble surface[3]; IssmDouble bed[3]; - + /*retrieve inputs: */ GetInputListOnVertices(&thickness_init[0],ThicknessEnum); @@ -5647,5 +5646,5 @@ /*FUNCTION Tria::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type);{{{*/ void Tria::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){ - + int i,j,t; TransientInput* transientinput=NULL; @@ -5661,7 +5660,7 @@ case VertexEnum: - + /*Create transient input: */ - + parameters->FindParam(&yts,ConstantsYtsEnum); for(t=0;tGetInput(BasalforcingsMeltingRateEnum); _assert_(basal_melting_input); Input* dhdt_input=inputs->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input); - + /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); Index: /issm/trunk-jpl/src/c/classes/objects/Elements/TriaHook.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/TriaHook.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/TriaHook.cpp (revision 13622) @@ -50,5 +50,5 @@ /*retrieve parameters: */ iomodel->Constant(&matpar_id,MeshNumberofelementsEnum); matpar_id++; - + this->numanalyses=in_numanalyses; this->hnodes= new Hook*[in_numanalyses]; Index: /issm/trunk-jpl/src/c/classes/objects/Elements/TriaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/TriaRef.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/TriaRef.cpp (revision 13622) @@ -319,5 +319,4 @@ y3=*(xyz_list+NUMNODES*2+1); - *(J+NDOF2*0+0)=0.5*(x2-x1); *(J+NDOF2*1+0)=SQRT3/6.0*(2*x3-x1-x2); Index: /issm/trunk-jpl/src/c/classes/objects/IndependentObject.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/IndependentObject.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/IndependentObject.cpp (revision 13622) @@ -77,5 +77,4 @@ } /*}}}*/ - /*IndependentObject methods: */ /*FUNCTION IndependentObject::FetchIndependent{{{*/ @@ -84,10 +83,10 @@ int my_rank; FILE* fid=NULL; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); #ifdef _HAVE_ADOLC_ //cannot come here unless you are running AD mode, from DeclaredIndependents: - + /*Branch according to the type of variable: */ if(type==0){ /*scalar: {{{*/ @@ -111,9 +110,8 @@ /*Now, before we even broadcast this to other nodes, declare the scalar as an independent variable!: */ scalar<<=pscalar; - + #ifdef _HAVE_MPI_ MPI_Bcast(&scalar,1,MPI_DOUBLE,0,IssmComm::GetComm()); #endif - /*Ok, we are almost done. scalar is now an independent variable. We don't want this variable to be fetched again in the @@ -122,12 +120,11 @@ space for it: */ scalar_slot=xNew(1); *scalar_slot=scalar; - + iomodel->data[name]=scalar_slot; iomodel->independents[name]=true; - } /*}}}*/ else if(type==1){ /* vector: {{{*/ - + FILE* fid=NULL; int M,N; @@ -136,9 +133,9 @@ int code=0; int vector_type=0; - + /*Set file pointer to beginning of the data: */ fid=iomodel->SetFilePointerToData(&code,&vector_type,name); if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(name)); - + /*We have to read a matrix from disk. First read the dimensions of the matrix, then the whole matrix: */ /*numberofelements: */ @@ -165,5 +162,5 @@ if(my_rank==0){ if(fread(buffer,M*N*sizeof(IssmPDouble),1,fid)!=1) _error_("could not read matrix "); - + /*Now, before we even broadcast this to other nodes, declare the whole matrix as a independent variable!: */ for (int i=0;i(buffer); } @@ -205,5 +202,5 @@ int i; - + /*Branch according to the type of variable: */ if(type==0){ /*scalar:*/ Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/BoolInput.cpp (revision 13622) @@ -62,10 +62,10 @@ /*FUNCTION BoolInput::copy{{{*/ Object* BoolInput::copy() { - + return new BoolInput(this->enum_type,this->value); } /*}}}*/ - + /*BoolInput management*/ /*FUNCTION BoolInput::InstanceEnum{{{*/ @@ -93,5 +93,5 @@ /*FUNCTION BoolInput::SpawnResult{{{*/ ElementResult* BoolInput::SpawnResult(int step, IssmDouble time){ - + return new BoolElementResult(this->enum_type,this->value,step,time); Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/ControlInput.cpp (revision 13622) @@ -93,5 +93,5 @@ /*FUNCTION ControlInput::copy{{{*/ Object* ControlInput::copy() { - + ControlInput* output=NULL; @@ -109,5 +109,5 @@ } /*}}}*/ - + /*ControlInput management*/ /*FUNCTION ControlInput::InstanceEnum{{{*/ Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/DatasetInput.cpp (revision 13622) @@ -64,5 +64,5 @@ /*FUNCTION DatasetInput::copy{{{*/ Object* DatasetInput::copy() { - + DatasetInput* output=NULL; @@ -89,5 +89,5 @@ } /*}}}*/ - + /*DatasetInput management*/ /*FUNCTION DatasetInput::InstanceEnum{{{*/ @@ -111,5 +111,5 @@ if(index<0 || index > inputs->Size()-1) _error_("index requested (" << index << ") exceeds dataset size (" << inputs->Size() << ")"); Input* input=(Input*)this->inputs->GetObjectByOffset(index); - + input->GetInputValue(pvalue,gauss); } Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/DoubleInput.cpp (revision 13622) @@ -62,10 +62,10 @@ /*FUNCTION DoubleInput::copy{{{*/ Object* DoubleInput::copy() { - + return new DoubleInput(this->enum_type,this->value); } /*}}}*/ - + /*DoubleInput management*/ /*FUNCTION DoubleInput::InstanceEnum{{{*/ Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/IntInput.cpp (revision 13622) @@ -57,5 +57,5 @@ /*FUNCTION IntInput::copy{{{*/ Object* IntInput::copy() { - + return new IntInput(this->enum_type,this->value); @@ -92,5 +92,5 @@ /*FUNCTION IntInput::SpawnResult{{{*/ ElementResult* IntInput::SpawnResult(int step, IssmDouble time){ - + _error_("not supported yet!"); Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/PentaP1Input.cpp (revision 13622) @@ -71,9 +71,9 @@ } /*}}}*/ - + /*PentaP1Input management*/ /*FUNCTION PentaP1Input::copy{{{*/ Object* PentaP1Input::copy() { - + return new PentaP1Input(this->enum_type,this->values); @@ -357,5 +357,5 @@ /*FUNCTION PentaP1Input::ConstrainMin{{{*/ void PentaP1Input::ConstrainMin(IssmDouble minimum){ - + int i; const int numnodes=6; @@ -425,5 +425,5 @@ /*FUNCTION PentaP1Input::Scale{{{*/ void PentaP1Input::Scale(IssmDouble scale_factor){ - + int i; const int numnodes=6; @@ -464,5 +464,5 @@ int i; const int numnodes=6; - + if(!xIsNan(cm_min)) for(i=0;ivalues[i]values[i]=cm_min; if(!xIsNan(cm_max)) for(i=0;ivalues[i]>cm_max)this->values[i]=cm_max; Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 13622) @@ -103,5 +103,5 @@ } /*}}}*/ - + /*TransientInput management*/ /*FUNCTION TransientInput::InstanceEnum{{{*/ @@ -216,5 +216,5 @@ /*Retrieve interpolated values for this time step: */ Input* input=GetTimeInput(time); - + /*Call input function*/ input->GetInputDerivativeValue(p,xyz_list,gauss); @@ -231,5 +231,5 @@ /*FUNCTION TransientInput::GetInputAverage{{{*/ void TransientInput::GetInputAverage(IssmDouble* pvalue){ - + IssmDouble time; @@ -242,5 +242,5 @@ /*Call input function*/ input->GetInputAverage(pvalue); - + delete input; @@ -296,8 +296,8 @@ /*Retrieve interpolated values for this time step: */ Input* input=GetTimeInput(time); - + /*Call input function*/ input->SquareMin(psquaremin,process_units,parameters); - + delete input; @@ -318,5 +318,5 @@ /*Call input function*/ infnorm=input->InfinityNorm(); - + /*Clean-up and return*/ delete input; @@ -335,8 +335,8 @@ /*Retrieve interpolated values for this time step: */ Input* input=GetTimeInput(time); - + /*Call input function*/ max=input->Max(); - + delete input; @@ -400,5 +400,5 @@ /*Call input function*/ minabs=input->MinAbs(); - + /*Clean-up and return*/ delete input; @@ -416,8 +416,8 @@ /*Retrieve interpolated values for this time step: */ Input* input=GetTimeInput(time); - + /*Call input function*/ input->GetVectorFromInputs(vector,doflist); - + delete input; @@ -430,9 +430,9 @@ int found; int offset; - + Input *input = NULL; Input *input1 = NULL; Input *input2 = NULL; - + /*go through the timesteps, and figure out which interval we *fall within. Then interpolate the values on this interval: */ Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 13622) @@ -73,10 +73,10 @@ /*FUNCTION TriaP1Input::copy{{{*/ Object* TriaP1Input::copy() { - + return new TriaP1Input(this->enum_type,this->values); } /*}}}*/ - + /*TriaP1Input management*/ /*FUNCTION TriaP1Input::InstanceEnum{{{*/ @@ -208,5 +208,5 @@ /*FUNCTION TriaP1Input::ContrainMin{{{*/ void TriaP1Input::ConstrainMin(IssmDouble minimum){ - + int i; const int numnodes=3; @@ -276,5 +276,5 @@ /*FUNCTION TriaP1Input::Scale{{{*/ void TriaP1Input::Scale(IssmDouble scale_factor){ - + int i; const int numnodes=3; @@ -327,5 +327,5 @@ int i; const int numnodes=3; - + if(!xIsNan(cm_min)) for(i=0;ivalues[i]values[i]=cm_min; if(!xIsNan(cm_max)) for(i=0;ivalues[i]>cm_max)this->values[i]=cm_max; Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Document.cpp (revision 13622) @@ -125,3 +125,2 @@ } /*}}}*/ - Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_LatLonBox.cpp (revision 13622) @@ -43,5 +43,4 @@ /*FUNCTION KML_LatLonBox::Echo {{{*/ void KML_LatLonBox::Echo(){ - _printLine_("KML_LatLonBox:"); Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Polygon.cpp (revision 13622) @@ -250,5 +250,4 @@ } - else if (!strncmp(kstri,"<",1)) KML_Geometry::Read(fid,kstri); Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_StyleSelector.cpp (revision 13622) @@ -93,3 +93,2 @@ } /*}}}*/ - Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_SubStyle.cpp (revision 13622) @@ -93,3 +93,2 @@ } /*}}}*/ - Index: /issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/KML/KML_Unknown.cpp (revision 13622) @@ -79,8 +79,8 @@ valuei=xNew(strlen(value)+1); memcpy(valuei,value,(strlen(value)+1)*sizeof(char)); - + vtoken=strtok(valuei,nl); if(flag) _pprintString_(indent << " value: \"" << vtoken); - + while (vtoken=strtok(NULL,nl)) if(flag) _pprintString_("\n" << indent << " " << vtoken); @@ -110,8 +110,8 @@ valuei=xNew(strlen(value)+1); memcpy(valuei,value,(strlen(value)+1)*sizeof(char)); - + vtoken=strtok(valuei,nl); fprintf(filout,"%s %s\n",indent,vtoken); - + while (vtoken=strtok(NULL,nl)) fprintf(filout,"%s %s\n",indent,vtoken); Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp (revision 13622) @@ -52,5 +52,5 @@ int icefront_node_ids[NUMVERTICESQUA]; //initialize with largest size int icefront_fill; - + /*find parameters: */ iomodel->Constant(&dim,MeshDimensionEnum); @@ -90,5 +90,5 @@ /*Fill*/ icefront_fill=reCast(iomodel->Data(DiagnosticIcefrontEnum)[segment_width*i+segment_width-1]); - + /*Ok, we have everything to build the object: */ this->id=icefront_id; @@ -104,5 +104,5 @@ this->inputs->AddInput(new IntInput(FillEnum,icefront_fill)); this->inputs->AddInput(new IntInput(TypeEnum,in_icefront_type)); - + //parameters and hooked fields: we still can't point to them, they may not even exist. Configure will handle this. this->parameters=NULL; @@ -111,5 +111,4 @@ this->matpar= NULL; } - /*}}}*/ @@ -166,5 +165,5 @@ /*FUNCTION Icefront::copy {{{*/ Object* Icefront::copy() { - + Icefront* icefront=NULL; @@ -666,5 +665,4 @@ int* doflist=NULL; - /*recover type: */ inputs->GetInputValue(&type,TypeEnum); @@ -672,5 +670,5 @@ /*Some checks for debugging*/ _assert_(nodes); - + /*How many nodes? :*/ if(type==MacAyeal2dIceFrontEnum || type==MacAyeal3dIceFrontEnum) @@ -678,5 +676,5 @@ else numberofnodes=4; - + /*Figure out size of doflist: */ for(i=0;iDeepEcho(); - + } /*}}}*/ @@ -192,5 +192,5 @@ /*FUNCTION Numericalflux::copy {{{*/ Object* Numericalflux::copy() { - + Numericalflux* numericalflux=NULL; @@ -404,5 +404,5 @@ for(i=0;ivalues[i*numdof+j]+=Ke_g2[i][j]; } - + /*Clean up and return*/ delete gauss; Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp (revision 13622) @@ -19,5 +19,5 @@ #include "../../../Container/Container.h" /*}}}*/ - + /*Element macros*/ #define NUMVERTICES 1 @@ -34,5 +34,5 @@ this->hmatpar=NULL; this->matpar=NULL; - + /*not active, not zigzagging: */ active=0; @@ -64,5 +64,5 @@ this->id=id; this->analysis_type=in_analysis_type; - + /*hooks: */ pengrid_node_id=iomodel->nodecounter+index+1; @@ -99,5 +99,5 @@ } /*}}}*/ - + /*Object virtual functions definitions:*/ /*FUNCTION Pengrid::Echo {{{*/ @@ -134,5 +134,5 @@ /*FUNCTION Icefront::copy {{{*/ Object* Pengrid::copy() { - + Pengrid* pengrid=NULL; @@ -395,5 +395,5 @@ /*recover pointers: */ Penta* penta=(Penta*)element; - + /*check that pengrid is not a clone (penalty to be added only once)*/ if (node->IsClone()){ @@ -409,5 +409,5 @@ //Recover our data: parameters->FindParam(&penalty_lock,ThermalPenaltyLockEnum); - + //Compute pressure melting point t_pmp=matpar->TMeltingPoint(pressure); @@ -421,5 +421,4 @@ new_active=0; } - //Figure out stability of this penalty @@ -450,5 +449,5 @@ /*FUNCTION Pengrid::PenaltyCreateKMatrixDiagnosticStokes {{{*/ ElementMatrix* Pengrid::PenaltyCreateKMatrixDiagnosticStokes(IssmDouble kmax){ - + const int numdof = NUMVERTICES *NDOF4; IssmDouble slope[2]; @@ -499,5 +498,5 @@ penta->GetInputValue(&temperature,node,TemperatureEnum); parameters->FindParam(&penalty_factor,ThermalPenaltyFactorEnum); - + /*Compute pressure melting point*/ t_pmp=matpar->GetMeltingPoint()-matpar->GetBeta()*pressure; @@ -533,5 +532,5 @@ /*FUNCTION Pengrid::PenaltyCreatePVectorMelting {{{*/ ElementVector* Pengrid::PenaltyCreatePVectorMelting(IssmDouble kmax){ - + const int numdof=NUMVERTICES*NDOF1; IssmDouble pressure; Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Penpair.cpp (revision 13622) @@ -34,5 +34,5 @@ /*FUNCTION Penpair::creation {{{*/ Penpair::Penpair(int penpair_id, int* penpair_node_ids,int in_analysis_type){ - + this->id=penpair_id; this->analysis_type=in_analysis_type; @@ -40,5 +40,5 @@ this->parameters=NULL; this->nodes=NULL; - + return; } @@ -61,5 +61,5 @@ _printLine_(" analysis_type: " << EnumToStringx(analysis_type)); hnodes->Echo(); - + return; } @@ -87,5 +87,5 @@ /*FUNCTION Penpair::copy {{{*/ Object* Penpair::copy() { - + Penpair* penpair=NULL; @@ -107,5 +107,5 @@ } /*}}}*/ - + /*Load virtual functions definitions:*/ /*FUNCTION Penpair::Configure {{{*/ @@ -264,5 +264,5 @@ /*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticMacAyealPattyn {{{*/ ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticMacAyealPattyn(IssmDouble kmax){ - + const int numdof=NUMVERTICES*NDOF2; IssmDouble penalty_offset; @@ -291,5 +291,5 @@ /*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticStokes {{{*/ ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticStokes(IssmDouble kmax){ - + const int numdof=NUMVERTICES*NDOF4; IssmDouble penalty_offset; @@ -311,5 +311,5 @@ Ke->values[5*numdof+1]=-kmax*pow((IssmDouble)10.0,penalty_offset); Ke->values[5*numdof+5]=+kmax*pow((IssmDouble)10.0,penalty_offset); - + Ke->values[2*numdof+2]=+kmax*pow((IssmDouble)10.0,penalty_offset); Ke->values[2*numdof+6]=-kmax*pow((IssmDouble)10.0,penalty_offset); Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp (revision 13622) @@ -97,5 +97,5 @@ //intialize inputs, and add as many inputs per element as requested: this->inputs=new Inputs(); - + riftfront_type=SegmentRiftfrontEnum; riftfront_fill = reCast(*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+7)); @@ -109,5 +109,5 @@ this->inputs->AddInput(new DoubleInput(FractionIncrementEnum,riftfront_fractionincrement)); this->inputs->AddInput(new BoolInput(SegmentOnIceShelfEnum,riftfront_shelf)); - + //parameters and hooked fields: we still can't point to them, they may not even exist. Configure will handle this. this->parameters=NULL; @@ -115,5 +115,5 @@ this->elements= NULL; this->matpar= NULL; - + } /*}}}*/ @@ -137,5 +137,4 @@ IssmDouble friction,fractionincrement; - /*recover some inputs first: */ input=(Input*)this->inputs->GetInput(FillEnum); input->GetInputValue(&fill); @@ -165,5 +164,5 @@ _printLine_(" state: " << state); _printLine_(" frozen: " << (frozen ? "true":"false")); - + } /*}}}*/ @@ -195,5 +194,5 @@ /*FUNCTION Riftfront::copy {{{*/ Object* Riftfront::copy() { - + Riftfront* riftfront=NULL; @@ -234,10 +233,10 @@ riftfront->length=this->length; riftfront->fraction=this->fraction; - + return riftfront; } /*}}}*/ - + /*Update virtual functions definitions:*/ /*FUNCTION Riftfront::InputUpdateFromConstant(bool constant,int name) {{{*/ @@ -275,5 +274,4 @@ } /*}}}*/ - /*Load virtual functions definitions:*/ @@ -596,10 +594,9 @@ if(this->state==OpenEnum)this->active=0; if(this->state==ClosedEnum)this->active=1; - + /*this segment is like frozen, no instability here: */ *punstable=0; return 1; } - /*recover parameters: */ @@ -723,5 +720,5 @@ /*If we are zigzag locked, same thing: */ if(this->counter>this->penalty_lock)penetration=-1; - + /*assign output pointer: */ *ppenetration=penetration; @@ -762,5 +759,5 @@ /*Now, we return penetration only if we are active!: */ if(this->active==0)penetration=0; - + /*assign output pointer: */ *ppenetration=penetration; @@ -770,5 +767,4 @@ /*FUNCTION Riftfront::PotentialUnstableConstraint {{{*/ int Riftfront::PotentialUnstableConstraint(int* punstable){ - const int numnodes = 2; Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matdamageice.cpp (revision 13622) @@ -15,5 +15,5 @@ #include "../../../shared/shared.h" #include "../../../include/include.h" - + /*Matdamageice constructors and destructor*/ /*FUNCTION Matdamageice::Matdamageice(){{{*/ @@ -299,5 +299,5 @@ * return g, initial viscosity. */ - + /*output: */ IssmDouble viscosity3d; @@ -341,5 +341,5 @@ else{ e=(n-1)/2/n; - + viscosity3d=B/(2*pow(A,e)); } @@ -370,5 +370,5 @@ * return g, initial viscosity. */ - + /*output: */ IssmDouble viscosity3d; @@ -387,5 +387,5 @@ Z=GetZ(); B=Z*GetB(); - + if (n==1){ /*Viscous behaviour! viscosity3d=B: */ @@ -440,5 +440,5 @@ * return mu20, initial viscosity. */ - + /*output: */ IssmDouble viscosity_complement; @@ -468,5 +468,5 @@ else{ e=(n-1)/(2*n); - + viscosity_complement=1/(2*pow(A,e)); } @@ -480,5 +480,5 @@ _assert_(n>0); _assert_(viscosity_complement>0); - + /*Return: */ *pviscosity_complement=viscosity_complement; @@ -496,5 +496,5 @@ * return mu20, initial viscosity. */ - + /*output: */ IssmDouble viscosity_complement; @@ -524,5 +524,5 @@ else{ e=(n-1)/(2*n); - + viscosity_complement=B/(2*pow(A,e)); } @@ -536,5 +536,5 @@ _assert_(n>0); _assert_(viscosity_complement>0); - + /*Return: */ *pviscosity_complement=viscosity_complement; @@ -700,6 +700,4 @@ default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); } - - } Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matice.cpp (revision 13622) @@ -15,5 +15,5 @@ #include "../../../shared/shared.h" #include "../../../include/include.h" - + /*Matice constructors and destructor*/ /*FUNCTION Matice::Matice(){{{*/ @@ -277,5 +277,5 @@ * return g, initial viscosity. */ - + /*output: */ IssmDouble viscosity3d; @@ -318,5 +318,5 @@ else{ e=(n-1)/2/n; - + viscosity3d=B/(2*pow(A,e)); } @@ -347,5 +347,5 @@ * return g, initial viscosity. */ - + /*output: */ IssmDouble viscosity3d; @@ -363,5 +363,5 @@ B=GetB(); n=GetN(); - + if (n==1){ /*Viscous behaviour! viscosity3d=B: */ @@ -416,5 +416,5 @@ * return mu20, initial viscosity. */ - + /*output: */ IssmDouble viscosity_complement; @@ -444,5 +444,5 @@ else{ e=(n-1)/(2*n); - + viscosity_complement=1/(2*pow(A,e)); } @@ -456,5 +456,5 @@ _assert_(n>0); _assert_(viscosity_complement>0); - + /*Return: */ *pviscosity_complement=viscosity_complement; @@ -621,6 +621,4 @@ } - - } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 13622) @@ -15,5 +15,5 @@ #include "../../../include/include.h" #include "../../../EnumDefinitions/EnumDefinitions.h" - + /*Matpar constructors and destructor*/ /*FUNCTION Matpar::Matpar() {{{*/ @@ -39,5 +39,5 @@ iomodel->Constant(&this->thermal_exchange_velocity,MaterialsThermalExchangeVelocityEnum); iomodel->Constant(&this->g,ConstantsGEnum); - + iomodel->Constant(&this->hydro_CR,HydrologyCREnum); iomodel->Constant(&this->kn,HydrologyKnEnum); @@ -244,5 +244,5 @@ /*FUNCTION Matpar::GetRhoIce {{{*/ IssmDouble Matpar::GetRhoIce(){ - + return rho_ice; } @@ -323,5 +323,5 @@ /*Ouput*/ IssmDouble temperature,waterfraction; - + if(enthalpyindexing.gsize;i++) outdoflist[i]=indexing.gdoflist[i]; @@ -294,5 +292,5 @@ int count=0; int count2=0; - + if(approximation_enum==NoneApproximationEnum){ if(setenum==GsetEnum)for(i=0;iindexing.gsize;i++) outdoflist[i]=i; @@ -468,5 +466,5 @@ /*g set: */ pv_g->SetValue(indexing.gdoflist[i],gvalue,INS_VAL); - + /*f set: */ value=(IssmDouble)this->indexing.f_set[i]; @@ -478,5 +476,4 @@ } - } @@ -500,5 +497,5 @@ } } - + /*Add values into constraint vector: */ ys->SetValues(this->indexing.ssize,this->indexing.sdoflist,values,INS_VAL); @@ -508,5 +505,4 @@ xDelete(values); - } /*}}}*/ @@ -533,5 +529,5 @@ /*FUNCTION Node::FreezeDof{{{*/ void Node::FreezeDof(int dof){ - + DofInSSet(dof-1); //with 0 displacement for this dof. @@ -562,5 +558,5 @@ /*Get number of degrees of freedom in a node, for a certain set (g,f or s-set) *and for a certain approximation type: */ - + int i; int numdofs=0; @@ -639,5 +635,5 @@ /*FUNCTION Node::IsClone {{{*/ int Node::IsClone(){ - + return indexing.clone; @@ -668,5 +664,5 @@ /*FUNCTION Node::IsFloating {{{*/ int Node::IsFloating(){ - + bool onshelf; @@ -872,5 +868,5 @@ if(setenum==FsetEnum) this->indexing.InitSet(setenum); if(setenum==SsetEnum) this->indexing.InitSet(setenum); - + /*For clone nodfs, don't distribute dofs, we will get them from another cpu in UpdateCloneDofs!*/ if(indexing.clone){ @@ -905,7 +901,7 @@ /*FUNCTION Node::OffsetDofs{{{*/ void Node::OffsetDofs(int dofcount,int setenum){ - + int i; - + if(indexing.clone){ /*This node is a clone, don't off_set the dofs!: */ @@ -980,5 +976,5 @@ int my_rank; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); Index: /issm/trunk-jpl/src/c/classes/objects/Params/BoolParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/BoolParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/BoolParam.cpp (revision 13622) @@ -65,5 +65,5 @@ /*FUNCTION BoolParam::copy{{{*/ Object* BoolParam::copy() { - + return new BoolParam(this->enum_type,this->value); Index: /issm/trunk-jpl/src/c/classes/objects/Params/DataSetParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DataSetParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DataSetParam.cpp (revision 13622) @@ -66,5 +66,5 @@ /*FUNCTION DataSetParam::copy{{{*/ Object* DataSetParam::copy() { - + return new DataSetParam(this->enum_type,this->value); Index: /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatArrayParam.cpp (revision 13622) @@ -77,5 +77,5 @@ xDelete(matrix); } - + xDelete(array); return; @@ -100,5 +100,5 @@ int m,n; IssmDouble* matrix=NULL; - + _printLine_("DoubleMatArrayParam:"); _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); @@ -130,5 +130,5 @@ /*FUNCTION DoubleMatArrayParam::copy{{{*/ Object* DoubleMatArrayParam::copy() { - + return new DoubleMatArrayParam(this->enum_type,this->array, this->M, this->mdim_array,this->ndim_array); @@ -150,5 +150,4 @@ int* out_ndim_array=NULL; - out_M=this->M; if(out_M){ @@ -181,5 +180,4 @@ } - /*Assign output pointers:*/ if(pout_M) *pout_M=out_M; @@ -216,5 +214,5 @@ this->mdim_array=xNew(M); this->ndim_array=xNew(M); - + xMemCpy(this->mdim_array,in_mdim_array,M); xMemCpy(this->ndim_array,in_ndim_array,M); Index: /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DoubleMatParam.cpp (revision 13622) @@ -58,5 +58,5 @@ int i,j; - + _printLine_("DoubleMatParam:"); _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); @@ -81,5 +81,5 @@ /*FUNCTION DoubleMatParam::copy{{{*/ Object* DoubleMatParam::copy() { - + return new DoubleMatParam(this->enum_type,this->value,this->M,this->N); Index: /issm/trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DoubleParam.cpp (revision 13622) @@ -62,5 +62,5 @@ /*FUNCTION DoubleParam::copy{{{*/ Object* DoubleParam::copy() { - + return new DoubleParam(this->enum_type,this->value); Index: /issm/trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/DoubleVecParam.cpp (revision 13622) @@ -57,5 +57,5 @@ int i; - + _printLine_("DoubleVecParam:"); _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); @@ -78,5 +78,5 @@ /*FUNCTION DoubleVecParam::copy{{{*/ Object* DoubleVecParam::copy() { - + return new DoubleVecParam(this->enum_type,this->values,this->M); Index: /issm/trunk-jpl/src/c/classes/objects/Params/FileParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/FileParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/FileParam.cpp (revision 13622) @@ -65,5 +65,5 @@ /*FUNCTION FileParam::copy{{{*/ Object* FileParam::copy() { - + return new FileParam(this->enum_type,this->value); Index: /issm/trunk-jpl/src/c/classes/objects/Params/IntMatParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/IntMatParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/IntMatParam.cpp (revision 13622) @@ -58,5 +58,5 @@ int i,j; - + _printLine_("IntMatParam:"); _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); @@ -81,5 +81,5 @@ /*FUNCTION IntMatParam::copy{{{*/ Object* IntMatParam::copy() { - + return new IntMatParam(this->enum_type,this->value,this->M,this->N); Index: /issm/trunk-jpl/src/c/classes/objects/Params/IntParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/IntParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/IntParam.cpp (revision 13622) @@ -65,5 +65,5 @@ /*FUNCTION IntParam::copy{{{*/ Object* IntParam::copy() { - + return new IntParam(this->enum_type,this->value); Index: /issm/trunk-jpl/src/c/classes/objects/Params/IntVecParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/IntVecParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/IntVecParam.cpp (revision 13622) @@ -73,5 +73,5 @@ int i; - + _printLine_("IntVecParam:"); _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); @@ -94,5 +94,5 @@ /*FUNCTION IntVecParam::copy{{{*/ Object* IntVecParam::copy() { - + return new IntVecParam(this->enum_type,this->values,this->M); Index: /issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/MatrixParam.cpp (revision 13622) @@ -73,5 +73,5 @@ /*FUNCTION MatrixParam::copy{{{*/ Object* MatrixParam::copy() { - + return new MatrixParam(this->enum_type,this->value); @@ -97,8 +97,8 @@ /*FUNCTION MatrixParam::SetValue{{{*/ void MatrixParam::SetValue(Matrix* matrix){ - + /*avoid leak: */ xdelete(&value); - + /*copy: */ value=matrix->Duplicate(); Index: /issm/trunk-jpl/src/c/classes/objects/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/StringArrayParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/StringArrayParam.cpp (revision 13622) @@ -46,12 +46,12 @@ } else value=NULL; - + } /*}}}*/ /*FUNCTION StringArrayParam::~StringArrayParam(){{{*/ StringArrayParam::~StringArrayParam(){ - + int i; - + char* string=NULL; for(i=0;inumstrings;i++){ @@ -95,5 +95,5 @@ /*FUNCTION StringArrayParam::copy{{{*/ Object* StringArrayParam::copy() { - + return new StringArrayParam(this->enum_type,this->value,this->numstrings); @@ -104,5 +104,5 @@ /*FUNCTION StringArrayParam::GetParameterValue{{{*/ void StringArrayParam::GetParameterValue(char*** pstringarray,int* pM){ - + int i; char** outstrings=NULL; @@ -140,5 +140,5 @@ /*FUNCTION StringArrayParam::SetValue{{{*/ void StringArrayParam::SetValue(char** stringarray,int M){ - + int i; char *string = NULL; Index: /issm/trunk-jpl/src/c/classes/objects/Params/StringParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/StringParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/StringParam.cpp (revision 13622) @@ -33,5 +33,4 @@ xMemCpy(value,in_value,(strlen(in_value)+1)); - } /*}}}*/ @@ -67,5 +66,5 @@ /*FUNCTION StringParam::copy{{{*/ Object* StringParam::copy() { - + return new StringParam(this->enum_type,this->value); @@ -76,5 +75,5 @@ /*FUNCTION StringParam::GetParameterValue{{{*/ void StringParam::GetParameterValue(char** pstring){ - + char* outstring=NULL; int stringsize; @@ -96,7 +95,7 @@ /*FUNCTION StringParam::SetValue{{{*/ void StringParam::SetValue(char* string){ - + int stringsize; - + /*avoid leak: */ xDelete(this->value); Index: /issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/TransientParam.cpp (revision 13622) @@ -62,5 +62,5 @@ int i,j; - + _printLine_("TransientParam:"); _printLine_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")"); @@ -83,5 +83,5 @@ /*FUNCTION TransientParam::copy{{{*/ Object* TransientParam::copy() { - + return new TransientParam(this->enum_type,this->values,this->timesteps,this->N); Index: /issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Params/VectorParam.cpp (revision 13622) @@ -75,5 +75,5 @@ /*FUNCTION VectorParam::copy{{{*/ Object* VectorParam::copy() { - + return new VectorParam(this->enum_type,this->value); @@ -103,5 +103,5 @@ /*avoid leak: */ xdelete(&value); - + /*copy: */ value=vector->Duplicate(); Index: /issm/trunk-jpl/src/c/classes/objects/Vertex.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Vertex.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/classes/objects/Vertex.cpp (revision 13622) @@ -132,5 +132,5 @@ /*retrieve current pid*/ int pidcount=*ppidcount; - + /*This vertex is a clone! Don't distribute pids, it will get them from another cpu!*/ if(this->clone) return; @@ -146,5 +146,5 @@ /*FUNCTION Vertex::OffsetPids{{{*/ void Vertex::OffsetPids(int pidcount){ - + /*This vertex is a clone, don't offset the pids*/ if(this->clone) return; @@ -179,5 +179,5 @@ int my_rank; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); @@ -194,3 +194,2 @@ } /*}}}*/ - Index: /issm/trunk-jpl/src/c/io/Disk/WriteLockFile.cpp =================================================================== --- /issm/trunk-jpl/src/c/io/Disk/WriteLockFile.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/io/Disk/WriteLockFile.cpp (revision 13622) @@ -13,5 +13,5 @@ /*recover my_rank:*/ my_rank=IssmComm::GetRank(); - + /* output: */ FILE* fid=NULL; Index: /issm/trunk-jpl/src/c/io/Disk/pfopen.cpp =================================================================== --- /issm/trunk-jpl/src/c/io/Disk/pfopen.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/io/Disk/pfopen.cpp (revision 13622) @@ -16,5 +16,5 @@ FILE* fid=NULL; - + /*Open handle to data on disk: */ fid=fopen(filename,format); @@ -23,3 +23,2 @@ return fid; } - Index: /issm/trunk-jpl/src/c/io/PrintfFunction.cpp =================================================================== --- /issm/trunk-jpl/src/c/io/PrintfFunction.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/io/PrintfFunction.cpp (revision 13622) @@ -19,5 +19,5 @@ //variable list of arguments va_list args; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); @@ -54,5 +54,5 @@ int PrintfFunction(const string & message){ int my_rank; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); Index: /issm/trunk-jpl/src/c/matlab/io/CheckNumMatlabArguments.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/CheckNumMatlabArguments.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/CheckNumMatlabArguments.cpp (revision 13622) @@ -9,5 +9,4 @@ #endif - #include "../../shared/Exceptions/exceptions.h" #include "../../include/include.h" @@ -15,5 +14,5 @@ int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* __FUNCT__, void (*function)( void )){ - + /*checks on arguments on the matlab side: */ if (nrhs==0 && nlhs==0) { Index: /issm/trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 13622) @@ -50,5 +50,5 @@ _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } - + /*Assign output pointers:*/ *pmatrix=outmatrix; @@ -97,5 +97,5 @@ _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } - + /*Assign output pointers:*/ *pmatrix=outmatrix; @@ -252,5 +252,5 @@ _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } - + /*Assign output pointers:*/ *pmatrix=outmatrix; @@ -390,5 +390,4 @@ char* outstring=NULL; - /*Ok, the string should be coming directly from the matlab workspace: */ if (!mxIsClass(dataref,"char")){ @@ -398,5 +397,5 @@ /*Recover the string:*/ int stringlen; - + stringlen = mxGetM(dataref)*mxGetN(dataref)+1; outstring =xNew(stringlen); @@ -430,5 +429,5 @@ _error_("Input parameter of class " << mxGetClassName(dataref) << " not supported yet"); } - + /*Assign output pointers:*/ *pmatrix=outmatrix; Index: /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToDoubleMatrix.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToDoubleMatrix.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToDoubleMatrix.cpp (revision 13622) @@ -31,5 +31,5 @@ rows=mxGetM(mxmatrix); cols=mxGetN(mxmatrix); - + if(rows*cols){ matrix=xNewZeroInit(rows*cols); @@ -55,5 +55,5 @@ rows=mxGetM(mxmatrix); cols=mxGetN(mxmatrix); - + /*Create serial matrix: */ if(rows*cols){ Index: /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToMatrix.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToMatrix.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToMatrix.cpp (revision 13622) @@ -19,5 +19,5 @@ #include "../../include/include.h" #include "../../toolkits/toolkits.h" - + /*}}}*/ @@ -35,5 +35,5 @@ matrix->smatrix=MatlabMatrixToSeqMat(mxmatrix); #endif - + return matrix; } Index: /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToPetscMat.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToPetscMat.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToPetscMat.cpp (revision 13622) @@ -2,5 +2,4 @@ * \brief: convert a sparse or dense matlab matrix to a serial Petsc matrix: */ - #ifdef HAVE_CONFIG_H @@ -51,5 +50,5 @@ int *idxm = NULL; int *idxn = NULL; - + /*Ok, first check if we are dealing with a sparse or full matrix: */ if (mxIsSparse(mxmatrix)){ Index: /issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp (revision 13622) @@ -2,5 +2,4 @@ * \brief: convert a sparse or dense matlab n-dimensional array to cpp n-dimensional array */ - #ifdef HAVE_CONFIG_H @@ -68,5 +67,5 @@ /*Dealing with dense matrix: recover pointer and size: */ mxmatrix_ptr=(double*)mxGetPr(mxmatrix); - + /*Create serial matrix: */ matrix=xNewZeroInit(numel); @@ -141,5 +140,5 @@ /*Dealing with dense matrix: recover pointer and size: */ mxmatrix_ptr=(bool*)mxGetData(mxmatrix); - + /*Create serial matrix: */ matrix=xNew(numel); @@ -212,5 +211,5 @@ /*Dealing with dense matrix: recover pointer and size: */ mxmatrix_ptr=mxGetChars(mxmatrix); - + /*Create serial matrix: */ matrix=xNew(numel+1); Index: /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToDoubleVector.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToDoubleVector.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToDoubleVector.cpp (revision 13622) @@ -2,5 +2,4 @@ * \brief: convert a sparse or dense matlab vector to a serial vector: */ - #ifdef HAVE_CONFIG_H @@ -9,5 +8,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - #include @@ -44,5 +42,5 @@ cols=mxGetN(mxvector); nnz=mxGetNzmax(mxvector); - + /*Check that input is actualy a vector*/ if (cols!=1) _error_("input vector of size " << rows << "x" << cols << " should have only one column"); Index: /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToPetscVec.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToPetscVec.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToPetscVec.cpp (revision 13622) @@ -2,5 +2,4 @@ * \brief: convert a sparse or dense matlab vector to a serial Petsc vector: */ - #ifdef HAVE_CONFIG_H @@ -25,5 +24,5 @@ int dummy; PetscVec* vector=new PetscVec(); - + MatlabVectorToPetscVec(&vector->vector,&dummy, mxvector); @@ -51,5 +50,5 @@ /*petsc indices: */ int* idxm=NULL; - + /*Ok, first check if we are dealing with a sparse or full vector: */ if (mxIsSparse(mxvector)){ Index: /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToVector.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToVector.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToVector.cpp (revision 13622) @@ -19,5 +19,5 @@ #include "../../include/include.h" #include "../../toolkits/toolkits.h" - + /*}}}*/ @@ -35,5 +35,5 @@ vector->svector=MatlabVectorToSeqVec(mxvector); #endif - + return vector; } Index: /issm/trunk-jpl/src/c/matlab/io/PrintfFunction.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/PrintfFunction.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/PrintfFunction.cpp (revision 13622) @@ -19,5 +19,5 @@ int string_size; int my_rank; - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); Index: /issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp (revision 13622) @@ -20,5 +20,5 @@ mxArray *dataref = NULL; double *tmatrix = NULL; - + if(matrix){ /*create the matlab matrixwith Matlab's memory manager */ @@ -67,5 +67,5 @@ /*FUNCTION WriteData(mxArray** pdataref,double* vector, int M){{{*/ void WriteData(mxArray** pdataref,double* vector, int M){ - + mxArray* dataref = NULL; double* vector_matlab = NULL; @@ -225,5 +225,5 @@ /*FUNCTION WriteData(mxArray** pdataref,SeqMat* matrix){{{*/ void WriteData(mxArray** pdataref,SeqMat* matrix){ - + int i,j; int rows,cols; @@ -231,7 +231,7 @@ double *matrix_ptr = NULL; double *tmatrix_ptr = NULL; - + if(matrix){ - + matrix_ptr=matrix->ToSerial(); matrix->GetSize(&rows,&cols); @@ -244,5 +244,5 @@ } } - + /*create matlab matrix: */ dataref=mxCreateDoubleMatrix(0,0,mxREAL); @@ -263,15 +263,15 @@ /*FUNCTION WriteData(mxArray** pdataref,SeqVec* vector){{{*/ void WriteData(mxArray** pdataref,SeqVec* vector){ - + mxArray* dataref=NULL; double* vector_ptr=NULL; double* vector_matlab=NULL; int rows; - + if(vector){ /*call toolkit routine: */ vector_ptr=vector->ToMPISerial(); vector->GetSize(&rows); - + /*now create the matlab vector with Matlab's memory manager */ vector_matlab=(double*)mxMalloc(rows*sizeof(double)); @@ -299,5 +299,4 @@ mxArray* field = NULL; - /*Convert field*/ WriteData(&field,fieldpointer,M,N); Index: /issm/trunk-jpl/src/c/matlab/io/mxGetAssignedField.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/mxGetAssignedField.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/matlab/io/mxGetAssignedField.cpp (revision 13622) @@ -20,5 +20,5 @@ //output mxArray* mxfield=NULL; - + //input mxArray *inputs[2]; Index: /issm/trunk-jpl/src/c/modules/AddExternalResultx/AddExternalResultx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/AddExternalResultx/AddExternalResultx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/AddExternalResultx/AddExternalResultx.cpp (revision 13622) @@ -8,5 +8,5 @@ #include "../../io/io.h" #include "../../classes/objects/objects.h" - + void AddExternalResultx( DataSet* results, int enumtype, IssmDouble value){ /* Add new result in into results*/ Index: /issm/trunk-jpl/src/c/modules/AverageFilterx/AverageFilterx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/AverageFilterx/AverageFilterx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/AverageFilterx/AverageFilterx.cpp (revision 13622) @@ -11,5 +11,5 @@ int AverageFilterx(double** pimageout,double* image, int lines,int samps,int smooth){ - + double temp; int numvalues; Index: /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp (revision 13622) @@ -18,5 +18,4 @@ #include "../modules.h" - void AverageOntoPartitionx(double** paverage, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vertex_response){ Index: /issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp (revision 13622) @@ -21,6 +21,5 @@ { #ifdef _HAVE_CHACO_ //only works if Chaco library has been compiled in. - - + extern int Using_Main; /* is main routine being called? */ extern char *PARAMS_FILENAME; /* name of file with parameter updates */ @@ -62,6 +61,4 @@ int i,tvwgt; double tgoal; - - if (DEBUG_TRACE > 0) { @@ -187,7 +184,6 @@ _printLine_(""); } - + return(0); - #else //ifdef _HAVE_CHACO_ Index: /issm/trunk-jpl/src/c/modules/Chacox/chaco_seconds.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Chacox/chaco_seconds.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Chacox/chaco_seconds.cpp (revision 13622) @@ -8,8 +8,6 @@ #endif +double chaco_seconds(void){ - -double chaco_seconds(void){ - double curtime; @@ -22,5 +20,5 @@ *is defined in the and header files. Leaving it *for reference in case we have a problem here in the future*/ - + getrusage(RUSAGE_SELF, &rusage); curtime = ((rusage.ru_utime.tv_sec + rusage.ru_stime.tv_sec) + Index: /issm/trunk-jpl/src/c/modules/Chacox/input_parse.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Chacox/input_parse.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Chacox/input_parse.cpp (revision 13622) @@ -4,5 +4,4 @@ #include "./Chacox.h" - #undef __FUNCT__ Index: /issm/trunk-jpl/src/c/modules/Chacox/user_params.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Chacox/user_params.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Chacox/user_params.cpp (revision 13622) @@ -14,5 +14,4 @@ #endif - #ifdef _HAVE_CHACO_ //only works if dakota library has been compiled in. @@ -21,5 +20,4 @@ #define TRUE 1 #define FALSE 0 - /* Input and ouput control parameters */ @@ -34,5 +32,4 @@ int PROMPT = FALSE; /* Prompt for input? (TRUE/FALSE) */ int PRINT_HEADERS = FALSE; /* Print pretty output headers (TRUE/FALSE) */ - /* Eigenvector calculation parameters */ @@ -57,5 +54,4 @@ int TIME_KERNELS = FALSE; /* Time numerical kernels? (TRUE/FALSE) */ - /* Other parameters for spectral methods */ @@ -69,5 +65,4 @@ int OPT3D_NTRIES = 5; /* # local opts to look for global min in opt3d */ - /* Kernighan--Lin/Fiduccia--Mattheyses parameters */ @@ -78,5 +73,4 @@ int KL_UNDO_LIST = TRUE; /* Only resort changed vtxs? (TRUE/FALSE) */ double KL_IMBALANCE = 0.0; /* Fractional imbalance allowed by KL */ - /* Coarsening parameters */ @@ -91,5 +85,4 @@ int KL_ONLY_BNDY = TRUE; /* Start moving vtxs on boundary? (TRUE/FALSE) */ - /* Parameters for post-processing options */ @@ -97,5 +90,4 @@ int INTERNAL_VERTICES = FALSE; /* ... to up internal vtxs? (TRUE/FALSE) */ int REFINE_MAP = FALSE; /* ... to reduce hops? (TRUE/FALSE) */ - /* Architecture and simulator parameters */ @@ -129,5 +121,4 @@ char *PARAMS_FILENAME = "User_Params"; /* File of parameter changes */ - /* Parameters that control debugging output */ @@ -151,4 +142,3 @@ int DEBUG_MACH_PARAMS = 0;/* Print computed machine params? (0..1) */ - #endif //ifdef _HAVE_CHACO_ Index: /issm/trunk-jpl/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ComputeBasalStressx/ComputeBasalStressx.cpp (revision 13622) @@ -38,4 +38,4 @@ /*Assign output pointers: */ *psigma=sigma; - + } Index: /issm/trunk-jpl/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ComputeStrainRatex/ComputeStrainRatex.cpp (revision 13622) @@ -38,4 +38,4 @@ /*Assign output pointers: */ *peps=eps; - + } Index: /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp (revision 13622) @@ -24,5 +24,5 @@ /*Get analysis type: */ parameters->FindParam(&configuration_type,ConfigurationTypeEnum); - + if(VerboseMProcessor()) _pprintLine_(" Configuring elements..."); for (i=0;iSize();i++){ @@ -44,5 +44,5 @@ } } - + if(VerboseMProcessor()) _pprintLine_(" Configuring materials..."); for (i=0;iSize();i++){ Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 13622) @@ -41,5 +41,5 @@ converged=1; } - + /*Assign output pointers: */ *pconverged=converged; Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 13622) @@ -15,7 +15,6 @@ int RiftIsPresent(Loads* loads,int configuration_type){ - int i; - + int found=0; int mpi_found=0; @@ -50,5 +49,5 @@ RiftConstrain(&num_unstable_constraints,loads,configuration_type); if(num_unstable_constraints==0)converged=1; - + if(RiftIsFrozen(loads,configuration_type)){ converged=1; @@ -69,5 +68,5 @@ int i; - + /* generic object pointer: */ Riftfront* riftfront=NULL; @@ -77,5 +76,5 @@ int sum_num_unstable_constraints; int num_unstable_constraints=0; - + /*Enforce constraints: */ for (i=0;iSize();i++){ @@ -100,5 +99,5 @@ num_unstable_constraints=sum_num_unstable_constraints; #endif - + /*Assign output pointers: */ *pnum_unstable_constraints=num_unstable_constraints; @@ -110,5 +109,5 @@ int i; - + /* generic object pointer: */ Load* load=NULL; @@ -121,5 +120,5 @@ if (RiftfrontEnum==loads->GetEnum(i)){ - + load=(Load*)loads->GetObjectByOffset(i); if(load->InAnalysis(configuration_type)){ @@ -133,5 +132,5 @@ } } - + /*Is there just one found? that would mean we have frozen! : */ #ifdef _HAVE_MPI_ @@ -148,5 +147,5 @@ int i; - + /* generic object pointer: */ Load* load=NULL; @@ -160,5 +159,5 @@ load=(Load*)loads->GetObjectByOffset(i); if(load->InAnalysis(configuration_type)){ - + riftfront=(Riftfront*)load; riftfront->FreezeConstraints(); @@ -176,5 +175,5 @@ int i; - + Riftfront* riftfront=NULL; int found=0; @@ -207,7 +206,6 @@ int RiftIsPreStable(Loads* loads){ - int i; - + Riftfront* riftfront=NULL; int found=0; @@ -246,7 +244,6 @@ void RiftSetPreStable(Loads* loads){ - int i; - + Riftfront* riftfront=NULL; int found=0; @@ -268,5 +265,5 @@ int i; - + /* generic object pointer: */ Riftfront* riftfront=NULL; @@ -275,5 +272,5 @@ int sum_num_unstable_constraints; int num_unstable_constraints=0; - + /*Enforce constraints: */ for (i=0;iSize();i++){ @@ -294,5 +291,5 @@ num_unstable_constraints=sum_num_unstable_constraints; #endif - + /*Assign output pointers: */ *pnum_unstable_constraints=num_unstable_constraints; @@ -304,5 +301,5 @@ int i; - + /* generic object pointer: */ Riftfront* riftfront=NULL; @@ -346,5 +343,5 @@ int i; - + /* generic object pointer: */ Riftfront* riftfront=NULL; Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ThermalIsPresent.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ThermalIsPresent.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ThermalIsPresent.cpp (revision 13622) @@ -27,5 +27,5 @@ } } - + #ifdef _HAVE_MPI_ MPI_Reduce (&found,&mpi_found,1,MPI_INT,MPI_SUM,0,IssmComm::GetComm() ); Index: /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp (revision 13622) @@ -7,5 +7,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - #include "./ContourToMeshx.h" @@ -27,5 +26,4 @@ num=_NUMTHREADS_; #endif - /*output: */ Index: /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp (revision 13622) @@ -12,5 +12,5 @@ void* ContourToMeshxt(void* vpthread_handle){ - + int noerr=1; Index: /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp (revision 13622) @@ -34,5 +34,5 @@ /*Assign output pointers: */ *pflags=flags; - + return 1; } Index: /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp (revision 13622) @@ -16,5 +16,4 @@ IssmDouble *scalar_list = NULL; IssmDouble scalar; - /*Retrieve some parameters*/ Index: /issm/trunk-jpl/src/c/modules/CostFunctionx/CostFunctionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/CostFunctionx/CostFunctionx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/CostFunctionx/CostFunctionx.cpp (revision 13622) @@ -21,5 +21,5 @@ /*output: */ IssmDouble J,Jplus; - + /*Recover parameters*/ parameters->FindParam(&num_responses,InversionNumCostFunctionsEnum); Index: /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp (revision 13622) @@ -11,5 +11,5 @@ void CreateJacobianMatrixx(Matrix** pJff,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,IssmDouble kmax){ - + int i,connectivity; int numberofdofspernode; @@ -30,5 +30,5 @@ /*Initialize Jacobian Matrix*/ Jff=new Matrix(fsize,fsize,connectivity,numberofdofspernode); - + /*Create and assemble matrix*/ for(i=0;iSize();i++){ Index: /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp (revision 13622) @@ -13,5 +13,5 @@ int i; - + /*intermediary: */ int numberofdofs; Index: /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/DakotaResponsesx/DakotaResponsesx.cpp (revision 13622) @@ -16,5 +16,4 @@ #include "../../toolkits/toolkits.h" #include "../modules.h" - void DakotaResponsesx(double* d_responses,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,char** responses_descriptors,int numresponsedescriptors,int d_numresponses){ @@ -43,7 +42,7 @@ //watch out, we have more d_numresponses than numresponsedescriptors, because the responses have been expanded if they were scaled. //because we don't know the d_responses descriptors (the scaled ones) we can't key off them, so we will key off the responses_descriptors: */ - + for(i=0;iSize();i++){ Index: /issm/trunk-jpl/src/c/modules/ElementConnectivityx/ElementConnectivityx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ElementConnectivityx/ElementConnectivityx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ElementConnectivityx/ElementConnectivityx.cpp (revision 13622) @@ -41,5 +41,5 @@ * Once we get the neighbouring elements, figure out if they share a segment with the current element. If so, * plug them in the connectivity, unless they are already there.: */ - + for(n=0;nNumberOfDofs(configuration_type,GsetEnum); if (gsize==0) _error_("Allocating a Vec of size 0 as gsize=0 for configuration: " << EnumToStringx(configuration_type)); - + /*Initialize solution: */ solution=new Vector(gsize); - + /*Go through elements and plug solution: */ for (i=0;iSize();i++){ Index: /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (revision 13622) @@ -37,8 +37,8 @@ void GetVectorFromControlInputsx( IssmDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data){ - + /*output: */ IssmDouble* vector=NULL; - + /*intermediary: */ Vector* vec_vector=NULL; Index: /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (revision 13622) @@ -42,8 +42,8 @@ void GetVectorFromInputsx( IssmDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name, int type){ - + /*output: */ IssmDouble* vector=NULL; - + /*intermediary: */ Vector* vec_vector=NULL; Index: /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp (revision 13622) @@ -19,5 +19,5 @@ Vector *gradient = NULL; Vector **gradient_list = NULL; - + /*retrieve some parameters: */ parameters->FindParam(&num_controls,InversionNumControlParametersEnum); _assert_(num_controls); Index: /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 13622) @@ -19,7 +19,7 @@ Vector* vec_old_floatingice = NULL; Element* element = NULL; - + if(VerboseModule()) _pprintLine_(" Migrating grounding line"); - + /*retrieve parameters: */ parameters->FindParam(&migration_style,GroundinglineMigrationEnum); @@ -121,5 +121,4 @@ Element* element = NULL; - /*recover parameters: */ parameters->FindParam(&analysis_type,AnalysisTypeEnum); @@ -132,5 +131,5 @@ nflipped=1; //bootstrap while(nflipped){ - + /*Vector of size number of elements*/ vec_elements_neighboring_floatingice=new Vector(elements->NumberOfElements(),true); @@ -155,5 +154,5 @@ } vec_nodes_on_floatingice->Assemble(); - + #ifdef _HAVE_MPI_ MPI_Allreduce(&local_nflipped,&nflipped,1,MPI_INT,MPI_SUM,IssmComm::GetComm()); Index: /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp (revision 13622) @@ -10,5 +10,5 @@ int HoleFillerx(double** pimageout,double* image, int lines,int samps,int smooth){ - + FILE *fp1; unsigned long filesize; @@ -29,5 +29,5 @@ float ssw, wsw, wnw, nnw; float sum; - + time_t t1, t2; @@ -45,5 +45,5 @@ image2 = xNew(lines*samps); memcpy(image2,image,lines*samps*sizeof(double)); - + for ( i = 0; i < lines; i++ ){ for ( j = 0; j < samps; j++ ){ @@ -84,5 +84,5 @@ again2: - + #ifdef _DEBUG2_ counter=0; @@ -99,5 +99,5 @@ fflush( stdout ); #endif - + afterfirst2: @@ -128,5 +128,5 @@ /* For void edge pixels: */ - + nsteps = 0.0; ssteps = 0.0; esteps = 0.0; wsteps = 0.0; nwsteps = 0.0; nesteps = 0.0; swsteps = 0.0; sesteps = 0.0; @@ -139,5 +139,4 @@ ssw = 0.0; wsw = 0.0; wnw = 0.0; nnw = 0.0; - /** NSEW **/ for ( ii = i - 1; ii >= 0; ii-- ){ /* North */ @@ -150,10 +149,10 @@ if ( *(image2+ii*samps+j) != 0 ){ south = *(image2+ii*samps+j); ssteps = ii - i; break;} } - + for ( jj = j - 1; jj >= 0; jj-- ){ /* West */ if ( jj <= 0 ) { west = 0; wsteps = 0; break;} if ( *(image2+i*samps+jj) != 0 ){ west = *(image2+i*samps+jj); wsteps = j - jj; break;} } - + for ( jj = j + 1; jj < samps; jj++ ){ /* East */ if ( jj >= samps-1 ){ east = 0; esteps = 0; break;} @@ -161,5 +160,4 @@ } - /** Diagonals **/ /* Southeast */ @@ -169,5 +167,5 @@ if ( *(image2+ii*samps+jj) != 0 ){ se = *(image2+ii*samps+jj); sesteps = 1.4142 * k; break;} } - + /* Northeast */ for ( k = 1; k < infinit; k++ ){ @@ -176,5 +174,5 @@ if ( *(image2+ii*samps+jj) != 0 ){ ne = *(image2+ii*samps+jj); nesteps = 1.4142 * k; break;} } - + /* Northwest */ for ( k = 1; k < infinit; k++ ){ @@ -183,5 +181,5 @@ if ( *(image2+ii*samps+jj) != 0 ){ nw = *(image2+ii*samps+jj); nwsteps = 1.4142 * k; break;} } - + /* Southwest */ for ( k = 1; k < infinit; k++ ){ @@ -198,5 +196,5 @@ if ( *(image2+ii*samps+jj) != 0 ){ nne = *(image2+ii*samps+jj); nnesteps = 2.2361 * k; break;} } - + /* ENE */ for ( k = 1; k < infinit; k++ ){ @@ -205,5 +203,5 @@ if ( *(image2+ii*samps+jj) != 0 ){ ene = *(image2+ii*samps+jj); enesteps = 2.2361 * k; break;} } - + /* ESE */ for ( k = 1; k < infinit; k++ ){ @@ -212,5 +210,5 @@ if ( *(image2+ii*samps+jj) != 0 ){ ese = *(image2+ii*samps+jj); esesteps = 2.2361 * k; break;} } - + /* SSE */ for ( k = 1; k < infinit; k++ ){ @@ -226,5 +224,5 @@ if ( *(image2+ii*samps+jj) != 0 ){ ssw = *(image2+ii*samps+jj); sswsteps = 2.2361 * k; break;} } - + /* WSW */ for ( k = 1; k < infinit; k++ ){ @@ -233,5 +231,5 @@ if ( *(image2+ii*samps+jj) != 0 ){ wsw = *(image2+ii*samps+jj); wswsteps = 2.2361 * k; break;} } - + /* WNW */ for ( k = 1; k < infinit; k++ ){ @@ -240,5 +238,5 @@ if ( *(image2+ii*samps+jj) != 0 ){ wnw = *(image2+ii*samps+jj); wnwsteps = 2.2361 * k; break;} } - + /* NNW */ for ( k = 1; k < infinit; k++ ){ @@ -247,5 +245,5 @@ if ( *(image2+ii*samps+jj) != 0 ){ nnw = *(image2+ii*samps+jj); nnwsteps = 2.2361 * k; break;} } - + elev = 0; range = 0; /*NSEW*/ @@ -259,5 +257,5 @@ if ( swsteps > 0.5 ){ elev += sw / swsteps; range += 1.00 / swsteps;} if ( sesteps > 0.5 ){ elev += se / sesteps; range += 1.00 / sesteps;} - + /*Other 8*/ if ( nnesteps > 0.5 ){ elev += nne / nnesteps; range += 1.00 / nnesteps;} @@ -269,5 +267,5 @@ if ( wnwsteps > 0.5 ){ elev += wnw / wnwsteps; range += 1.00 / wnwsteps;} if ( nnwsteps > 0.5 ){ elev += nnw / nnwsteps; range += 1.00 / nnwsteps;} - + //temp = ( elev / range ) + 0.5 ; temp = ( elev / range ); @@ -275,5 +273,5 @@ //if ( temp > 10000 ) temp = 10000; //if ( temp < 0 ) temp = 0; - + #ifdef _DEBUG2_ //_printLine_(temp << " " << elev << " " << range << " "); @@ -284,6 +282,4 @@ } - - for ( i = 0; i < lines; i++ ){ for ( j = 0; j < samps; j++ ){ @@ -292,5 +288,4 @@ } - for ( i = 0; i < lines; i++ ){ for ( j = 0; j < samps; j++ ){ @@ -298,18 +293,15 @@ } } - + if ( smooth == 0 ) goto there2; - - + /************************ SMOOTH THE RESULT ***********************/ - + image4 = xNew(lines*samps); memcpy(image4,image3,lines*samps*sizeof(double)); - for ( i = 0; i < lines; i++ ) { for ( j = 0; j < samps; j++ ) { if ( *(image4+i*samps+j) != 0 ) { *(image3+i*samps+j) = *(image2+i*samps+j) ; continue; } - for ( k = 1; k < infinit; k++ ) { /* Find the smallest box size with data */ @@ -324,5 +316,5 @@ } } - + k_nowset: k = k / 4; if ( k < 1 ) k = 1; /* Errrrr. Make it fourth size */ @@ -343,7 +335,5 @@ } - there2: - /*Allocate output image: */ @@ -352,5 +342,5 @@ time(&t2); - + #ifdef _DEBUG2_ _printString_( "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b" ); @@ -358,5 +348,5 @@ printf ( "\n"); #endif - + end: Index: /issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InputDuplicatex/InputDuplicatex.cpp (revision 13622) @@ -10,5 +10,5 @@ void InputDuplicatex(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters,int original_enum, int new_enum){ - + /*Go through elemnets, and ask to reinitialie the input: */ int i; Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp (revision 13622) @@ -23,5 +23,5 @@ load->InputUpdateFromConstant(constant,name); } - + for(i=0;iSize();i++){ Material* material=(Material*)materials->GetObjectByOffset(i); @@ -30,5 +30,5 @@ } void InputUpdateFromConstantx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int constant, int name){ - + int i; @@ -43,5 +43,5 @@ load->InputUpdateFromConstant(constant,name); } - + for(i=0;iSize();i++){ Material* material=(Material*)materials->GetObjectByOffset(i); @@ -63,5 +63,5 @@ load->InputUpdateFromConstant(constant,name); } - + for(i=0;iSize();i++){ Material* material=(Material*)materials->GetObjectByOffset(i); Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (revision 13622) @@ -14,5 +14,5 @@ int i,j,k,l; int dummy; - + int numberofvertices; int nrows; @@ -35,17 +35,16 @@ for(i=0;i DragCoefficient). Allocate distributed_values and fill the * distributed_values with the next npart variables: */ - + //strcpy(root,strstr(descriptor,"_")+1); *strstr(root,"_")='\0'; memcpy(root,strstr(descriptor,"_")+1,(strlen(strstr(descriptor,"_")+1)+1)*sizeof(char)); *strstr(root,"_")='\0'; - distributed_values=xNew(npart); @@ -82,5 +81,4 @@ PetscSynchronizedFlush(IssmComm::GetComm()); #endif - /*Update inputs using the parameter matrix: */ Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp (revision 13622) @@ -23,5 +23,4 @@ } - void InputUpdateFromSolutionx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,IssmDouble* solution){ Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp (revision 13622) @@ -21,5 +21,4 @@ } - void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vector, int name, int type){ @@ -46,5 +45,5 @@ void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int* vector, int name, int type){ - + int i; Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp (revision 13622) @@ -21,5 +21,4 @@ } - void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,IssmDouble* vector, int name, int type){ @@ -46,5 +45,5 @@ void InputUpdateFromVectorx( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int* vector, int name, int type){ - + int i; Index: /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 13622) @@ -21,5 +21,5 @@ /*output: */ SeqVec* data_mesh=NULL; - + /*Intermediary*/ double* x=NULL; @@ -312,5 +312,5 @@ _assert_(x2>x1 && y2>y1); _assert_(x<=x2 && x>=x1 && y<=y2 && y>=y1); - + double xm=(x2-x1)/2; double ym=(y2-y1)/2; Index: /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 13622) @@ -14,5 +14,5 @@ double* x_prime, double* y_prime, int nods_prime, double* default_values,int num_default_values,Contour** contours,int numcontours){ - + /*Output*/ SeqVec* data_prime=NULL; Index: /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp (revision 13622) @@ -18,5 +18,5 @@ int my_thread = handle->id; int num_threads = handle->num; - + /*recover parameters :*/ int interpolation_type = gate->interpolation_type; Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (revision 13622) @@ -69,5 +69,5 @@ } } - + /*Get extreme coordinates of the grid*/ if (xflip){ Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (revision 13622) @@ -15,5 +15,5 @@ int InterpFromMeshToMesh2dx(double** pdata_interp,int* index_data,double* x_data,double* y_data,int nods_data,int nels_data, double* data,int M_data,int N_data,double* x_interp,double* y_interp,int N_interp,Options* options){ - + /*Output*/ double* data_interp=NULL; Index: /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 13622) @@ -11,5 +11,4 @@ void IoModelToConstraintsx(Constraints* constraints,IoModel* iomodel,int vector_enum,int analysis_type){ - /*intermediary: */ @@ -48,8 +47,8 @@ /*static: just create Constraints objects*/ count=0; - + /*Create Constraints from x,y,z: */ for (i=0;imy_vertices[i])){ @@ -78,5 +77,5 @@ /*Create constraints from x,y,z: */ for (i=0;imy_vertices[i])){ Index: /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/KMLFileReadx/KMLFileReadx.cpp (revision 13622) @@ -65,3 +65,2 @@ return(kfil); } - Index: /issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/KMLOverlayx/KMLOverlayx.cpp (revision 13622) @@ -79,5 +79,4 @@ kdoc=NULL; - /* write kml file */ @@ -95,3 +94,2 @@ return; } - Index: /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp (revision 13622) @@ -69,3 +69,2 @@ return(iret); } - Index: /issm/trunk-jpl/src/c/modules/MassFluxx/MassFluxx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MassFluxx/MassFluxx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MassFluxx/MassFluxx.cpp (revision 13622) @@ -16,5 +16,5 @@ int element_id; bool ispresent=false; - + /*output: */ IssmDouble mass_flux=0; @@ -44,5 +44,5 @@ segments=array[counter-1]; //matlab to "C" indexing num_segments=mdims_array[counter-1]; - + /*Go through segments, and then elements, and figure out which elements belong to a segment. * When we find one, use the element to compute the mass flux on the segment: */ @@ -72,5 +72,5 @@ xDelete(ndims_array); xDelete(array); - + /*Assign output pointers: */ *pmass_flux=mass_flux; Index: /issm/trunk-jpl/src/c/modules/MaxAbsVxx/MaxAbsVxx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MaxAbsVxx/MaxAbsVxx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MaxAbsVxx/MaxAbsVxx.cpp (revision 13622) @@ -10,5 +10,5 @@ void MaxAbsVxx( IssmDouble* pmaxabsvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){ - + int i; IssmDouble maxabsvx; @@ -20,5 +20,5 @@ Element* element=(Element*)elements->GetObjectByOffset(i); element->MaxAbsVx(&element_maxabsvx,process_units); //go pick up the maximum velocity in the inputs - + if(i==0)maxabsvx=element_maxabsvx; //initialize maxabsvx else{ Index: /issm/trunk-jpl/src/c/modules/MaxAbsVyx/MaxAbsVyx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MaxAbsVyx/MaxAbsVyx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MaxAbsVyx/MaxAbsVyx.cpp (revision 13622) @@ -10,5 +10,5 @@ void MaxAbsVyx( IssmDouble* pmaxabsvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){ - + int i; IssmDouble maxabsvy; @@ -16,10 +16,9 @@ IssmDouble element_maxabsvy; - /*Go through elements, and request velocity: */ for(i=0;iSize();i++){ Element* element=(Element*)elements->GetObjectByOffset(i); element->MaxAbsVy(&element_maxabsvy,process_units); //go pick up the maximum velocity in the inputs - + if(i==0)maxabsvy=element_maxabsvy; //initialize maxabsvy else{ Index: /issm/trunk-jpl/src/c/modules/MaxAbsVzx/MaxAbsVzx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MaxAbsVzx/MaxAbsVzx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MaxAbsVzx/MaxAbsVzx.cpp (revision 13622) @@ -10,5 +10,5 @@ void MaxAbsVzx( IssmDouble* pmaxabsvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){ - + int i; IssmDouble maxabsvz; @@ -20,5 +20,5 @@ Element* element=(Element*)elements->GetObjectByOffset(i); element->MaxAbsVz(&element_maxabsvz,process_units); //go pick up the minimum velocity in the inputs - + if(i==0)maxabsvz=element_maxabsvz; //initialize maxabsvz else{ Index: /issm/trunk-jpl/src/c/modules/MaxVelx/MaxVelx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MaxVelx/MaxVelx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MaxVelx/MaxVelx.cpp (revision 13622) @@ -11,5 +11,5 @@ void MaxVelx( IssmDouble* pmaxvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){ - + int i; IssmDouble maxvel; @@ -21,5 +21,5 @@ Element* element=(Element*)elements->GetObjectByOffset(i); element->MaxVel(&element_maxvel,process_units); //go pick up the maximum velocity in the inputs - + if(i==0)maxvel=element_maxvel; //initialize maxvel else{ Index: /issm/trunk-jpl/src/c/modules/MaxVxx/MaxVxx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MaxVxx/MaxVxx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MaxVxx/MaxVxx.cpp (revision 13622) @@ -10,5 +10,5 @@ void MaxVxx( IssmDouble* pmaxvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){ - + int i; IssmDouble maxvx; @@ -20,5 +20,5 @@ Element* element=(Element*)elements->GetObjectByOffset(i); element->MaxVx(&element_maxvx,process_units); //go pick up the minimum velocity in the inputs - + if(i==0)maxvx=element_maxvx; //initialize maxvx else{ Index: /issm/trunk-jpl/src/c/modules/MaxVyx/MaxVyx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MaxVyx/MaxVyx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MaxVyx/MaxVyx.cpp (revision 13622) @@ -20,5 +20,5 @@ Element* element=(Element*)elements->GetObjectByOffset(i); element->MaxVy(&element_maxvy,process_units); //go pick up the minimum velocity in the inputs - + if(i==0)maxvy=element_maxvy; //initialize maxvy else{ Index: /issm/trunk-jpl/src/c/modules/MaxVzx/MaxVzx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MaxVzx/MaxVzx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MaxVzx/MaxVzx.cpp (revision 13622) @@ -11,5 +11,5 @@ void MaxVzx( IssmDouble* pmaxvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){ - + int i; IssmDouble maxvz; @@ -21,5 +21,5 @@ Element* element=(Element*)elements->GetObjectByOffset(i); element->MaxVz(&element_maxvz,process_units); //go pick up the minimum velocity in the inputs - + if(i==0)maxvz=element_maxvz; //initialize maxvz else{ Index: /issm/trunk-jpl/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp (revision 13622) @@ -40,5 +40,5 @@ VecMergex(ug,uf,nodes,parameters,FsetEnum); } - + /*Merge s set back into g set: */ if(ssize){ Index: /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp (revision 13622) @@ -3,5 +3,5 @@ #include "./MeshProfileIntersectionx.h" - + void ElementSegment(DataSet* segments_dataset,int el,double* xnodes,double* ynodes,double* xsegment,double* ysegment){ @@ -14,5 +14,5 @@ double beta1,beta2; double gamma1,gamma2; - + int edge1,edge2,edge3; @@ -21,5 +21,4 @@ double xfinal[2],yfinal[2]; - /*edge 1: */ xel[0]=xnodes[0]; yel[0]=ynodes[0]; xel[1]=xnodes[1]; yel[1]=ynodes[1]; @@ -41,5 +40,5 @@ } else if( ((edge1==IntersectEnum) && (edge2==IntersectEnum)) || ((edge2==IntersectEnum) && (edge3==IntersectEnum)) || ((edge3==IntersectEnum) && (edge1==IntersectEnum)) ){ - + /*segment interscts 2 opposite edges of our triangle, at 2 segment coordinates, pick up the lowest (coord1) and highest (coord2): */ if((edge1==IntersectEnum) && (edge2==IntersectEnum)) {coord1=min(alpha1,beta1); coord2=max(alpha1,beta1);} @@ -77,5 +76,5 @@ coord2=1.0; } - + xfinal[0]=xsegment[0]+coord1*(xsegment[1]-xsegment[0]); xfinal[1]=xsegment[0]+coord2*(xsegment[1]-xsegment[0]); Index: /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegmentsIntersection.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegmentsIntersection.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegmentsIntersection.cpp (revision 13622) @@ -3,5 +3,5 @@ #include "./MeshProfileIntersectionx.h" - + void ElementSegmentsIntersection(DataSet* segments_dataset,int el, double* xnodes,double* ynodes,double* xc,double* yc,int numnodes){ Index: /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp (revision 13622) @@ -32,5 +32,5 @@ /*Loop through all contours: */ for (i=0;i* segment=NULL; int numsegs; - + /*intermediary: */ DataSet* segments_dataset=NULL; @@ -35,5 +35,5 @@ for(i=0;i* segment=(Segment*)segments_dataset->GetObjectByOffset(i); - + /*x1,y1,x2,y2 then element_id: */ *(segments+5*i+0)=segment->x1; Index: /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/NodeInElement.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/NodeInElement.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/NodeInElement.cpp (revision 13622) @@ -19,8 +19,7 @@ y3=ynodes[2]; - /*compute determinant: */ det=x1*y2-x1*y3-x3*y2-x2*y1+x2*y3+x3*y1; - + /*area coordinates: */ lambda1=((y2-y3)*(x-x3)+(x3-x2)*(y-y3))/det; Index: /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/SegmentIntersect.cpp (revision 13622) @@ -11,5 +11,5 @@ double alpha=-1; double beta=-1; - + double xA,xB,xC,xD,yA,yB,yC,yD; double O2A[2],O2B[2],O1C[2],O1D[2]; @@ -29,5 +29,4 @@ O1C[0]=xC -(xA/2+xB/2); O1C[1]=yC -(yA/2+yB/2); O1D[0]=xD -(xA/2+xB/2); O1D[1]=yD -(yA/2+yB/2); - n1[0]=yA-yB; n1[1]=xB-xA; //normal vector to segA Index: /issm/trunk-jpl/src/c/modules/MinVelx/MinVelx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MinVelx/MinVelx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MinVelx/MinVelx.cpp (revision 13622) @@ -11,5 +11,5 @@ void MinVelx( IssmDouble* pminvel, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){ - + int i; IssmDouble minvel; @@ -21,5 +21,5 @@ Element* element=(Element*)elements->GetObjectByOffset(i); element->MinVel(&element_minvel,process_units); //go pick up the minimum velocity in the inputs - + if(i==0)minvel=element_minvel; //initialize minvel else{ Index: /issm/trunk-jpl/src/c/modules/MinVxx/MinVxx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MinVxx/MinVxx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MinVxx/MinVxx.cpp (revision 13622) @@ -10,5 +10,5 @@ void MinVxx( IssmDouble* pminvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){ - + int i; IssmDouble minvx; @@ -20,5 +20,5 @@ Element* element=(Element*)elements->GetObjectByOffset(i); element->MinVx(&element_minvx,process_units); //go pick up the minimum velocity in the inputs - + if(i==0)minvx=element_minvx; //initialize minvx else{ Index: /issm/trunk-jpl/src/c/modules/MinVyx/MinVyx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MinVyx/MinVyx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MinVyx/MinVyx.cpp (revision 13622) @@ -10,5 +10,5 @@ void MinVyx( IssmDouble* pminvy, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){ - + int i; IssmDouble minvy; @@ -20,5 +20,5 @@ Element* element=(Element*)elements->GetObjectByOffset(i); element->MinVy(&element_minvy,process_units); //go pick up the minimum velocity in the inputs - + if(i==0)minvy=element_minvy; //initialize minvy else{ Index: /issm/trunk-jpl/src/c/modules/MinVzx/MinVzx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/MinVzx/MinVzx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/MinVzx/MinVzx.cpp (revision 13622) @@ -10,5 +10,5 @@ void MinVzx( IssmDouble* pminvz, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){ - + int i; IssmDouble minvz; @@ -20,5 +20,5 @@ Element* element=(Element*)elements->GetObjectByOffset(i); element->MinVz(&element_minvz,process_units); //go pick up the minimum velocity in the inputs - + if(i==0)minvz=element_minvz; //initialize minvz else{ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 13622) @@ -14,5 +14,5 @@ void CreateParametersAutodiff(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type){ - + int i; Parameters *parameters = NULL; @@ -26,10 +26,10 @@ int* indices=NULL; int num_indices; - + IssmDouble* xp=NULL; IssmDouble* xp_backup=NULL; int num_ind,local_num_ind; DataSet* dependent_objects=NULL; - + /*Get parameters: */ parameters=*pparameters; @@ -37,9 +37,9 @@ /*retrieve some parameters: */ iomodel->Constant(&autodiff_analysis,AutodiffIsautodiffEnum); - + if(autodiff_analysis){ #ifdef _HAVE_ADOLC_ - + /*Copy some parameters from IoModel to parameters dataset: */ parameters->AddObject(iomodel->CopyConstantObject(AutodiffKeepEnum)); @@ -48,5 +48,5 @@ iomodel->Constant(&autodiff_driver,AutodiffDriverEnum); parameters->AddObject(iomodel->CopyConstantObject(AutodiffDriverEnum)); - + if(strcmp(autodiff_driver,"fos_forward")==0){ parameters->AddObject(iomodel->CopyConstantObject(AutodiffFosForwardIndexEnum)); @@ -66,5 +66,5 @@ dependent_objects=new DataSet(); num_dep=0; - + if(num_dependent_objects){ iomodel->FetchData(&names,&dummy,&dummy,AutodiffDependentObjectNamesEnum); @@ -114,5 +114,5 @@ #endif } - + #ifdef _HAVE_ADOLC_ /*initialize a placeholder to store solver pointers: {{{*/ @@ -129,5 +129,5 @@ /*}}}*/ #endif - + /*Assign output pointer: */ *pparameters=parameters; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (revision 13622) @@ -11,5 +11,5 @@ int stabilization; - + /*Fetch parameters: */ iomodel->Constant(&stabilization,BalancethicknessStabilizationEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp (revision 13622) @@ -31,5 +31,5 @@ /*Create loads if they do not exist yet*/ if(!loads) loads = new Loads(); - + /*Loads only in DG*/ if (stabilization==3){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp (revision 13622) @@ -15,5 +15,5 @@ /*Output*/ Constraints* constraints = NULL; - + /*Recover pointer: */ constraints=*pconstraints; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 13622) @@ -31,8 +31,8 @@ /*Create nodes if they do not exist yet*/ if(!nodes) nodes = new Nodes(); - + /*Continuous Galerkin partition of nodes: */ NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); - + /*First fetch data: */ iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); @@ -40,5 +40,5 @@ for (i=0;imy_vertices[i]){ - + /*Add node to nodes dataset: */ nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i+1,i,iomodel,BedSlopeAnalysisEnum)); @@ -49,5 +49,5 @@ /*Clean fetched data: */ iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); - + /*Assign output pointer: */ *pnodes=nodes; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 13622) @@ -42,5 +42,5 @@ iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } - + /*Free data: */ iomodel->DeleteData(1,MeshElementsEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 13622) @@ -13,5 +13,5 @@ void CreateParametersControl(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type){ - + int i; Parameters *parameters = NULL; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 13622) @@ -25,5 +25,4 @@ bool control_analysis; - /*Fetch parameters: */ iomodel->Constant(&numberofelements,MeshNumberofelementsEnum); @@ -65,5 +64,5 @@ } } - + /*Free data: */ iomodel->DeleteData(1+4+6,MeshElementsEnum,InversionControlParametersEnum,InversionCostFunctionsCoefficientsEnum,InversionMinParametersEnum,InversionMaxParametersEnum,BalancethicknessThickeningRateEnum,VxEnum,VyEnum,FrictionCoefficientEnum,MaterialsRheologyBEnum,MaterialsRheologyZEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 13622) @@ -15,5 +15,4 @@ #include "./ModelProcessorx.h" - void CreateDataSets(Elements** pelements,Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,char* rootpath,const int solution_type,const int analysis_type,const int nummodels,int analysis_counter){ @@ -22,5 +21,5 @@ Materials *materials = NULL; Parameters *parameters = NULL; - + /*Create elements, vertices and materials, independent of analysis_type: */ CreateElementsVerticesAndMaterials(pelements, pvertices, pmaterials, iomodel,nummodels); @@ -40,5 +39,5 @@ UpdateElementsDiagnosticHoriz(elements,iomodel,analysis_counter,analysis_type); break; - + case DiagnosticVertAnalysisEnum: CreateNodesDiagnosticVert(pnodes, iomodel); @@ -47,5 +46,5 @@ UpdateElementsDiagnosticVert(elements,iomodel,analysis_counter,analysis_type); break; - + case DiagnosticHutterAnalysisEnum: CreateNodesDiagnosticHutter(pnodes, iomodel); @@ -55,5 +54,5 @@ break; #endif - + #ifdef _HAVE_HYDROLOGY_ case HydrologyAnalysisEnum: @@ -72,5 +71,5 @@ UpdateElementsThermal(elements,iomodel,analysis_counter,analysis_type); break; - + case EnthalpyAnalysisEnum: CreateNodesEnthalpy(pnodes, iomodel); @@ -79,5 +78,5 @@ UpdateElementsEnthalpy(elements,iomodel,analysis_counter,analysis_type); break; - + case MeltingAnalysisEnum: CreateNodesMelting(pnodes, iomodel); @@ -122,5 +121,4 @@ #endif - default: _error_("analysis_type: " << EnumToStringx(analysis_type) << " not supported yet!"); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 13622) @@ -41,8 +41,8 @@ vertices = new Vertices(); materials = new Materials(); - + /*First, partition elements and vertices. Nodes will partitioned on a per analysis_type basis. If partitining already done, ignore: */ ElementsAndVerticesPartitioning(&iomodel->my_elements,&iomodel->my_vertices,iomodel); - + iomodel->FetchData(2,MeshElementsEnum,MeshElementconnectivityEnum); #ifdef _HAVE_3D_ @@ -50,5 +50,5 @@ #endif if(control_analysis)iomodel->FetchData(3,InversionControlParametersEnum,InversionMinParametersEnum,InversionMaxParametersEnum); - + /*Create elements*/ for (i=0;iAddObject(new Matpar(numberofelements+1,iomodel));//put it at the end of the materials - + /*Create vertices: */ @@ -90,10 +90,10 @@ iomodel->FetchData(6,MeshElementsEnum,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum); CreateNumberNodeToElementConnectivity(iomodel); - + for (i=0;imy_vertices[i]){ - + /*Add vertex to vertices dataset: */ vertices->AddObject(new Vertex(i+1,i,i,iomodel)); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 13622) @@ -8,5 +8,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - #include "../../Container/Container.h" @@ -20,5 +19,5 @@ void CreateParameters(Parameters** pparameters,IoModel* iomodel,char* rootpath,const int solution_type,int analysis_type,int analysis_counter){ - + int i,j,m,k; int numoutputs; @@ -45,5 +44,5 @@ /*Initialize dataset: */ parameters = new Parameters(); - + /*Copy some constants from iomodel */ parameters->AddObject(iomodel->CopyConstantObject(MeshDimensionEnum)); @@ -151,11 +150,10 @@ if(numoutputs)parameters->AddObject(new IntVecParam(SteadystateRequestedOutputsEnum,requestedoutputs,numoutputs)); iomodel->DeleteData(requestedoutputs,SteadystateRequestedOutputsEnum); - + iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,PrognosticRequestedOutputsEnum); parameters->AddObject(new IntParam(PrognosticNumRequestedOutputsEnum,numoutputs)); if(numoutputs)parameters->AddObject(new IntVecParam(PrognosticRequestedOutputsEnum,requestedoutputs,numoutputs)); iomodel->DeleteData(requestedoutputs,PrognosticRequestedOutputsEnum); - - + /*Deal with mass flux segments: {{{*/ iomodel->FetchData(&qmu_mass_flux_present,QmuMassFluxSegmentsPresentEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 13622) @@ -17,8 +17,8 @@ /*variable declarations: {{{*/ int i,j,k; - + Parameters* parameters = NULL; int second_count; - + int* part=NULL; double* dpart=NULL; @@ -35,9 +35,8 @@ char* qmuerrname=NULL; char* qmuoutname=NULL; - + //descriptors: char tag[50]; - - + int M; int m,n; @@ -50,5 +49,5 @@ /*}}}*/ - + /*recover parameters : */ parameters=*pparameters; @@ -92,5 +91,5 @@ /*Deal with partitioning: {{{*/ /*partition vertices in iomodel->qmu_npart parts, unless a partition is already present: */ - + parameters->AddObject(iomodel->CopyConstantObject(QmuNumberofpartitionsEnum)); iomodel->FetchData(&dpart,NULL,NULL,QmuPartitionEnum); @@ -107,5 +106,5 @@ /*}}}*/ /*Deal with data needed because of qmu variables: {{{*/ - + for(i=0;iFetchData(&dakota_parameter,&nrows,&ncols,StringToEnumx(tag)); @@ -124,5 +123,5 @@ parameters->AddObject(new DoubleTransientMatParam(StringToEnumx(tag),dakota_parameter,nrows,ncols)); } - + /*Free ressources:*/ xDelete(dakota_parameter); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 13622) @@ -64,5 +64,5 @@ /*Create constraints if they do not exist yet*/ if(!constraints) constraints = new Constraints(); - + /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */ if(!ismacayealpattyn & !isstokes & !isl1l2){ @@ -70,5 +70,5 @@ return; } - + /*Constraints: fetch data: */ iomodel->FetchData(&spcvx,&Mx,&Nx,DiagnosticSpcvxEnum); @@ -324,5 +324,5 @@ } } - + /*Free data: */ iomodel->DeleteData(spcvx,DiagnosticSpcvxEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 13622) @@ -58,5 +58,5 @@ return; } - + /*Create pressure loads as boundary conditions. Pay attention to the partitioning if we are running in parallel (the nodes * referenced by a certain load must belong to the cluster node): */ @@ -70,5 +70,5 @@ /*First load data:*/ for (i=0;imy_elements[element]) continue; - + /*Do not create ice front if Hutter or Stokes elements*/ if (reCast(*(elements_type+element))==HutterApproximationEnum) continue; @@ -132,8 +132,7 @@ iomodel->DeleteData(pressureload,DiagnosticIcefrontEnum); - /*Create Penpair for penalties: */ iomodel->FetchData(&penalties,&numpenalties,NULL,DiagnosticVertexPairingEnum); - + for(i=0;iFetchData(9,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBordermacayealEnum,FlowequationBorderstokesEnum, MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,FlowequationVertexEquationEnum,DiagnosticReferentialEnum); - + for (i=0;imy_vertices[i]){ - + /*Add node to nodes dataset: */ nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i+1,i,iomodel,DiagnosticHorizAnalysisEnum)); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 13622) @@ -85,9 +85,9 @@ elements->InputDuplicate(VxEnum,InversionVxObsEnum); if(dakota_analysis)elements->InputDuplicate(VxEnum,QmuVxEnum); - + elements->InputDuplicate(VyEnum,VyPicardEnum); elements->InputDuplicate(VyEnum,InversionVyObsEnum); if(dakota_analysis)elements->InputDuplicate(VyEnum,QmuVyEnum); - + if(dim==3){ elements->InputDuplicate(VzEnum,VzPicardEnum); @@ -95,5 +95,5 @@ if(dakota_analysis)elements->InputDuplicate(VzEnum,QmuVzEnum); } - + /*Free data: */ iomodel->DeleteData(2,MeshElementsEnum,FlowequationElementEquationEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 13622) @@ -75,5 +75,5 @@ /*Free data: */ iomodel->DeleteData(3,DiagnosticSpcvxEnum,DiagnosticSpcvyEnum,FlowequationVertexEquationEnum); - + /*Assign output pointer: */ *pconstraints=constraints; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp (revision 13622) @@ -21,5 +21,5 @@ /*Create loads if they do not exist yet*/ if(!loads) loads = new Loads(); - + /*Assign output pointer: */ *ploads=loads; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 13622) @@ -19,5 +19,4 @@ bool ishutter; - /*Fetch data needed: */ iomodel->Constant(&numberofelements,MeshNumberofelementsEnum); @@ -38,8 +37,8 @@ } } - + iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,GeometryHydrostaticRatioEnum); - + /*Free data: */ iomodel->DeleteData(2,MeshElementsEnum,FlowequationElementEquationEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 13622) @@ -42,5 +42,5 @@ /*Continuous Galerkin partition of nodes: */ NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); - + /*First fetch data: */ iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); @@ -57,5 +57,5 @@ /*Clean fetched data: */ iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); - + /*Assign output pointer: */ *pnodes=nodes; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 13622) @@ -54,4 +54,4 @@ /*Free data: */ iomodel->DeleteData(1,MeshElementsEnum); - + } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 13622) @@ -6,5 +6,5 @@ #include "../../include/include.h" #include "../../EnumDefinitions/EnumDefinitions.h" - + void DistributeNumDofs(DofIndexing* index,int analysis_type,IssmDouble* vertices_type){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 13622) @@ -106,5 +106,5 @@ my_elements[i]=true; - + /*Now that we are here, we can also start building the list of vertices belonging to this cpu partition: we use *the element index to do this. For each element n, we know index[n][0:2] holds the indices (matlab indexing) @@ -114,5 +114,5 @@ my_vertices[reCast(*(elements+elements_width*i+1))-1]=1; my_vertices[reCast(*(elements+elements_width*i+2))-1]=1; - + if(elements_width==6){ my_vertices[reCast(*(elements+elements_width*i+3))-1]=1; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp (revision 13622) @@ -23,5 +23,5 @@ IssmDouble heatcapacity; IssmDouble referencetemperature; - + /*Output*/ IssmDouble *spcvector = NULL; @@ -85,5 +85,5 @@ /*Create constraints from x,y,z: */ for (i=0;imy_vertices[i])){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp (revision 13622) @@ -22,5 +22,4 @@ if(!loads) loads = new Loads(); - /*Assign output pointer: */ *ploads=loads; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 13622) @@ -25,5 +25,5 @@ /*Fetch parameters: */ iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); - + /*Recover pointer: */ nodes=*pnodes; @@ -40,5 +40,5 @@ for (i=0;imy_vertices[i]){ - + /*Add node to nodes dataset: */ nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i+1,i,iomodel,EnthalpyAnalysisEnum)); @@ -49,5 +49,5 @@ /*Clean fetched data: */ iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); - + /*Assign output pointer: */ *pnodes=nodes; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 13622) @@ -59,5 +59,5 @@ iomodel->FetchDataToInput(elements,VyEnum); iomodel->FetchDataToInput(elements,VzEnum); - + /*Free data: */ iomodel->DeleteData(4,MeshElementsEnum,TemperatureEnum,WaterfractionEnum,PressureEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp (revision 13622) @@ -23,5 +23,5 @@ if(!constraints) constraints = new Constraints(); IoModelToConstraintsx(constraints,iomodel,HydrologySpcwatercolumnEnum,HydrologyAnalysisEnum); - + /*Assign output pointer: */ *pconstraints=constraints; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp (revision 13622) @@ -25,5 +25,5 @@ /*Fetch parameters: */ iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); - + /*Recover pointer: */ nodes=*pnodes; @@ -46,5 +46,5 @@ } iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); - + /*Assign output pointer: */ *pnodes=nodes; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (revision 13622) @@ -17,5 +17,5 @@ int numberofelements; - + /*Fetch data needed: */ iomodel->Constant(&numberofelements,MeshNumberofelementsEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (revision 13622) @@ -16,5 +16,5 @@ int i; int count; - + /*Intermediary*/ Constraints* constraints = NULL; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 13622) @@ -22,5 +22,5 @@ /*DataSets: */ Nodes* nodes = NULL; - + /*Fetch parameters: */ iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); @@ -40,5 +40,5 @@ if(iomodel->my_vertices[i]){ - + /*Add node to nodes dataset: */ nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i+1,i,iomodel,MeltingAnalysisEnum)); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 13622) @@ -55,5 +55,5 @@ iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); iomodel->FetchDataToInput(elements,PressureEnum); - + /*Free data: */ iomodel->DeleteData(1,MeshElementsEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 13622) @@ -21,5 +21,5 @@ int i,analysis_type,dim,verbose; bool isthermal,isprognostic,isdiagnostic,isgroundingline,isenthalpy; - + /*output: */ Elements *elements = NULL; @@ -31,5 +31,4 @@ Parameters *parameters = NULL; - /*Initialize IoModel from input file*/ IoModel* iomodel = new IoModel(IOMODEL); @@ -67,5 +66,5 @@ if(solution_type==SteadystateSolutionEnum && analysis_type==MeltingAnalysisEnum && isenthalpy==true) continue; if(solution_type==SteadystateSolutionEnum && analysis_type==EnthalpyAnalysisEnum && isenthalpy==false) continue; - + if(VerboseMProcessor()) _pprintLine_(" creating datasets for analysis " << EnumToStringx(analysis_type)); CreateDataSets(&elements,&nodes,&vertices,&materials,&constraints,&loads,¶meters,iomodel,rootpath,solution_type,analysis_type,nummodels,i); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 13622) @@ -22,5 +22,5 @@ void NodesPartitioning(bool** pmy_nodes,bool* my_elements, int* my_vertices, IoModel* iomodel, bool continuous){ - + /*First thing, this is a new partition for a new analysis_type, therefore, to avoid a leak, erase the nodes partition that might come through pmy_nodes: */ xDelete(*pmy_nodes); @@ -51,5 +51,4 @@ } - void DiscontinuousGalerkinNodesPartitioning(bool** pmy_nodes,bool* my_elements, int* my_vertices, IoModel* iomodel){ @@ -62,5 +61,5 @@ * the nodes and the vertices. The vertices are similar to continuous galerkin, but the nodes partitioning involves edges, which mess up sorting of * ids. */ - + int i,j; int dim; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (revision 13622) @@ -11,5 +11,5 @@ int stabilization; - + /*Fetch parameters: */ iomodel->Constant(&stabilization,PrognosticStabilizationEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 13622) @@ -25,5 +25,5 @@ /*DataSet*/ Loads* loads = NULL; - + /*Fetch parameters: */ iomodel->Constant(&stabilization,PrognosticStabilizationEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SortDataSets.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SortDataSets.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SortDataSets.cpp (revision 13622) @@ -14,5 +14,4 @@ #include "../../EnumDefinitions/EnumDefinitions.h" #include "./ModelProcessorx.h" - void SortDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Loads** ploads, Materials** pmaterials, Constraints** pconstraints, Parameters** pparameters){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp (revision 13622) @@ -15,5 +15,5 @@ /*Output*/ Constraints* constraints = NULL; - + /*Recover pointer: */ constraints=*pconstraints; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 13622) @@ -31,8 +31,8 @@ /*Create nodes if they do not exist yet*/ if(!nodes) nodes = new Nodes(); - + /*Continuous Galerkin partition of nodes: */ NodesPartitioning(&iomodel->my_nodes,iomodel->my_elements,iomodel->my_vertices,iomodel,continuous_galerkin); - + /*First fetch data: */ iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); @@ -41,5 +41,5 @@ if(iomodel->my_vertices[i]){ - + /*Add node to nodes dataset: */ nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i+1,i,iomodel,SurfaceSlopeAnalysisEnum)); @@ -50,5 +50,5 @@ /*Clean fetched data: */ iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); - + /*Assign output pointer: */ *pnodes=nodes; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 13622) @@ -37,10 +37,10 @@ iomodel->FetchDataToInput(elements,BedEnum); iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); - + if (dim==3){ iomodel->FetchDataToInput(elements,MeshElementonbedEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } - + /*Free data: */ iomodel->DeleteData(1,MeshElementsEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (revision 13622) @@ -18,5 +18,5 @@ int count; int dim; - + /*Output*/ Constraints* constraints = NULL; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp (revision 13622) @@ -40,5 +40,5 @@ for (i=0;imy_vertices[i]==1)){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 13622) @@ -49,5 +49,5 @@ /*Clean fetched data: */ iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); - + /*Assign output pointer: */ *pnodes=nodes; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 13622) @@ -60,5 +60,5 @@ iomodel->FetchDataToInput(elements,VyEnum); iomodel->FetchDataToInput(elements,VzEnum); - + if(dakota_analysis){ elements->InputDuplicate(TemperatureEnum,QmuTemperatureEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/UpdateCounters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/UpdateCounters.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/UpdateCounters.cpp (revision 13622) @@ -26,5 +26,4 @@ constraints=*pconstraints; - if(nodes) iomodel->nodecounter=nodes->NumberOfNodes(); else iomodel->nodecounter=0; @@ -32,5 +31,5 @@ if(loads)iomodel->loadcounter=loads->NumberOfLoads(); else iomodel->loadcounter=0; - + if(constraints)iomodel->constraintcounter=constraints->NumberOfConstraints(); else iomodel->constraintcounter=0; Index: /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/NodeConnectivityx/NodeConnectivityx.cpp (revision 13622) @@ -34,6 +34,4 @@ double* connectivity=NULL; - - /*Allocate connectivity: */ connectivity=xNewZeroInit(nods*width); @@ -46,10 +44,10 @@ for(i=0;i<3;i++){ - + node=(int)*(elements+n*3+i); //already matlab indexed, elements comes directly from the workspace. index=node-1; num_elements=(int)*(connectivity+width*index+maxels); //retrieve number of elements already plugged into the connectivity of this node. - + already_plugged=0; for(j=0;jNumberOfNodes(configuration_type)){ Index: /issm/trunk-jpl/src/c/modules/Orthx/Orthx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Orthx/Orthx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Orthx/Orthx.cpp (revision 13622) @@ -6,5 +6,5 @@ void Orthx( Vector** pnewgradj, Vector* gradj, Vector* oldgradj){ - + /*output: */ Vector* newgradj=NULL; Index: /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/OutputResultsx/OutputResultsx.cpp (revision 13622) @@ -15,5 +15,5 @@ #include "../../io/io.h" #include "../../classes/objects/objects.h" - + void OutputResultsx(Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Results* results){ @@ -26,8 +26,8 @@ char* solutiontypestring = NULL; bool dakota_analysis = false; - + /*retrieve parameters: */ parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum); - + /*recover my_rank:*/ my_rank=IssmComm::GetRank(); @@ -54,5 +54,5 @@ /*Now, open file for writing, if not already done: */ if(!parameters->Exist(OutputFilePointerEnum)){ - + /*We don't have a file pointer. Retrieve the output file name and open it for writing:*/ parameters->FindParam(&outputfilename,OutputfilenameEnum); @@ -72,5 +72,5 @@ } xDelete(outputfilename); - + /*Add file pointer in parameters for further calls to OutputResultsx: */ parameters->SetParam(fid,OutputFilePointerEnum); Index: /issm/trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp (revision 13622) @@ -59,11 +59,11 @@ numanalyses=0; while ( fgets(line, sizeof line, fid) ){ - + /*skip comments and empty lines: */ if ((line[0]=='%') || (line[0]=='\n') || (line[0]==' ') || (line[0]=='\t') || (line[0]=='\r'))continue; - + /*Get rid of end of line: */ line[strlen(line)-1]='\0'; - + if (line[0]=='+'){ /*this is the analysis line: */ analyses[numanalyses]=StringToEnumx(&line[1]); //skip the '+' Index: /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp (revision 13622) @@ -24,5 +24,5 @@ my_thread=handle->id; num_threads=handle->num; - + /*recover parameters :*/ x=gate->x; @@ -57,5 +57,5 @@ if (j==i)continue; distance=sqrt(pow(x[i]-x[j],2)+ pow(y[i]-y[j],2)); - + if(distance<=mindistance){ @@ -74,5 +74,5 @@ /*Free ressources:*/ xDelete(already); - + return NULL; } Index: /issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/PositiveDegreeDayx/PositiveDegreeDayx.cpp (revision 13622) @@ -35,12 +35,12 @@ IssmDouble PDup, PDCUT = 2.0; // PDcut: rain/snow cutoff temperature (C) IssmDouble tstar; // monthly mean surface temp - + IssmDouble* pdds=NULL; IssmDouble* pds=NULL; Element* element = NULL; - + pdds=xNew(NPDMAX+1); pds=xNew(NPDCMAX+1); - + // initialize PDD (creation of a lookup table) tstep = 0.1; @@ -55,5 +55,5 @@ itm = reCast((2*siglim/DT + 1.5)); - + if (itm >= NPDMAX){ _printLine_("increase NPDMAX in massBalance.cpp"); @@ -73,5 +73,5 @@ } pdds[itm+1] = siglim + DT; - + //*********compute PD(T) : snow/precip fraction. precipitation falling as snow tstepc = 0.1; @@ -100,5 +100,5 @@ pds[itm+1] = 0.; // *******END initialize PDD - + for(i=0;iSize();i++){ element=(Element*)elements->GetObjectByOffset(i); @@ -108,4 +108,4 @@ xDelete(pdds); xDelete(pds); - + } Index: /issm/trunk-jpl/src/c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp (revision 13622) @@ -15,5 +15,4 @@ RecursivePropagation(pool, connectivity,index, flags); } - void RecursivePropagation(double* pool, double* connectivity, int index, double* flags){ Index: /issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp (revision 13622) @@ -49,5 +49,4 @@ } - /*Free ressources and return*/ xdelete(&y_s0); Index: /issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp (revision 13622) @@ -5,5 +5,5 @@ #include "./Reducevectorgtofx.h" - + void Reducevectorgtofx(Vector** puf, Vector* ug, Nodes* nodes,Parameters* parameters){ Index: /issm/trunk-jpl/src/c/modules/RequestedDependentsx/RequestedDependentsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/RequestedDependentsx/RequestedDependentsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/RequestedDependentsx/RequestedDependentsx.cpp (revision 13622) @@ -10,6 +10,4 @@ void RequestedDependentsx(Results* results,Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters){ - - int i; Index: /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp (revision 13622) @@ -29,5 +29,5 @@ void SetControlInputsFromVectorx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vector* vector){ - + IssmDouble* serial_vector=NULL; Index: /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (revision 13622) @@ -15,5 +15,5 @@ #ifdef _HAVE_SHAPELIB_ //only works if Shapelib library has been compiled in. - + double cm,sp; @@ -33,5 +33,5 @@ #ifdef _HAVE_SHAPELIB_ //only works if Shapelib library has been compiled in. - + int i,j,k,iret=0; int lwidth=1; @@ -611,3 +611,2 @@ #endif } - Index: /issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/SmbGradientsx/SmbGradientsx.cpp (revision 13622) @@ -18,7 +18,7 @@ int i; - + Element* element = NULL; - + for(i=0;iSize();i++){ element=(Element*)elements->GetObjectByOffset(i); Index: /issm/trunk-jpl/src/c/modules/SmearFunctionx/SmearFunctionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SmearFunctionx/SmearFunctionx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/SmearFunctionx/SmearFunctionx.cpp (revision 13622) @@ -11,5 +11,5 @@ void SmearFunctionx(Vec* psmearedvector,double (*WeightFunction)(double distance,double radius), int SmearedFieldEnum, double radius,Elements* elements,Nodes* nodes, Parameters* parameters){ - + Element *element = NULL; Vec x=NULL; @@ -29,5 +29,5 @@ gsize=nodes->NumberOfDofs(configuration_type,GsetEnum); smearedvector=NewVec(gsize,IssmComm::GetComm()); - + x=NewVec(gsize,IssmComm::GetComm()); y=NewVec(gsize,IssmComm::GetComm()); @@ -38,6 +38,4 @@ } - - /*Fill smearedvector vector: */ for (i=0;iSize();i++){ @@ -46,11 +44,9 @@ } - VecAssemblyBegin(smearedvector); VecAssemblyEnd(smearedvector); - + /*Assign output pointers: */ *psmearedvector=smearedvector; } - Index: /issm/trunk-jpl/src/c/modules/Solverx/DofTypesToIndexSet.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/DofTypesToIndexSet.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Solverx/DofTypesToIndexSet.cpp (revision 13622) @@ -12,5 +12,5 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - + void DofTypesToIndexSet(IS* pisv, IS* pisp, Vec df,int typeenum){ @@ -62,5 +62,5 @@ } VecRestoreArray(df,&df_local); - + /*Create indices sets: */ #if _PETSC_MAJOR_ < 3 || (_PETSC_MAJOR_ == 3 && _PETSC_MINOR_ < 2) Index: /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp (revision 13622) @@ -20,5 +20,5 @@ Vec uf0_vector = NULL; Vec df_vector = NULL; - + if(uf0) uf0_vector = uf0->vector; if(df) df_vector = df->vector; @@ -148,5 +148,5 @@ if(VerboseSolver())KSPView(ksp,PETSC_VIEWER_STDOUT_WORLD); KSPSolve(ksp,pf,uf); - + /*Check convergence*/ KSPGetIterationNumber(ksp,&iteration_number); @@ -155,5 +155,5 @@ /*Free resources:*/ KSPFree(&ksp); - + /*Assign output pointers:*/ *puf=uf; Index: /issm/trunk-jpl/src/c/modules/SpcNodesx/SpcNodesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SpcNodesx/SpcNodesx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/SpcNodesx/SpcNodesx.cpp (revision 13622) @@ -13,5 +13,5 @@ for(int i=0;iSize();i++){ - + Constraint* constraint=(Constraint*)constraints->GetObjectByOffset(i); Index: /issm/trunk-jpl/src/c/modules/SurfaceAreax/SurfaceAreax.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SurfaceAreax/SurfaceAreax.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/SurfaceAreax/SurfaceAreax.cpp (revision 13622) @@ -12,5 +12,5 @@ void SurfaceAreax( IssmDouble* pS, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){ - + /*Intermediary*/ Element* element=NULL; @@ -20,5 +20,5 @@ IssmDouble S=0; IssmDouble S_sum; - + /*Compute gradients: */ for (i=0;iSize();i++){ Index: /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (revision 13622) @@ -11,5 +11,5 @@ void SystemMatricesx(Matrix** pKff, Matrix** pKfs, Vector** ppf, Vector** pdf, IssmDouble* pkmax,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,bool kflag,bool pflag,bool penalty_kflag,bool penalty_pflag){ - + /*intermediary: */ int i,j; @@ -19,5 +19,5 @@ Element *element = NULL; Load *load = NULL; - + /*output: */ Matrix* Kff = NULL; @@ -70,5 +70,5 @@ df->Assemble(); } - + if(pflag){ @@ -106,5 +106,4 @@ } - if(penalty_pflag){ Index: /issm/trunk-jpl/src/c/modules/TimeAdaptx/TimeAdaptx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/TimeAdaptx/TimeAdaptx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/TimeAdaptx/TimeAdaptx.cpp (revision 13622) @@ -24,5 +24,5 @@ /*Go through elements, and figure out the minimum of the time steps for each element (using CFL criterion): */ element=(Element*)elements->GetObjectByOffset(0); min_dt=element->TimeAdapt(); - + for (i=1;iSize();i++){ element=(Element*)elements->GetObjectByOffset(i); Index: /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp (revision 13622) @@ -76,9 +76,9 @@ } } - + /*fill in the point attribute list: */ in.pointattributelist = xNew(in.numberofpoints*in.numberofpointattributes); for (i=0;i(in.numberofpoints); @@ -96,5 +96,5 @@ in.numberofsegments+=contour->nods-1; } - + in.segmentlist = xNew(in.numberofsegments*2); in.segmentmarkerlist = xNewZeroInit(in.numberofsegments); @@ -128,5 +128,5 @@ counter++; } - + /*Build regions: */ in.numberofregions = 0; @@ -194,5 +194,5 @@ index_matrix=new SeqMat(index,out.numberoftriangles,3,1.0); *pindex=index_matrix; - + segments_matrix=new SeqMat(segments,out.numberofsegments,3,1.0); *psegments=segments_matrix; Index: /issm/trunk-jpl/src/c/modules/TriaSearchx/TriaSearchx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/TriaSearchx/TriaSearchx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/TriaSearchx/TriaSearchx.cpp (revision 13622) @@ -40,5 +40,5 @@ //Get current point coordinates r.x=x0[i]; r.y=y0[i]; - + I=Th.R2ToI2(r); Index: /issm/trunk-jpl/src/c/modules/UpdateConstraintsx/UpdateConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/UpdateConstraintsx/UpdateConstraintsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/UpdateConstraintsx/UpdateConstraintsx.cpp (revision 13622) @@ -23,5 +23,5 @@ /*start module: */ if(VerboseModule()) _pprintLine_(" Updating constraints for time: " << time); - + /*First, update dof constraints in nodes, using constraints: */ SpcNodesx(nodes,constraints,parameters,analysis_type); Index: /issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (revision 13622) @@ -11,5 +11,5 @@ void UpdateDynamicConstraintsx(Constraints* constraints,Nodes* nodes,Parameters* parameters,Vector* yg){ - + int configuration_type; IssmDouble* yg_serial=NULL; Index: /issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/modules/VecMergex/VecMergex.cpp (revision 13622) @@ -18,8 +18,7 @@ /*retrieve parameters: */ parameters->FindParam(&configuration_type,ConfigurationTypeEnum); - + /*serialize uf: */ uf_serial=uf->ToMPISerial(); - /*Do we have any nodes for this configuration? :*/ Index: /issm/trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp =================================================================== --- /issm/trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/python/io/CheckNumPythonArguments.cpp (revision 13622) @@ -8,5 +8,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - #define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol @@ -23,5 +22,5 @@ /*figure out size of tuple in input: */ size=PyTuple_Size(inputs); - + /*check on requested size: */ if (size==0){ Index: /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp =================================================================== --- /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp (revision 13622) @@ -47,5 +47,5 @@ bool boolean; - + /*check this is indeed a subtype of long type: */ if(!PyBool_Check(py_boolean))_error_("expecting a boolean in input!"); @@ -56,5 +56,5 @@ /*simple copy: */ *pboolean=boolean; - + } /*}}}*/ @@ -74,5 +74,5 @@ dims=PyArray_DIMS((PyArrayObject*)py_matrix); M=dims[0]; N=dims[1]; - + if (M && N) { /*retrieve internal value: */ @@ -110,5 +110,5 @@ dims=PyArray_DIMS((PyArrayObject*)py_matrix); M=dims[0]; N=dims[1]; - + if (M && N) { /*retrieve internal value: */ @@ -143,5 +143,5 @@ dims=PyArray_DIMS((PyArrayObject*)py_vector); M=dims[0]; - + if (M) { /*retrieve internal value: */ @@ -336,5 +336,5 @@ /*convert from bytes to string: */ string=PyBytes_AS_STRING(py_bytes); - + *pstring=string; } Index: /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp =================================================================== --- /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 13622) @@ -24,5 +24,5 @@ /*FUNCTION WriteData(PyObject* py_tuple,int index,int integer){{{*/ void WriteData(PyObject* py_tuple, int index, int integer){ - + PyTuple_SetItem(py_tuple, index, PyInt_FromSsize_t(integer)); @@ -30,5 +30,5 @@ /*FUNCTION WriteData(PyObject* py_tuple,int index,char* string){{{*/ void WriteData(PyObject* py_tuple, int index, char* string){ - + PyTuple_SetItem(py_tuple, index, PyUnicode_FromString(string)); @@ -48,5 +48,5 @@ /*FUNCTION WriteData(PyObject* py_tuple,int index){{{*/ void WriteData(PyObject* py_tuple, int index){ - + PyTuple_SetItem(py_tuple, index, Py_None); @@ -118,10 +118,10 @@ /*FUNCTION WriteData(PyObject* py_tuple,int index,SeqMat* matrix){{{*/ void WriteData(PyObject* py_tuple,int index,SeqMat* matrix){ - + int M,N; double* buffer=NULL; npy_intp dims[2]={0,0}; PyObject* array=NULL; - + buffer=matrix->ToSerial(); matrix->GetSize(&M,&N); @@ -129,5 +129,5 @@ dims[1]=(npy_intp)N; array=PyArray_SimpleNewFromData(2,dims,NPY_DOUBLE,buffer); - + PyTuple_SetItem(py_tuple, index, array); @@ -135,15 +135,15 @@ /*FUNCTION WriteData(PyObject* py_tuple,int index,SeqVec* vector){{{*/ void WriteData(PyObject* py_tuple,int index,SeqVec* vector){ - + int M; double* buffer=NULL; npy_intp dim=10; PyObject* array=NULL; - + buffer=vector->ToMPISerial(); vector->GetSize(&M); dim=(npy_intp)M; array=PyArray_SimpleNewFromData(1,&dim,NPY_DOUBLE,buffer); - + PyTuple_SetItem(py_tuple, index, array); } Index: /issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp (revision 13622) @@ -11,5 +11,4 @@ * the allocation routines described here do not work. */ - #ifdef HAVE_CONFIG_H @@ -28,5 +27,5 @@ void xdelete(Matrix** pv){ - + if (pv && *pv){ /*There is no mxDelete in the Matlab API -> using delete trips up Matlab. So we Index: /issm/trunk-jpl/src/c/shared/Elements/GetGlobalDofList.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/GetGlobalDofList.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Elements/GetGlobalDofList.cpp (revision 13622) @@ -9,5 +9,4 @@ int* ndof_list=NULL; int *doflist = NULL; - if(numnodes){ Index: /issm/trunk-jpl/src/c/shared/Elements/GetLocalDofList.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/GetLocalDofList.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Elements/GetLocalDofList.cpp (revision 13622) @@ -15,5 +15,4 @@ ndof_list=xNew(numnodes); ngdof_list_cumulative=xNew(numnodes); - /*Get number of dofs per node, and total for this given set*/ Index: /issm/trunk-jpl/src/c/shared/Elements/Paterson.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/Paterson.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Elements/Paterson.cpp (revision 13622) @@ -10,5 +10,5 @@ IssmDouble Paterson(IssmDouble temperature){ - + /*output: */ IssmDouble B; @@ -29,5 +29,4 @@ // % fittedmodel=fit(Temp,B,'cubicspline'); // % B=fittedmodel(temperature); - if(T<=-45.0){ @@ -70,5 +69,2 @@ return B; } - - - Index: /issm/trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp (revision 13622) @@ -11,5 +11,5 @@ int iqj,imonth, j; - + IssmDouble saccu; // yearly surface accumulation IssmDouble smelt; // yearly melt @@ -19,5 +19,5 @@ IssmDouble runoff; //meltwater only, does not include rain IssmDouble sconv; //rhow_rain/rhoi / 12 months - + IssmDouble density; IssmDouble lapser=6.5/1000., sealev=0.; // lapse rate. degrees per meter. 7.5 lev's 99 paper, 9 Marshall 99 paper @@ -27,5 +27,5 @@ IssmDouble st; // elevation between altitude of the temp record and current altitude IssmDouble sp; // elevation between altitude of the prec record and current altitude - + // PDD and PD constants and variables IssmDouble siglim; // sigma limit for the integration which is equal to 2.5 sigmanorm @@ -35,5 +35,5 @@ IssmDouble DT = 0.02; IssmDouble pddt, pd; // pd: snow/precip fraction, precipitation falling as snow - + IssmDouble q, qmpt; // q is desert/elev. fact, hnpfac is huybrect fact, and pd is normal dist. IssmDouble qm = 0.; // snow part of the precipitation @@ -42,22 +42,21 @@ IssmDouble pdd = 0.; IssmDouble frzndd = 0.; - + IssmDouble tstar; // monthly mean surface temp IssmDouble Tsum= 0.; // average summer (JJA) temperature IssmDouble Tsurf = 0.; // average annual temperature - IssmDouble deltm=1./12.; int ismon[12]={11,0,1,2,3,4,5,6,7,8,9,10}; - + IssmDouble snwm; // snow that could have been melted in a year. IssmDouble snwmf; // ablation factor for snow per positive degree day. IssmDouble smf; // ablation factor for ice per pdd (Braithwaite 1995 from tarasov 2002). - + IssmDouble dfrz=1.5, CovrLm=2009./3.35e+5, dCovrLm=dfrz*CovrLm; //m*J kg^-1 C^-1 /(J kg^-1)=m/C yr IssmDouble supice,supcap,diffndd; IssmDouble fsupT=0.5, fsupndd=0.5; // Tsurf mode factors for supice IssmDouble pddtj, hmx2; - + sconv=(rho_water/rho_ice)/12.; //rhow_rain/rhoi / 12 months @@ -68,13 +67,13 @@ siglim0c = siglimc/DT + 0.5; PDup = siglimc+PDCUT; - + // seasonal loop for (iqj = 0; iqj < 12; iqj++){ imonth = ismon[iqj]; - + st=(s-s0t)/1000.; tstar = monthlytemperatures[imonth] - lapser *max(st,sealev); Tsurf = tstar*deltm+Tsurf; - + /*********compute PD ****************/ if (tstar < PDup){ @@ -83,15 +82,15 @@ else { pd = 0.;} - + /******exp des/elev precip reduction*******/ sp=(s-s0p)/1000.; // deselev effect is wrt chng in topo if (sp>0.0){q = exp(-desfac*sp);} else {q = 1.0;} - + qmt= qmt + monthlyprec[imonth]*sconv; //*sconv to convert in m of ice equivalent per month qmpt= q*monthlyprec[imonth]*sconv; qmp= qmp + qmpt; qm= qm + qmpt*pd; - + /*********compute PDD************/ // ndd(month)=-(tstar-pdd(month)) since ndd+pdd gives expectation of @@ -105,10 +104,10 @@ else{frzndd = frzndd - tstar*deltm; } } // end of seasonal loop - + //****************************************************************** saccu = qm; prect = qmp; // total precipitation during 1 year taking into account des. ef. Tsum=Tsum/3; - + /***** determine PDD factors *****/ if(Tsum< -1.) { @@ -126,10 +125,10 @@ snwmf=0.95*snwmf; smf=0.95*smf; - + /***** compute PDD ablation and refreezing *****/ pddt = pdd *365; snwm = snwmf*pddt; // snow that could have been melted in a year hmx2 = min(h,dfrz); // refreeze active layer max depth: dfrz - + if(snwm < saccu) { water=prect-saccu + snwm; //water=rain + snowmelt @@ -147,7 +146,7 @@ // hold the meltwater around for refreezing? And melt-time will have // low seasonal frzndd - + // Superimposed ice : Pfeffer et al. 1991, Tarasov 2002 - + supice= min(hmx2*CovrLm*frzndd+2.2*(saccu-snwm), water); // superimposed ice supcap=min(2.2*(saccu-snwm),water); @@ -172,5 +171,5 @@ // does supice make sense when H< 0.1m? then d=thermoactive ice layer //// // < 0.1 - + // make more sense to just use residual pdd-ndd except that pdd // residual not clear yet @@ -197,9 +196,9 @@ if(Tsurf<0) { Tsurf= min(Tsurf+fsupT*diffndd , 0.);} - + B = -smelt+saccu; B = B/yts; pddtj=pddt; - + return B; } Index: /issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp (revision 13622) @@ -29,7 +29,7 @@ ErrorException::~ErrorException() throw(){ - + int num_procs; - + /*recover num_procs:*/ num_procs=IssmComm::GetSize(); @@ -45,13 +45,11 @@ void ErrorException::Report() const{ - + int my_rank; int num_procs; - + /*recover my_rank and num_procs:*/ my_rank=IssmComm::GetRank(); num_procs=IssmComm::GetSize(); - - if (function_name=="" || file_line==0){ //WINDOWS Index: /issm/trunk-jpl/src/c/shared/Exceptions/exprintf.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exceptions/exprintf.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Exceptions/exprintf.cpp (revision 13622) @@ -5,5 +5,4 @@ * ErrorException(exprintf("%s%i\n","test failed for id:",id)); */ - #include Index: /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineWrite.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineWrite.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Exp/DomainOutlineWrite.cpp (revision 13622) @@ -12,5 +12,5 @@ int DomainOutlineWrite(int nprof,int* profnvertices,double** pprofx,double** pprofy,bool* closed,char* domainname){ - + /*Error management: */ int noerr=1; @@ -33,8 +33,8 @@ fprintf(fid,"%s %s\n","##","Icon:0"); fprintf(fid,"%s %s %s %s\n","#","Points","Count","Value"); - + /*Write number of profile vertices: */ fprintf(fid,"%u %s\n",profnvertices[counter] ,"1."); - + /*Write next line: */ fprintf(fid,"%s %s %s %s %s\n","#","X","pos","Y","pos"); Index: /issm/trunk-jpl/src/c/shared/Exp/IsInPoly.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exp/IsInPoly.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Exp/IsInPoly.cpp (revision 13622) @@ -18,5 +18,5 @@ int i, j, c = 0; double n1, n2, normp, scalar; - + /*first test, are they colinear? if yes, is the point in the middle of the segment*/ if (edgevalue != 2 ){ Index: /issm/trunk-jpl/src/c/shared/Exp/IsInPolySerial.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exp/IsInPolySerial.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Exp/IsInPolySerial.cpp (revision 13622) @@ -5,7 +5,5 @@ #include - #include "./exp.h" - int IsInPolySerial(double* in,double* xc,double* yc,int numvertices,double* x,double* y,int nods, int edgevalue){ Index: /issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp (revision 13622) @@ -40,5 +40,5 @@ maxiter=optpars->maxiter; cm_jump=optpars->cm_jump; - + /*initialize counter and get response at the boundaries*/ iter=0; Index: /issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Numerics/IsInputConverged.cpp (revision 13622) @@ -20,5 +20,5 @@ /*output: */ IssmDouble eps; - + /*intermediary: */ IssmDouble *newvalues = NULL; Index: /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp (revision 13622) @@ -38,5 +38,5 @@ x2 =optpars->xmax; maxiter =optpars->maxiter; - + //get the value of the function at the first boundary fx1= (*f)(x1,optargs); Index: /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 13622) @@ -16,5 +16,5 @@ char* OptionsFromAnalysis(Parameters* parameters,int analysis_type){ - + /*output: */ char* outstring=NULL; Index: /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 13622) @@ -40,9 +40,8 @@ } - IssmDouble UnitConversionScaleFactor(int type_enum){ IssmDouble yts=365.0*24.0*3600.0; - + IssmDouble scale; switch(type_enum){ Index: /issm/trunk-jpl/src/c/shared/Numerics/cross.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/cross.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Numerics/cross.cpp (revision 13622) @@ -20,3 +20,2 @@ } - Index: /issm/trunk-jpl/src/c/shared/Sorting/binary_search.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Sorting/binary_search.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Sorting/binary_search.cpp (revision 13622) @@ -47,5 +47,5 @@ } } - + //did we find the target? if (*mid == target) { @@ -60,5 +60,5 @@ /*Assign output pointers:*/ *poffset=offset; - + /*Return result: */ return found; Index: /issm/trunk-jpl/src/c/shared/String/DescriptorIndex.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/String/DescriptorIndex.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/String/DescriptorIndex.cpp (revision 13622) @@ -18,5 +18,5 @@ int DescriptorIndex(char* root, int* pindex,char* descriptor){ //We assume root has already been allocated, and we just have to copy into it. - + char * pch=NULL; Index: /issm/trunk-jpl/src/c/shared/Threads/LaunchThread.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Threads/LaunchThread.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Threads/LaunchThread.cpp (revision 13622) @@ -31,5 +31,5 @@ pthread_t *threads = NULL; pthread_handle *handles = NULL; - + /*dynamically allocate: */ threads=xNew(num_threads); @@ -52,5 +52,5 @@ } } - + /*Free ressources:*/ xDelete(threads); @@ -62,5 +62,5 @@ handle.id=0; handle.num=1; - + function((void*)&handle); #endif Index: /issm/trunk-jpl/src/c/shared/Threads/PartitionRange.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Threads/PartitionRange.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/Threads/PartitionRange.cpp (revision 13622) @@ -16,8 +16,7 @@ int i0=-1; int i1=-1; - + int step; int i; - /*distribute elements across threads :*/ @@ -29,5 +28,4 @@ } - /*Assign output pointers:*/ *pi0=i0; Index: /issm/trunk-jpl/src/c/shared/TriMesh/AssociateSegmentToElement.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/TriMesh/AssociateSegmentToElement.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/TriMesh/AssociateSegmentToElement.cpp (revision 13622) @@ -6,5 +6,5 @@ int AssociateSegmentToElement(double** psegments,int nseg, double* index,int nel){ - + /*Error management: */ int i; @@ -30,4 +30,2 @@ return noerr; } - - Index: /issm/trunk-jpl/src/c/shared/TriMesh/OrderSegments.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/TriMesh/OrderSegments.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/TriMesh/OrderSegments.cpp (revision 13622) @@ -6,5 +6,5 @@ int OrderSegments(double** psegments,int nseg, double* index,int nel){ - + /*Error management: */ int i; @@ -18,5 +18,4 @@ /*element indices: */ int el; - /*Recover segments: */ Index: /issm/trunk-jpl/src/c/shared/TriMesh/SplitMeshForRifts.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/TriMesh/SplitMeshForRifts.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/shared/TriMesh/SplitMeshForRifts.cpp (revision 13622) @@ -12,8 +12,8 @@ x and y of size nodsx1 segments of size nsegsx3*/ - + /*Error management: */ int noerr=1; - + int i,j,k,l; int node; @@ -23,5 +23,5 @@ int* riftsegments=NULL; int* flags=NULL; - + int NumGridElementListOnOneSideOfRift; int* GridElementListOnOneSideOfRift=NULL; @@ -55,5 +55,5 @@ for (i=0;i(riftsegments_uncompressed); - + /*Assign output pointers: */ *priftsegments=riftsegments; @@ -344,5 +344,5 @@ *psegmentmarkerlist=segmentmarkerlist; *pnsegs=nsegs; - + return noerr; }/*}}}*/ @@ -384,5 +384,5 @@ double *segmentmarkerlist = NULL; int numsegs; - + /*output: */ int new_numsegs; @@ -460,5 +460,4 @@ /*FUNCTION PairRiftElements{{{*/ int PairRiftElements(int** priftsnumpairs, double*** priftspairs,int numrifts,int* riftsnumsegments, double** riftssegments,double* x,double* y){ - int noerr=1; @@ -693,5 +692,5 @@ int i; int noerr=1; - + /*output: */ int riftflag=0; @@ -717,5 +716,5 @@ /*FUNCTION OrderRifts{{{*/ int OrderRifts(double** priftstips, double** riftssegments,double** riftspairs,int numrifts,int* riftsnumsegments,double* x,double* y,int nods,int nels){ - + int noerr=1; int i,j,k,counter; @@ -747,5 +746,5 @@ riftpairs=riftspairs[i]; numsegs=riftsnumsegments[i]; - + /*Allocate copy of riftsegments and riftpairs, *as well as ordering vector: */ @@ -793,5 +792,5 @@ } } - + if (node4==node2){ /*node2 is a tip*/ @@ -818,5 +817,5 @@ node1=(int)*(riftsegments+3*j+0); node2=(int)*(riftsegments+3*j+1); - + if ((node1==node) || (node2==node)){ /*Ok, this segment is connected to node, plug its index into order, unless we already plugged it before: */ @@ -851,5 +850,5 @@ *(riftpairs_copy+2*j+1)=*(riftpairs+2*order[j]+1); } - + for (j=0;j((numsegs/2-1)*RIFTPENALTYPAIRSWIDTH); - + /*Go through only one flank of the rifts, not counting the tips: */ counter=0; @@ -997,5 +995,5 @@ *(riftpenaltypairs+j*7+5)=*(riftpenaltypairs+j*7+5)/magnitude; } - + riftspenaltypairs[i]=riftpenaltypairs; riftsnumpenaltypairs[i]=(numsegs/2-1); @@ -1035,5 +1033,4 @@ y=*py; nods=*pnods; - for (i=0;i* df = NULL; Vector* ys = NULL; - + Loads* loads=NULL; bool converged; Index: /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp (revision 13622) @@ -42,5 +42,5 @@ femmodel->parameters->FindParam(&max_nonlinear_iterations,DiagnosticMaxiterEnum); UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters); - + count=1; converged=false; @@ -56,5 +56,5 @@ femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); - + //Update once again the solution to make sure that vx and vxold are similar (for next step in transient or steadystate) InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_horiz); @@ -77,5 +77,5 @@ femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum); femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); - + /*solve: */ SystemMatricesx(&Kff_vert, &Kfs_vert, &pf_vert, &df_vert,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); Index: /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp (revision 13622) @@ -35,5 +35,4 @@ bool lowmem=0; int configuration_type; - /*Recover parameters: */ @@ -76,5 +75,5 @@ InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum); - + if(converged)break; } Index: /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp (revision 13622) @@ -26,5 +26,4 @@ MPI_Comm_size(comm,&num_procs); - /*We are not bound by any library, just use what seems most logical*/ num_local_rows=xNew(num_procs); @@ -36,5 +35,5 @@ num_local_rows[i]=(int)floor((double)global_size/(double)num_procs); } - + /*There may be some rows left. Distribute evenly.*/ row_rest=global_size - num_procs*(int)floor((double)global_size/(double)num_procs); @@ -43,5 +42,5 @@ } local_size=num_local_rows[my_rank]; - + /*free ressources: */ xDelete(num_local_rows); Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp (revision 13622) @@ -46,5 +46,5 @@ int* idxm=NULL; int* idxn=NULL; - + if(M)idxm=xNew(M); if(N)idxn=xNew(N); @@ -52,5 +52,4 @@ for(i=0;imatrix=NewMat(M,N,sparsity,IssmComm::GetComm()); @@ -66,5 +65,5 @@ /*FUNCTION PetscMat::PetscMat(int M,int N, int connectivity, int numberofdofspernode){{{*/ PetscMat::PetscMat(int M,int N, int connectivity,int numberofdofspernode){ - + this->matrix=NewMat(M,N,connectivity,numberofdofspernode,IssmComm::GetComm()); @@ -99,9 +98,8 @@ IssmDouble PetscMat::Norm(NormMode mode){ - IssmDouble norm=0; _assert_(this->matrix); MatNorm(this->matrix,ISSMToPetscNormMode(mode),&norm); - + return norm; Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp (revision 13622) @@ -29,5 +29,5 @@ /*FUNCTION PetscVec::PetscVec(int M,bool fromlocalsize){{{*/ PetscVec::PetscVec(int M,bool fromlocalsize){ - + this->vector=NewVec(M,IssmComm::GetComm(),fromlocalsize); @@ -79,5 +79,5 @@ /*FUNCTION PetscVec::Assemble{{{*/ void PetscVec::Assemble(void){ - + _assert_(this->vector); VecAssemblyBegin(this->vector); @@ -88,5 +88,5 @@ /*FUNCTION PetscVec::SetValues{{{*/ void PetscVec::SetValues(int ssize, int* list, IssmDouble* values, InsMode mode){ - + _assert_(this->vector); VecSetValues(this->vector,ssize,list,values,ISSMToPetscInsertMode(mode)); @@ -128,5 +128,5 @@ /*FUNCTION PetscVec::Duplicate{{{*/ PetscVec* PetscVec::Duplicate(void){ - + PetscVec* output=NULL; _assert_(this->vector); @@ -165,5 +165,5 @@ /*FUNCTION PetscVec::ToMPISerial{{{*/ IssmDouble* PetscVec::ToMPISerial(void){ - + IssmDouble* vec_serial=NULL; VecToMPISerial(&vec_serial, this->vector,IssmComm::GetComm()); Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp (revision 13622) @@ -3,5 +3,4 @@ * lower row and upper row from a matrix a cpu owns. */ - #ifdef HAVE_CONFIG_H @@ -19,5 +18,5 @@ int my_rank; int num_procs; - + /*recover my_rank and num_procs:*/ MPI_Comm_size(comm,&num_procs); @@ -26,5 +25,5 @@ /*output: */ int lower_row,upper_row; - + /*intermediary :*/ int i; Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscInsertMode.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscInsertMode.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscInsertMode.cpp (revision 13622) @@ -2,5 +2,4 @@ * \brief: convert InsertMode from ISSM to Petsc */ - #ifdef HAVE_CONFIG_H @@ -19,5 +18,4 @@ #include "../../../shared/shared.h" - InsertMode ISSMToPetscInsertMode(InsMode mode){ Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscMatrixType.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscMatrixType.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscMatrixType.cpp (revision 13622) @@ -2,5 +2,4 @@ * \brief: convert MatrixType from ISSM to Petsc */ - #ifdef HAVE_CONFIG_H @@ -19,5 +18,4 @@ #include "../../../shared/shared.h" - MatType ISSMToPetscMatrixType(MatrixType type){ Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscNormMode.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscNormMode.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/ISSMToPetscNormMode.cpp (revision 13622) @@ -2,5 +2,4 @@ * \brief: convert NormMode from ISSM to Petsc */ - #ifdef HAVE_CONFIG_H @@ -19,5 +18,4 @@ #include "../../../shared/shared.h" - NormType ISSMToPetscNormMode(NormMode mode){ Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/KSPFree.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/KSPFree.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/KSPFree.cpp (revision 13622) @@ -8,5 +8,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - /*Petsc includes: */ @@ -26,3 +25,2 @@ } - Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatFree.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatFree.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatFree.cpp (revision 13622) @@ -8,5 +8,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - /*Petsc includes: */ @@ -26,3 +25,2 @@ } - Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp (revision 13622) @@ -43,7 +43,7 @@ int MatMultCompatible(Mat A,Vec x,COMM comm){ - + /*error management*/ - + int local_m,local_n; int lower_row,upper_row,range; @@ -51,5 +51,5 @@ int sumresult; int num_procs; - + /*recover num_procs:*/ MPI_Comm_size(comm,&num_procs); @@ -57,7 +57,7 @@ MatGetLocalSize(A,&local_m,&local_n);; VecGetLocalSize(x,&range);; - + if (local_n!=range)result=0; - + /*synchronize result: */ MPI_Reduce (&result,&sumresult,1,MPI_INT,MPI_SUM,0,comm ); @@ -81,5 +81,5 @@ /*output: */ Vec outvector=NULL; - + /*Create outvector with local size m*/ VecCreate(comm,&outvector); ; Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatToSerial.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatToSerial.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatToSerial.cpp (revision 13622) @@ -9,5 +9,4 @@ #endif - #include "../petscincludes.h" #include "../../../shared/shared.h" @@ -18,5 +17,5 @@ int my_rank; int num_procs; - + /*Petsc variables*/ PetscInt lower_row,upper_row; @@ -28,5 +27,5 @@ double* local_matrix=NULL; /*matrix local to each node used for temporary holding matrix values*/ int buffer[3]; - + /*recover my_rank and num_procs:*/ MPI_Comm_size(comm,&num_procs); @@ -35,5 +34,5 @@ /*Output*/ double* outmatrix=NULL; - + /*get matrix size: */ MatGetSize(matrix,&M,&N); @@ -43,13 +42,13 @@ upper_row--; range=upper_row-lower_row+1; - + /*Local and global allocation*/ if (my_rank==0)outmatrix=xNew(M*N); - + if (range){ local_matrix=xNew(N*range); idxm=xNew(range); idxn=xNew(N); - + for (i=0;i= 3 PetscOptionsGetString(PETSC_NULL,"-pc_factor_mat_solver_package",&option[0],100,&flag); @@ -61,5 +60,4 @@ #endif - PetscOptionsGetString(PETSC_NULL,"-issm_option_solver",&option[0],100,&flag); if (strcmp(option,"stokes")==0){ Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp (revision 13622) @@ -21,5 +21,4 @@ void PetscOptionsInsertMultipleString(char* options_string){ - /*The list of options is going to be pairs of the type "-option option_value"*/ #if _PETSC_MAJOR_ == 2 @@ -35,8 +34,6 @@ int first_token=1; - PetscTokenCreate(options_string,' ',&token); for (;;){ - /*Read next tokens*/ @@ -45,5 +42,5 @@ } PetscTokenFind(token,&second); - + if (!first){ /*We are at the end of options*/ Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecDuplicatePatch.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecDuplicatePatch.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecDuplicatePatch.cpp (revision 13622) @@ -8,5 +8,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - /*Petsc includes: */ Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecFree.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecFree.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecFree.cpp (revision 13622) @@ -8,5 +8,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - /*Petsc includes: */ @@ -25,3 +24,2 @@ } - Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp (revision 13622) @@ -22,5 +22,5 @@ int i; - + /*Petsc matrix*/ int lower_row,upper_row,range; @@ -57,5 +57,5 @@ VecSetValues(A,range,idxm,values,INSERT_VALUES); } - + /*Assemble vector*/ VecAssemblyBegin(A); Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecToMPISerial.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecToMPISerial.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecToMPISerial.cpp (revision 13622) @@ -9,10 +9,9 @@ #endif - #include "../petscincludes.h" #include "../../../shared/shared.h" int VecToMPISerial(double** pgathered_vector, Vec vector,COMM comm){ - + int i; int num_procs; @@ -25,5 +24,5 @@ int * idxn=NULL; int buffer[3]; - + /*intermediary results*/ double* local_vector=NULL; @@ -31,8 +30,8 @@ /*input*/ int vector_size; - + /*Output*/ double* gathered_vector=NULL; //Global vector holding the final assembled vector on all nodes. - + /*recover my_rank and num_procs*/ MPI_Comm_size(comm,&num_procs); @@ -47,5 +46,5 @@ /*Allocate gathered vector on all nodes .*/ gathered_vector=xNew(vector_size); - + /*Allocate local vectors*/ VecGetOwnershipRange(vector,&lower_row,&upper_row); @@ -89,9 +88,9 @@ /*Assign output pointers: */ *pgathered_vector=gathered_vector; - + /*free ressources: */ xDelete(idxn); xDelete(local_vector); - + return 1; } Index: /issm/trunk-jpl/src/c/toolkits/plapack/patches/CyclicalFactorization.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/plapack/patches/CyclicalFactorization.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/plapack/patches/CyclicalFactorization.cpp (revision 13622) @@ -3,5 +3,4 @@ */ #include - #include "../../../shared/shared.h" @@ -10,5 +9,5 @@ int CyclicalFactorization(int* pnprows,int* pnpcols,int num_procs){ - + int nprows,npcols; int last_diff; @@ -65,5 +64,5 @@ */ int SmallestPrimeFactor(int* output,int input){ - + int found=0; int i; Index: /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp (revision 13622) @@ -14,5 +14,5 @@ void PlapackInvertMatrixLocalCleanup(PLA_Obj* pa,PLA_Template* ptempl,double** parrayA,int** pidxnA,MPI_Comm* pcomm_2d); - + int PlapackInvertMatrix(Mat* A,Mat* inv_A,int status,int con,COMM comm){ /*inv_A does not yet exist, inv_A was just allocated, that's all*/ @@ -26,5 +26,5 @@ int lower_row,upper_row,range,this_range,this_lower_row; MatType type; - + /*Plapack: */ MPI_Datatype datatype; @@ -42,5 +42,5 @@ int* idxnA=NULL; int d_nz,o_nz; - + /*Feedback to client*/ int computation_status; @@ -92,5 +92,5 @@ /* Set the datatype */ datatype = MPI_DOUBLE; - + /* Copy A into a*/ PLA_Matrix_create(datatype,mA,nA,templ,PLA_ALIGN_FIRST,PLA_ALIGN_FIRST,&a); @@ -127,5 +127,5 @@ xDelete(arrayA); xDelete(idxnA); - + /*Finalize PLAPACK*/ PLA_Finalize(); Index: /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackToPetsc.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackToPetsc.cpp (revision 13621) +++ /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackToPetsc.cpp (revision 13622) @@ -8,5 +8,4 @@ int PlapackToPetsc(Mat* A,int local_mA,int local_nA,int mA,int nA,MatType type,PLA_Obj a,PLA_Template templ,int nprows,int npcols,int nb,COMM comm){ - int i; @@ -22,5 +21,4 @@ double* local_buffer=NULL; - /*Create matrix A (right now, we just have an allocated pointer A*/ if (strcasecmp_eq(type,MATMPIAIJ)){ @@ -33,9 +31,9 @@ MatCreateMPIDense(comm,local_mA,local_nA, mA,nA,PETSC_NULL,A); } - + MatGetOwnershipRange(*A,&lower_row,&upper_row); upper_row--; range=upper_row-lower_row+1; - + /*Build the Plapack row and column indices corresponding to the local_buffer stored in a. We need those indices to directly plug local_buffer into the Petsc matrix A. We do not @@ -43,5 +41,5 @@ problem size becomes big. We rely therefore on MatAssembly from Petsc to gather the plapack matrix into a Petsc Matrix.*/ - + /*Vector physically based block cyclic distribution: */ row_nodes=xNew(mA); @@ -82,5 +80,5 @@ /*Get local buffer: */ PLA_Obj_local_buffer(a,(void**)&local_buffer); - + /*Insert into invA matrix. Use col oriented insertion, for Plapack is column oriented*/ MatSetOption(*A,MAT_COLUMN_ORIENTED);