Index: /issm/trunk-jpl/src/c/Container/Vertices.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Vertices.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/Container/Vertices.cpp (revision 14822) @@ -206,5 +206,5 @@ int my_rank; int num_vertices; - + /*output: */ Matrix* xyz = NULL; Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 14822) @@ -39,5 +39,5 @@ this->comm=incomm; this->SetStaticComm(); - + /*Now, initialize PETSC: */ #ifdef _HAVE_PETSC_ @@ -129,5 +129,5 @@ /*Now delete: */ delete profiler; - + /*Finalize PETSC for this model: */ #ifdef _HAVE_PETSC_ @@ -673,5 +673,4 @@ /*}}}*/ void FemModel::Responsex(IssmDouble* responses,int response_descriptor_enum,bool process_units,int weight_index){/*{{{*/ - switch (response_descriptor_enum){ @@ -719,5 +718,4 @@ void FemModel::RequestedOutputsx(int* requested_outputs, int numoutputs){/*{{{*/ - int output_enum; int step; @@ -763,5 +761,4 @@ void FemModel::RequestedDependentsx(void){/*{{{*/ - bool isautodiff = false; IssmDouble output_value; @@ -1386,5 +1383,4 @@ void FemModel::ThicknessAbsGradientx( IssmDouble* pJ, bool process_units, int weight_index){/*{{{*/ - /*Intermediary*/ int i; @@ -1414,5 +1410,4 @@ void FemModel::CostFunctionx(IssmDouble* pJ){/*{{{*/ - /*Intermediary*/ int num_responses; @@ -1442,5 +1437,4 @@ #ifdef _HAVE_DAKOTA_ void FemModel::DakotaResponsesx(double* d_responses,char** responses_descriptors,int numresponsedescriptors,int d_numresponses){/*{{{*/ - int i,j; Index: /issm/trunk-jpl/src/c/classes/IssmComm.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/IssmComm.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/classes/IssmComm.cpp (revision 14822) @@ -36,5 +36,5 @@ int my_rank = 0; - + /*for matlab and python modules*/ if(!parallel) return my_rank; Index: /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp (revision 14822) @@ -25,5 +25,4 @@ toolkitoptions= xNew(strlen(options)+1); sprintf(toolkitoptions, "%s",options); - }/*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Bucket.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Bucket.h (revision 14821) +++ /issm/trunk-jpl/src/c/classes/objects/Bucket.h (revision 14822) @@ -31,5 +31,5 @@ public: - + /*constructors, destructors: */ Bucket(){ /*{{{*/ @@ -37,5 +37,5 @@ } /*}}}*/ Bucket(int min,int* idxmin,int nin,int* idxnin,doubletype* valuesin,InsMode modein){ /*{{{*/ - + this->Initialize(); @@ -59,5 +59,5 @@ Bucket(int min,int* idxmin,doubletype* valuesin,InsMode modein){ /*{{{*/ this->Initialize(); - + this->type=VECTOR_BUCKET; this->m=min; @@ -66,5 +66,5 @@ this->idxm=xNew(this->m); xMemCpy(this->idxm,idxmin,this->m); - + this->values=xNew(this->m); xMemCpy(this->values,valuesin,this->m); @@ -77,5 +77,5 @@ } /*}}}*/ void Initialize(void){ /*{{{*/ - + this->type=0; this->m=0; @@ -87,5 +87,4 @@ } /*}}}*/ - /*object virtual functions definitions:*/ @@ -130,5 +129,5 @@ _error_("Not implemented yet (similar to Elements)"); }; /*}}}*/ - + /*specific routines of Bucket: */ void SpawnBucketsPerCpu(DataSet* bucketsofcpu_i,int rank_i,int* rowranks){ /*{{{*/ @@ -160,5 +159,5 @@ } } - + }; /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp (revision 14822) @@ -844,5 +844,5 @@ /*Recover parameters and values*/ GetInputListOnVertices(&gl[0],GLlevelsetEnum); - + /*Be sure that values are not zero*/ if(gl[0]==0) gl[0]=gl[0]+epsilon; Index: /issm/trunk-jpl/src/c/classes/objects/Elements/PentaHook.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/PentaHook.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/PentaHook.cpp (revision 14822) @@ -65,5 +65,4 @@ } - this->numanalyses = in_numanalyses; this->hnodes = new Hook*[in_numanalyses]; Index: /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 14822) @@ -1154,5 +1154,5 @@ /*Recover parameters and values*/ GetInputListOnVertices(&gl[0],GLlevelsetEnum); - + /*Be sure that values are not zero*/ if(gl[0]==0) gl[0]=gl[0]+epsilon; @@ -2416,5 +2416,5 @@ rho_ice=matpar->GetRhoIce(); rho_water=matpar->GetRhoFreshwater(); - + /*Get desertification effect parameters*/ desfac=matpar->GetDesFac(); @@ -3138,5 +3138,5 @@ if (!thickness_input)_error_("thickness input needed to compute gia deflection!"); thickness_input->GetInputUpToCurrentTimeAverages(&hes,×,&numtimes,currenttime); - + /*recover lithosphere thickness: */ lithosphere_thickness_input=inputs->GetInput(GiaLithosphereThicknessEnum); @@ -3177,5 +3177,5 @@ xi=x[i]; yi=y[i]; ri=sqrt(pow(xi-x0,2)+pow(yi-y0,2)); - + /*load ri onto arguments for this vertex i: */ arguments.ri=ri; @@ -4526,5 +4526,4 @@ } } - gradient->SetValues(NUMVERTICES,vertexpidlist,grade_g,ADD_VAL); @@ -5858,8 +5857,8 @@ /*FUNCTION Tria::CreateKMatrixHydrologyShreve{{{*/ ElementMatrix* Tria::CreateKMatrixHydrologyShreve(void){ - + /*Constants*/ const int numdof=NDOF1*NUMVERTICES; - + /*Intermediaries */ IssmDouble diffusivity; @@ -5877,14 +5876,14 @@ IssmDouble DLprime[2][2] ={0.0}; GaussTria *gauss=NULL; - + /*Skip if water or ice shelf element*/ if(IsOnWater() | IsFloating()) return NULL; - + /*Initialize Element matrix*/ ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - + /*Create water velocity vx and vy from current inputs*/ CreateHydrologyWaterVelocityInput(); - + /*Retrieve all inputs and parameters*/ GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); @@ -5894,48 +5893,48 @@ Input* vy_input=inputs->GetInput(HydrologyWaterVyEnum); _assert_(vy_input); h=sqrt(2*this->GetArea()); - + /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); for(int ig=gauss->begin();igend();ig++){ - + gauss->GaussPoint(ig); - + GetJacobianDeterminant(&Jdettria, &xyz_list[0][0],gauss); GetL(&L[0], &xyz_list[0][0], gauss,NDOF1); - + vx_input->GetInputValue(&vx,gauss); vy_input->GetInputValue(&vy,gauss); vx_input->GetInputDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); vy_input->GetInputDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); - + DL_scalar=gauss->weight*Jdettria; - + TripleMultiply( &L[0],1,numdof,1, &DL_scalar,1,1,0, &L[0],1,numdof,0, &Ke->values[0],1); - + GetBPrognostic(&B[0][0], &xyz_list[0][0], gauss); GetBprimePrognostic(&Bprime[0][0], &xyz_list[0][0], gauss); - + dvxdx=dvx[0]; dvydy=dvy[1]; DL_scalar=dt*gauss->weight*Jdettria; - + DL[0][0]=DL_scalar*dvxdx; DL[1][1]=DL_scalar*dvydy; DLprime[0][0]=DL_scalar*vx; DLprime[1][1]=DL_scalar*vy; - + TripleMultiply( &B[0][0],2,numdof,1, &DL[0][0],2,2,0, &B[0][0],2,numdof,0, &Ke->values[0],1); - + TripleMultiply( &B[0][0],2,numdof,1, &DLprime[0][0],2,2,0, &Bprime[0][0],2,numdof,0, &Ke->values[0],1); - + /*Artificial diffusivity*/ vel=sqrt(vx*vx+vy*vy); @@ -5948,5 +5947,5 @@ KDL[0][1]=DL_scalar*K[0][1]; KDL[1][1]=DL_scalar*K[1][1]; - + TripleMultiply( &Bprime[0][0],2,numdof,1, &KDL[0][0],2,2,0, @@ -5954,5 +5953,5 @@ &Ke->values[0],1); } - + /*Clean up and return*/ delete gauss; @@ -6008,5 +6007,5 @@ GetL(&L[0], &xyz_list[0][0], gauss,NDOF1); D_scalar=sediment_storing*gauss->weight*Jdet; - + TripleMultiply(&L[0],numdof,1,0, &D_scalar,1,1,0, @@ -6069,5 +6068,5 @@ GetL(&L[0], &xyz_list[0][0], gauss,NDOF1); D_scalar=epl_storing*gauss->weight*Jdet; - + TripleMultiply(&L[0],numdof,1,0, &D_scalar,1,1,0, @@ -6155,9 +6154,9 @@ Input* water_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(water_input); Input* old_wh_input=NULL; - + if(reCast(dt)){ old_wh_input=inputs->GetInput(SedimentHeadEnum); _assert_(old_wh_input); } - + /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); @@ -6212,9 +6211,9 @@ Input* water_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(water_input); Input* old_wh_input=NULL; - + if(reCast(dt)){ old_wh_input=inputs->GetInput(EplHeadEnum); _assert_(old_wh_input); } - + /* Start looping on the number of gaussian points: */ gauss=new GaussTria(2); @@ -6364,5 +6363,5 @@ /*Get the flag to the limitation method*/ this->parameters->FindParam(&hmax_flag,HydrologydcSedimentlimitFlagEnum); - + /*Switch between the different cases*/ switch(hmax_flag){ Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp (revision 14822) @@ -295,5 +295,5 @@ if((iscurrenttime_included==false) && (i==(numsteps-1))){ - + /*Retrieve interpolated values for current time step: */ Input* input=GetTimeInput(currenttime); Index: /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/classes/objects/Inputs/TriaP1Input.cpp (revision 14822) @@ -192,5 +192,5 @@ outvalues=xNew(1); times=xNew(1); - + outvalues[0]=1./3.*(values[0]+values[1]+values[2]); times[0]=0; /*we don't have a time*/ @@ -212,5 +212,5 @@ outvalues=xNew(1); times=xNew(1); - + outvalues[0]=1./3.*(values[0]+values[1]+values[2]); times[0]=currenttime; /*we don't have a time*/ @@ -221,5 +221,4 @@ } /*}}}*/ - /*Intermediary*/ Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 14822) @@ -65,5 +65,4 @@ iomodel->Constant(&this->water_compressibility,HydrologydcWaterCompressibilityEnum); iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); - if(isefficientlayer){ @@ -77,5 +76,5 @@ _error_("Hydrology model "<Constant(&this->lithosphere_shear_modulus,MaterialsLithosphereShearModulusEnum); @@ -466,5 +465,5 @@ /*FUNCTION Matpar::UnitConversion {{{*/ void Matpar::UnitConversion(void){ - + /*convert units of fields that were allocated using the Ext unit system, into the Iu unit system: */ ::UnitConversion(&this->lithosphere_density,1,ExtToIuEnum,MaterialsLithosphereDensityEnum); @@ -473,3 +472,2 @@ } /*}}}*/ - Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h (revision 14821) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h (revision 14822) @@ -31,5 +31,5 @@ IssmDouble desfac; IssmDouble s0p; - + /*hydrology Shreve: */ IssmDouble hydro_kn; @@ -57,5 +57,4 @@ IssmDouble mantle_viscosity; IssmDouble mantle_density; - public: Index: /issm/trunk-jpl/src/c/classes/objects/Vertex.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Vertex.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/classes/objects/Vertex.cpp (revision 14822) @@ -214,5 +214,5 @@ IssmDouble xyz[3]; int indices[3]; - + if (this->clone==true) return; Index: /issm/trunk-jpl/src/c/classes/toolkits/Matrix.h =================================================================== --- /issm/trunk-jpl/src/c/classes/toolkits/Matrix.h (revision 14821) +++ /issm/trunk-jpl/src/c/classes/toolkits/Matrix.h (revision 14822) @@ -42,5 +42,5 @@ /*FUNCTION Matrix(int M,int N){{{*/ Matrix(int M,int N){ - + InitCheckAndSetType(); @@ -74,5 +74,5 @@ /*FUNCTION Matrix(int M,int N,IssmDouble sparsity){{{*/ Matrix(int M,int N,double sparsity){ - + InitCheckAndSetType(); @@ -89,5 +89,5 @@ /*FUNCTION Matrix(IssmDouble* serial_mat, int M,int N,IssmDouble sparsity){{{*/ Matrix(IssmPDouble* serial_mat,int M,int N,IssmPDouble sparsity){ - + InitCheckAndSetType(); @@ -105,5 +105,5 @@ /*FUNCTION Matrix(int M,int N,int connectivity,int numberofdofspernode){{{*/ Matrix(int M,int N,int connectivity,int numberofdofspernode){ - + InitCheckAndSetType(); @@ -157,5 +157,5 @@ } else _error_("unknow toolkit type "); - + /*Free ressources: */ xDelete(toolkittype); Index: /issm/trunk-jpl/src/c/classes/toolkits/Solver.h =================================================================== --- /issm/trunk-jpl/src/c/classes/toolkits/Solver.h (revision 14821) +++ /issm/trunk-jpl/src/c/classes/toolkits/Solver.h (revision 14822) @@ -48,5 +48,5 @@ } /*}}}*/ - + /*Methods: */ Vector* Solve(void){ /*{{{*/ Index: /issm/trunk-jpl/src/c/classes/toolkits/Vector.h =================================================================== --- /issm/trunk-jpl/src/c/classes/toolkits/Vector.h (revision 14821) +++ /issm/trunk-jpl/src/c/classes/toolkits/Vector.h (revision 14822) @@ -39,5 +39,5 @@ /*}}}*/ Vector(int M,bool fromlocalsize=false){ /*{{{*/ - + InitCheckAndSetType(); @@ -64,5 +64,5 @@ /*}}}*/ Vector(doubletype* serial_vec,int M){ /*{{{*/ - + InitCheckAndSetType(); @@ -120,5 +120,5 @@ } else _error_("unknow toolkit type "); - + /*Free ressources: */ xDelete(toolkittype); @@ -201,5 +201,5 @@ bool IsEmpty(void){ int M; - + _assert_(this); this->GetSize(&M); @@ -227,5 +227,5 @@ Vector* output=NULL; - + output=new Vector(); @@ -280,5 +280,5 @@ doubletype* vec_serial=NULL; - + _assert_(this); if(type==PetscVecType){ Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (revision 14822) @@ -28,5 +28,5 @@ /*Do we have penalties linked to rifts? In this case, run our special rifts penalty * management routine, otherwise, skip : */ - + /*No constraints management by default!:*/ num_unstable_constraints=0; Index: /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp (revision 14822) @@ -24,5 +24,4 @@ ssize=nodes->NumberOfDofs(configuration_type,SsetEnum); slocalsize = nodes->NumberOfDofsLocal(configuration_type,SsetEnum); - /*allocate:*/ Index: /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/EdgeDetectionx/EdgeDetectionx.cpp (revision 14822) @@ -18,5 +18,5 @@ _assert_(contours); - + /*output: */ Contour* contour=NULL; @@ -35,4 +35,4 @@ /*Add contour to our dataset of contours: */ contours->AddObject(contour); - + } Index: /issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp (revision 14822) @@ -20,5 +20,5 @@ /*output: */ Vector* solution=NULL; - + if(VerboseModule()) _pprintLine_(" Get solution from inputs"); Index: /issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp (revision 14822) @@ -21,5 +21,5 @@ double pset[7]; }; - + struct blockt{ double time[Ntimp]; @@ -36,5 +36,5 @@ double zhload[Ntime]; }; - + struct blockn{ int irate; @@ -64,5 +64,5 @@ /*}}}*/ - + void GiaDeflectionCorex( IssmDouble* pwi, IssmDouble* pdwidt, GiaDeflectionCoreArgs* arguments){ @@ -70,5 +70,5 @@ IssmDouble wi=0; IssmDouble dwidt=0; - + /*inputs: {{{*/ /*constant: */ @@ -104,5 +104,5 @@ /*}}}*/ - + /*Recover material parameters and loading history: see GiaDeflectionCoreArgs for more details {{{*/ ri=arguments->ri; @@ -140,5 +140,5 @@ blockp_.pset[6]=re; blocko_.rhoi=rho_ice; - + /*loading history: */ blocky_.zhload[0]=hes[1]; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 14822) @@ -139,5 +139,5 @@ parameters->AddObject(new IntParam(AnalysisTypeEnum,analysis_type)); parameters->AddObject(new IntParam(AnalysisCounterEnum,analysis_counter)); - + iomodel->Constant(&time,TimesteppingStartTimeEnum); parameters->AddObject(new DoubleParam(TimeEnum,time)); //start at time 0 by default for all solutions FIXME: to be deleted Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 14822) @@ -93,5 +93,5 @@ elements->InputDuplicate(VxEnum,InversionVxObsEnum); if(dakota_analysis)elements->InputDuplicate(VxEnum,QmuVxEnum); - + #ifdef _HAVE_ANDROID_ elements->InputDuplicate(FrictionCoefficientEnum,AndroidFrictionCoefficientEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/CreateNodesGia.cpp (revision 14822) @@ -44,5 +44,5 @@ } } - + /*Clean fetched data: */ iomodel->DeleteData(1,MaskVertexonwaterEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp (revision 14822) @@ -37,5 +37,4 @@ } - /*Nothing for now*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateParametersHydrologyDCInefficient.cpp (revision 14822) @@ -34,5 +34,5 @@ iomodel->FetchData(&isefficientlayer,HydrologydcIsefficientlayerEnum); iomodel->FetchData(&sedimentlimit_flag,HydrologydcSedimentlimitFlagEnum); - + if(sedimentlimit_flag==1){ iomodel->FetchData(&sedimentlimit,HydrologydcSedimentlimitEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 14822) @@ -44,5 +44,5 @@ SetVerbosityLevel(verbose); - + if(VerboseMProcessor()) _pprintLine_(" starting model processor "); Index: /issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp (revision 14822) @@ -16,5 +16,5 @@ IssmDouble *ug_serial = NULL; bool oldalloc = false; - + if(VerboseModule()) _pprintLine_(" Reduce vector from g to f set"); Index: /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (revision 14822) @@ -16,5 +16,5 @@ /*intermediary: */ Solver *solver=NULL; - + /*output: */ Vector *uf=NULL; Index: /issm/trunk-jpl/src/c/shared/Numerics/ToolkitsOptionsFromAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/ToolkitsOptionsFromAnalysis.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/shared/Numerics/ToolkitsOptionsFromAnalysis.cpp (revision 14822) @@ -19,5 +19,5 @@ char* options=NULL; - + /*Recover first the options string for this analysis: */ options=OptionsFromAnalysis(parameters,analysis_type); @@ -45,5 +45,5 @@ #endif - + xDelete(options); } Index: /issm/trunk-jpl/src/c/solutions/EnvironmentFinalize.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/EnvironmentFinalize.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/solutions/EnvironmentFinalize.cpp (revision 14822) @@ -17,5 +17,5 @@ /*Make sure we are all here*/ MPI_Barrier(MPI_COMM_WORLD); - + /*Print closing statement*/ int my_rank; Index: /issm/trunk-jpl/src/c/solutions/convergence.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/convergence.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/solutions/convergence.cpp (revision 14822) @@ -30,5 +30,5 @@ IssmDouble eps_abs; IssmDouble yts; - + if(VerboseModule()) _pprintLine_(" checking convergence"); Index: /issm/trunk-jpl/src/c/solutions/gia_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/gia_core.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/solutions/gia_core.cpp (revision 14822) @@ -12,5 +12,5 @@ void gia_core(FemModel* femmodel){ - + int i; Vector* wg = NULL; @@ -27,5 +27,5 @@ femmodel->parameters->FindParam(&save_results,SaveResultsEnum); femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum); - + if(VerboseSolution()) _pprintLine_(" computing GIA"); Index: /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (revision 14822) @@ -24,5 +24,5 @@ IssmDouble starttime,final_time; IssmDouble time,dt; - + /*first recover parameters common to all solutions*/ femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum); @@ -92,5 +92,4 @@ } - } } Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h (revision 14821) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsMat.h (revision 14822) @@ -38,5 +38,5 @@ public: - + /*IssmAbsMat constructors, destructors*/ virtual ~IssmAbsMat(){}; Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h (revision 14821) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h (revision 14822) @@ -37,5 +37,5 @@ public: - + /*IssmAbsVec constructors, destructors*/ ~IssmAbsVec(){/*{{{*/ Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h (revision 14821) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h (revision 14822) @@ -38,7 +38,6 @@ class IssmMat{ - public: - + IssmAbsMat* matrix; /*abstract matrix, which implements object orientation*/ @@ -64,5 +63,5 @@ /*}}}*/ IssmMat(int M,int N){ /*{{{*/ - + switch(IssmMatTypeFromToolkitOptions()){ @@ -141,5 +140,5 @@ /*}}}*/ IssmMat(int M,int N, int connectivity, int numberofdofspernode){ /*{{{*/ - + switch(IssmMatTypeFromToolkitOptions()){ @@ -203,4 +202,3 @@ }; - #endif //#ifndef _ISSMMAT_H_ Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h (revision 14821) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h (revision 14822) @@ -76,5 +76,5 @@ /*FUNCTION IssmMpiDenseMat(doubletype* serial_mat,int M,int N,doubletype sparsity){{{*/ IssmMpiDenseMat(doubletype* serial_mat,int Min,int Nin,doubletype sparsity){ - + /*Here, we assume that the serial_mat is local to the local cpu, and that it has * the correct size (m rows by N colums), n determined by DetermineLocalSize: */ @@ -110,11 +110,11 @@ this->buckets=new DataSet(); - + this->M=Min; this->N=Nin; - + /*Figure out local number of rows: */ this->m=DetermineLocalSize(this->M,IssmComm::GetComm()); - + /*Initialize pointer: */ this->matrix=NULL; @@ -152,5 +152,4 @@ void Assemble(){ - int i; int j; @@ -173,6 +172,4 @@ int size; - - /*some communicator info: */ num_procs=IssmComm::GetSize(); @@ -218,5 +215,5 @@ for(j=0;j* Xin,IssmAbsVec* AXin){ - int i,j; doubletype *X_serial = NULL; - /*A check on the types: */ @@ -371,5 +365,4 @@ /*}}}*/ }; - #endif //#ifndef _ISSM_MPI_DENSE_MAT_H_ Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h (revision 14821) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h (revision 14822) @@ -80,5 +80,5 @@ this->buckets=new DataSet(); - + if(fromlocalsize){ this->m=Min; @@ -89,5 +89,5 @@ this->m=DetermineLocalSize(this->M,IssmComm::GetComm()); } - + /*Initialize pointer: */ this->vector=NULL; @@ -109,5 +109,5 @@ /*FUNCTION Echo{{{*/ void Echo(void){ - + int i,j; @@ -126,5 +126,4 @@ /*FUNCTION Assemble{{{*/ void Assemble(){ - int i; @@ -148,6 +147,4 @@ int size; - - /*some communicator info: */ num_procs=IssmComm::GetSize(); @@ -193,5 +190,5 @@ for(j=0;j* Xin, doubletype a){ - + int i; @@ -314,5 +311,4 @@ /*y=a*x+y where this->vector is y*/ for(i=0;im;i++)this->vector[i]=a*X->vector[i]+this->vector[i]; - } @@ -343,5 +339,5 @@ int* recvcounts=NULL; int* displs=NULL; - + /*output: */ doubletype* buffer=NULL; @@ -358,5 +354,5 @@ /*recvcounts:*/ MPI_Allgather(&this->m,1,MPI_INT,recvcounts,1,MPI_INT,comm); - + /*get lower_row: */ GetOwnershipBoundariesFromRange(&lower_row,&upper_row,this->m,comm); @@ -394,5 +390,5 @@ /*FUNCTION Norm{{{*/ doubletype Norm(NormMode mode){ - + doubletype local_norm; doubletype norm; @@ -453,5 +449,5 @@ int i; - + /*Assume xin and yin are of the correct type, and downcast: */ IssmMpiVec* x=NULL; @@ -461,5 +457,4 @@ y=(IssmMpiVec*)yin; - /*pointwise w=x/y where this->vector is w: */ for(i=0;im;i++)this->vector[i]=x->vector[i]/y->vector[i]; Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h (revision 14821) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h (revision 14822) @@ -5,5 +5,4 @@ * and the contructors required by IssmVec (see IssmVec.h) */ - #ifndef _ISSM_SEQ_VEC_H_ @@ -182,10 +181,9 @@ int i; - + /*Assume X is of the correct type, and downcast: */ IssmSeqVec* X=NULL; X=(IssmSeqVec*)Xin; - /*y=a*x+y where this->vector is y*/ @@ -278,5 +276,4 @@ input=(IssmSeqVec*)inputin; - doubletype dot=0; for(i=0;iM;i++)dot+=this->vector[i]*input->vector[i]; @@ -289,5 +286,5 @@ int i; - + /*Assume xin and yin are of the correct type, and downcast: */ IssmSeqVec* x=NULL; @@ -297,5 +294,4 @@ y=(IssmSeqVec*)yin; - /*pointwise w=x/y where this->vector is w: */ for(i=0;iM;i++)this->vector[i]=x->vector[i]/y->vector[i]; Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmToolkitUtils.cpp (revision 14822) @@ -24,5 +24,5 @@ /*Routines: */ int IssmMatTypeFromToolkitOptions(void){ /*{{{*/ - + char *mat_type = NULL; int mat_type_enum; @@ -33,5 +33,5 @@ num_procs=IssmComm::GetSize(); if(num_procs>1)isparallel=true; - + /*retrieve matrix type as a string, from the Toolkits Options database, similar to what Petsc does. Actually, *we try and stick with the Petsc matrix types: */ @@ -43,13 +43,13 @@ } else _error_("matrix type not supported yet!"); - + /*free ressources: */ xDelete(mat_type); - + /*return: */ return mat_type_enum; } /*}}}*/ int IssmVecTypeFromToolkitOptions(void){ /*{{{*/ - + char* vec_type=NULL; int vec_type_enum; @@ -60,5 +60,5 @@ num_procs=IssmComm::GetSize(); if(num_procs>1)isparallel=true; - + /*retrieve vector type as a string, from the Toolkits Options database, similar to what Petsc does. Actually, *we try and stick with the Petsc vector types: */ @@ -70,8 +70,8 @@ } else _error_("vector type not supported yet!"); - + /*free ressources: */ xDelete(vec_type); - + /*return: */ return vec_type_enum; Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h (revision 14821) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h (revision 14822) @@ -37,5 +37,5 @@ public: - + IssmAbsVec* vector; /*abstract vector, which implements object orientation*/ @@ -61,5 +61,5 @@ /*}}}*/ IssmVec(int M){/*{{{*/ - + switch(IssmVecTypeFromToolkitOptions()){ @@ -80,5 +80,5 @@ /*}}}*/ IssmVec(int m,int M){/*{{{*/ - + switch(IssmVecTypeFromToolkitOptions()){ @@ -99,5 +99,5 @@ /*}}}*/ IssmVec(int M,bool fromlocalsize){/*{{{*/ - + switch(IssmVecTypeFromToolkitOptions()){ @@ -118,5 +118,5 @@ /*}}}*/ IssmVec(doubletype* buffer,int M){/*{{{*/ - + switch(IssmVecTypeFromToolkitOptions()){ @@ -170,5 +170,5 @@ /*}}}*/ IssmVec* Duplicate(void){/*{{{*/ - + IssmVec* issmvector=NULL; Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp (revision 14821) +++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp (revision 14822) @@ -2,5 +2,4 @@ * \brief Petsc implementation of solver */ - #ifdef HAVE_CONFIG_H