Index: /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 14911) +++ /issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 14912) @@ -28,5 +28,4 @@ #include "../../shared/MemOps/MemOps.h" #include "../../solutions/DakotaSpawnCore.h" - #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in. Index: /issm/trunk-jpl/src/c/classes/objects/Bucket.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Bucket.h (revision 14911) +++ /issm/trunk-jpl/src/c/classes/objects/Bucket.h (revision 14912) @@ -168,5 +168,4 @@ int *modes_forcpu = NULL; - /*initialize buffers: */ row_indices_forcpu=*prow_indices_forcpu; @@ -208,5 +207,4 @@ int *modes_forcpu = NULL; - /*initialize buffers: */ row_indices_forcpu=*prow_indices_forcpu; Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp (revision 14911) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Pengrid.cpp (revision 14912) @@ -734,5 +734,5 @@ /*Retrieve parameters*/ parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); - + /*Initialize Element matrix and return if necessary*/ if(!this->active) return NULL; Index: /issm/trunk-jpl/src/c/include/macros.h =================================================================== --- /issm/trunk-jpl/src/c/include/macros.h (revision 14911) +++ /issm/trunk-jpl/src/c/include/macros.h (revision 14912) @@ -18,5 +18,4 @@ #endif /*}}}*/ - /*Exceptions: */ Index: /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 14911) +++ /issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp (revision 14912) @@ -9,5 +9,4 @@ #include "../../classes/objects/objects.h" #include "../ContourToNodesx/ContourToNodesx.h" - int InterpFromMesh2dx(IssmSeqVec** pdata_prime, Index: /issm/trunk-jpl/src/c/shared/MemOps/MemOps.h =================================================================== --- /issm/trunk-jpl/src/c/shared/MemOps/MemOps.h (revision 14911) +++ /issm/trunk-jpl/src/c/shared/MemOps/MemOps.h (revision 14912) @@ -143,4 +143,3 @@ /*}}}*/ - #endif Index: /issm/trunk-jpl/src/c/solutions/solutions.h =================================================================== --- /issm/trunk-jpl/src/c/solutions/solutions.h (revision 14911) +++ /issm/trunk-jpl/src/c/solutions/solutions.h (revision 14912) @@ -62,4 +62,3 @@ void AdjointCorePointerFromSolutionEnum(void (**padjointcore)(FemModel*),int solutiontype); - #endif Index: /issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp (revision 14911) +++ /issm/trunk-jpl/src/c/toolkits/gsl/DenseGslSolve.cpp (revision 14912) @@ -18,5 +18,4 @@ #include #endif - /*}}}*/ @@ -246,3 +245,2 @@ /*}}}*/ #endif - Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h (revision 14911) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h (revision 14912) @@ -25,5 +25,4 @@ #include - /*}}}*/ @@ -164,5 +163,4 @@ break; - default: _error_("unknown norm !"); Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h (revision 14911) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMat.h (revision 14912) @@ -201,5 +201,5 @@ #ifndef _HAVE_WRAPPERS_ IssmVec* Solve(IssmVec* pf, Parameters* parameters){ /*{{{*/ - + IssmVec* outvector=NULL; Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h (revision 14911) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h (revision 14912) @@ -71,5 +71,5 @@ IssmMpiDenseMat(int min,int nin,int Min,int Nin,int* d_nnz,int* o_nnz){ /*not needed, we are fully dense!: */ - + this->buckets=new DataSet(); @@ -164,5 +164,4 @@ void Assemble(){ - int i,j; @@ -221,5 +220,5 @@ MPI_Scatter(numvalues_forcpu,1,MPI_INT,numvalues_fromcpu+i,1,MPI_INT,i,comm); } - + row_indices_fromcpu=xNew(num_procs); col_indices_fromcpu=xNew(num_procs); @@ -287,5 +286,5 @@ xDelete(values_forcpu); xDelete(numvalues_forcpu); - + for(i=0;i(values_fromcpu); xDelete(numvalues_fromcpu); - + xDelete(sendcnts); xDelete(displs); /*}}}*/ - } @@ -351,5 +349,4 @@ break; - default: _error_("unknown norm !"); @@ -430,5 +427,4 @@ /*FUNCTION BucketsBuildScatterBuffers{{{*/ void BucketsBuildScatterBuffers(int** pnumvalues_forcpu,int** prow_indices_forcpu,int** pcol_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu,DataSet** bucketsforcpu,int num_procs){ - /*intermediary: */ @@ -453,5 +449,5 @@ for(i=0;iSize();j++){ @@ -512,5 +508,5 @@ int i; - + /*output: */ IssmMpiVec* uf=NULL; Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h (revision 14911) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h (revision 14912) @@ -146,5 +146,4 @@ void Assemble(){ - int i,j; @@ -175,8 +174,6 @@ MPI_Comm comm=IssmComm::GetComm(); - /*First, make a vector of size M, which for each row between 0 and M-1, tells which cpu this row belongs to: */ RowRank=DetermineRowRankFromLocalSize(M,m,comm); - /*Now, sort out our dataset of buckets according to cpu ownership of rows: {{{*/ @@ -206,5 +203,4 @@ } - row_indices_fromcpu=xNew(num_procs); values_fromcpu=xNew(num_procs); @@ -266,5 +262,5 @@ xDelete(values_forcpu); xDelete(numvalues_forcpu); - + for(i=0;i(values_fromcpu); xDelete(numvalues_fromcpu); - + xDelete(sendcnts); xDelete(displs); /*}}}*/ - } @@ -518,5 +513,4 @@ void BucketsBuildScatterBuffers(int** pnumvalues_forcpu,int** prow_indices_forcpu,doubletype** pvalues_forcpu,int** pmodes_forcpu,DataSet** bucketsforcpu,int num_procs){ - /*intermediary: */ int i,j; @@ -538,5 +532,5 @@ for(i=0;iSize();j++){ Index: /issm/trunk-jpl/src/c/toolkits/mpi/mpiincludes.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mpi/mpiincludes.h (revision 14911) +++ /issm/trunk-jpl/src/c/toolkits/mpi/mpiincludes.h (revision 14912) @@ -12,4 +12,3 @@ #include "./patches/mpipatches.h" - #endif Index: /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp (revision 14911) +++ /issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp (revision 14912) @@ -25,5 +25,4 @@ MPI_Comm_rank(comm,&my_rank); MPI_Comm_size(comm,&num_procs); - /* TODO replace the following with -> Index: /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp (revision 14911) +++ /issm/trunk-jpl/src/c/toolkits/mumps/MpiDenseMumpsSolve.cpp (revision 14912) @@ -10,5 +10,4 @@ #endif - #include "../../include/types.h" #include "../../include/macros.h" @@ -21,5 +20,4 @@ #include "dmumps_c.h" - #define JOB_INIT -1 #define JOB_SOLVE 6 @@ -30,5 +28,4 @@ /*Variables: {{{*/ - MPI_Comm comm; @@ -72,5 +69,5 @@ id.icntl[5-1] = 0; id.icntl[18-1] = 3; - + id.icntl[20-1] = 0; id.icntl[21-1] = 0; @@ -93,5 +90,4 @@ id.nz_loc=local_nnz; - /*Allocate: */ if(local_nnz){ @@ -100,5 +96,5 @@ a_loc=xNew(local_nnz); } - + /*Populate the triplets: */ GetOwnershipBoundariesFromRange(&lower_row,&upper_row,Kff_m,comm); @@ -118,5 +114,4 @@ id.a_loc=a_loc; - /*Deal with right hand side. We need to MPI_Gather it onto cpu 0: */ rhs=xNew(pf_M); @@ -127,5 +122,5 @@ /*recvcounts:*/ MPI_Allgather(&pf_m,1,MPI_INT,recvcounts,1,MPI_INT,comm); - + /*displs: */ MPI_Allgather(&lower_row,1,MPI_INT,displs,1,MPI_INT,comm);