Index: /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.h (revision 26468) +++ /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.h (revision 26469) @@ -10,5 +10,5 @@ class ExtrapolationAnalysis: public Analysis{ - + public: /*Model processing*/ Index: /issm/trunk-jpl/src/c/classes/AmrBamg.h =================================================================== --- /issm/trunk-jpl/src/c/classes/AmrBamg.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/AmrBamg.h (revision 26469) @@ -28,8 +28,7 @@ IssmDouble deviatoricerror_maximum; - /* Constructor, destructor etc*/ AmrBamg(); - + ~AmrBamg(); @@ -40,8 +39,8 @@ void ExecuteRefinementBamg(IssmDouble* field,IssmDouble* hmaxVertices,int** pdatalist,IssmDouble** pxylist,int** pelementslist); void SetBamgOpts(IssmDouble hmin_in,IssmDouble hmax_in,IssmDouble err_in,IssmDouble gradation_in); - + /*Access Method*/ BamgOpts* GetBamgOpts(){return this->options;} - + private: BamgGeom* geometry; Index: /issm/trunk-jpl/src/c/classes/BarystaticContributions.h =================================================================== --- /issm/trunk-jpl/src/c/classes/BarystaticContributions.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/BarystaticContributions.h (revision 26469) @@ -31,5 +31,5 @@ int nocean; //number of ocean partitions IssmDouble* pocean; //ocean partition (nel) - + /*BarystaticContributions constructors, destructors :*/ BarystaticContributions(IoModel* iomodel ); Index: /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h (revision 26469) @@ -21,12 +21,12 @@ int weights_enum; bool timepassedflag; - + IssmDouble misfit; //value carried over in time. - + /*Cfdragcoeffabsgrad constructors, destructors :*/ Cfdragcoeffabsgrad(); Cfdragcoeffabsgrad(char* in_name, int in_definitionenum, int in_weights_enum, bool timepassedflag); ~Cfdragcoeffabsgrad(); - + /*Object virtual function resolutoin: */ Object* copy(); @@ -36,5 +36,5 @@ void Marshall(MarshallHandle* marshallhandle); int ObjectEnum(void); - + /*Definition virtual function resolutoin: */ int DefinitionEnum(); Index: /issm/trunk-jpl/src/c/classes/Cflevelsetmisfit.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Cflevelsetmisfit.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Cflevelsetmisfit.h (revision 26469) @@ -24,12 +24,12 @@ IssmDouble datatime; bool timepassedflag; - + IssmDouble misfit; //value carried over in time. - + /*Cflevelsetmisfit constructors, destructors :*/ Cflevelsetmisfit(); Cflevelsetmisfit(char* in_name, int in_definitionenum, int in_model_enum, int in_observation_enum, int in_weights_enum, IssmDouble in_datatime, bool timepassedflag); ~Cflevelsetmisfit(); - + /*Object virtual function resolutoin: */ Object* copy(); @@ -39,5 +39,5 @@ void Marshall(MarshallHandle* marshallhandle); int ObjectEnum(void); - + /*Definition virtual function resolutoin: */ int DefinitionEnum(); Index: /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.h (revision 26469) @@ -21,12 +21,12 @@ IssmDouble datatime; bool timepassedflag; - + IssmDouble misfit; //value carried over in time. - + /*Cfsurfacelogvel constructors, destructors :*/ Cfsurfacelogvel(); Cfsurfacelogvel(char* in_name, int in_definitionenum, IssmDouble in_datatime, bool timepassedflag); ~Cfsurfacelogvel(); - + /*Object virtual function resolutoin: */ Object* copy(); @@ -36,5 +36,5 @@ void Marshall(MarshallHandle* marshallhandle); int ObjectEnum(void); - + /*Definition virtual function resolutoin: */ int DefinitionEnum(); Index: /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.h (revision 26469) @@ -26,12 +26,12 @@ IssmDouble datatime; bool timepassedflag; - + IssmDouble misfit; //value carried over in time. - + /*Cfsurfacesquare constructors, destructors :*/ Cfsurfacesquare(); Cfsurfacesquare(char* in_name, int in_definitionenum, int in_model_enum, int in_observation_enum, int in_weights_enum, IssmDouble in_datatime, bool timepassedflag); ~Cfsurfacesquare(); - + /*Object virtual function resolutoin: */ Object* copy(); @@ -41,5 +41,5 @@ void Marshall(MarshallHandle* marshallhandle); int ObjectEnum(void); - + /*Definition virtual function resolutoin: */ int DefinitionEnum(); Index: /issm/trunk-jpl/src/c/classes/Dakota/IssmParallelDirectApplicInterface.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Dakota/IssmParallelDirectApplicInterface.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Dakota/IssmParallelDirectApplicInterface.h (revision 26469) @@ -29,5 +29,4 @@ /*}}}*/ - #if !defined(_WRAPPERS_) && defined(_HAVE_DAKOTA_) && _DAKOTA_MAJOR_ >= 6 @@ -37,5 +36,5 @@ namespace SIM { class IssmParallelDirectApplicInterface: public Dakota::DirectApplicInterface{ - + private: FemModel* femmodel_init; Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 26469) @@ -215,5 +215,4 @@ IssmDouble EnthalpyDiffusionParameterVolume(int numvertices,IssmDouble* enthalpy,IssmDouble* pressure); IssmDouble PureIceEnthalpy(IssmDouble pressure); - /*Virtual functions*/ Index: /issm/trunk-jpl/src/c/classes/Elements/ElementHook.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/ElementHook.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Elements/ElementHook.h (revision 26469) @@ -23,5 +23,5 @@ ~ElementHook(); void Marshall(MarshallHandle* marshallhandle); - + void DeepEcho(); void Echo(); Index: /issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h (revision 26469) @@ -606,5 +606,4 @@ template <> inline void GenericExternalResult::Transpose(void){/*{{{*/ - /*Perform transpose only if we have a matrix*/ if(M>1 && N>1){ @@ -624,6 +623,4 @@ this->M = temp2; - - } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h (revision 26469) @@ -20,5 +20,5 @@ int numberofelements_local; int numberofvertices_local; - + public: int GetNumIds() const {return this->numids;}; Index: /issm/trunk-jpl/src/c/classes/Masscon.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Masscon.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Masscon.h (revision 26469) @@ -24,5 +24,5 @@ IssmDouble* levelset; int M; - + /*Masscon constructors, destructors :*/ Masscon(){/*{{{*/ @@ -101,5 +101,4 @@ IssmDouble all_mass_t=0.; - for(i=0;ielements->Size();i++){ Element* element=(Element*)femmodel->elements->GetObjectByOffset(i); @@ -109,5 +108,5 @@ ISSM_MPI_Allreduce ( (void*)&mass_t,(void*)&all_mass_t,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm()); mass_t=all_mass_t; - + return mass_t; } Index: /issm/trunk-jpl/src/c/classes/Massconaxpby.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Massconaxpby.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Massconaxpby.h (revision 26469) @@ -26,5 +26,5 @@ IssmDouble alpha; IssmDouble beta; - + /*Massconaxpby constructors, destructors :*/ Massconaxpby(){/*{{{*/ @@ -47,5 +47,5 @@ this->namex = xNew(strlen(in_namex)+1); xMemCpy(this->namex,in_namex,strlen(in_namex)+1); - + this->namey = xNew(strlen(in_namey)+1); xMemCpy(this->namey,in_namey,strlen(in_namey)+1); Index: /issm/trunk-jpl/src/c/classes/Massfluxatgate.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Massfluxatgate.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Massfluxatgate.h (revision 26469) @@ -42,5 +42,5 @@ /*}}}*/ Massfluxatgate(char* in_name, int in_definitionenum, int in_numsegments, doubletype* in_segments) {/*{{{*/ - + int i; @@ -83,5 +83,5 @@ this->y2=xNew(this->numsegments); xMemCpy(this->y2,in_y2,this->numsegments); this->elements=xNew(this->numsegments); xMemCpy(this->elements,in_elements,this->numsegments); - + } } Index: /issm/trunk-jpl/src/c/classes/Misfit.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Misfit.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Misfit.h (revision 26469) @@ -24,13 +24,13 @@ char* timeinterpolation; int weights_enum; - + int lock; // if lock is on, we just return the value stored in "misfit". this is used so we don't compute misfit past the final_time IssmDouble misfit; //value carried over in time. - + /*Misfit constructors, destructors :*/ Misfit(); Misfit(char* in_name, int in_definitionenum, int in_model_enum, int in_observation_enum, char* in_timeinterpolation, int in_local, int in_weights_enum); ~Misfit(); - + /*Object virtual function resolutoin: */ Object* copy(); @@ -40,5 +40,5 @@ void Marshall(MarshallHandle* marshallhandle); int ObjectEnum(void); - + /*Definition virtual function resolutoin: */ int DefinitionEnum(); Index: /issm/trunk-jpl/src/c/classes/Numberedcostfunction.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Numberedcostfunction.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Numberedcostfunction.h (revision 26469) @@ -9,5 +9,4 @@ #include "./Definition.h" #include "./FemModel.h" - IssmDouble OutputDefinitionsResponsex(FemModel* femmodel,int output_enum); Index: /issm/trunk-jpl/src/c/classes/Options/Option.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Options/Option.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Options/Option.h (revision 26469) @@ -28,5 +28,4 @@ int ObjectEnum(){return OptionEnum;}; - /*virtual functions: */ virtual char* Name()=0; Index: /issm/trunk-jpl/src/c/classes/Profiler.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Profiler.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Profiler.h (revision 26469) @@ -38,5 +38,4 @@ #define MAXPROFSIZE 25 /*Used to initialize static arrays*/ - class Profiler: public Object{ Index: /issm/trunk-jpl/src/c/classes/Radar.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Radar.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/Radar.h (revision 26469) @@ -18,10 +18,10 @@ char* name; int definitionenum; - + /*Radar constructors, destructors :*/ Radar(); Radar(char* in_name, int in_definitionenum); ~Radar(); - + /*Object virtual function resolutoin: */ Object* copy(); @@ -31,5 +31,5 @@ void Marshall(MarshallHandle* marshallhandle); int ObjectEnum(void); - + /*Definition virtual function resolutoin: */ int DefinitionEnum(); Index: /issm/trunk-jpl/src/c/classes/SealevelGeometry.h =================================================================== --- /issm/trunk-jpl/src/c/classes/SealevelGeometry.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/SealevelGeometry.h (revision 26469) @@ -36,5 +36,5 @@ int nbar[SLGEOM_NUMLOADS]; int* lids; - + SealevelGeometry(int localnel,int localnods); ~SealevelGeometry(); Index: /issm/trunk-jpl/src/c/classes/kriging/Covertree.h =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/Covertree.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/kriging/Covertree.h (revision 26469) @@ -95,5 +95,4 @@ bool isValidTree() const; - /** * Remove point p from the cover tree. If p is not present in the tree, Index: /issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.h =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/kriging/ExponentialVariogram.h (revision 26469) @@ -29,5 +29,4 @@ int ObjectEnum(){_error_("Not implemented yet");}; - /*Variogram functions*/ double Covariance(double deltax,double deltay); Index: /issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.h =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/kriging/PowerVariogram.h (revision 26469) @@ -29,5 +29,4 @@ int ObjectEnum(){_error_("Not implemented yet");}; - /*Variogram functions*/ double Covariance(double deltax,double deltay); Index: /issm/trunk-jpl/src/c/classes/kriging/Quadtree.h =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/Quadtree.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/kriging/Quadtree.h (revision 26469) @@ -33,5 +33,4 @@ int ObjectEnum(){_error_("not implemented yet"); }; - /*Methods*/ int IsWithinRange(double x,double y,double range); Index: /issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.h =================================================================== --- /issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.h (revision 26468) +++ /issm/trunk-jpl/src/c/classes/kriging/SphericalVariogram.h (revision 26469) @@ -29,5 +29,4 @@ int ObjectEnum(){_error_("Not implemented yet");}; - /*Variogram functions*/ double Covariance(double deltax,double deltay); Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h (revision 26468) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h (revision 26469) @@ -5,5 +5,4 @@ #ifndef _CONSTRAINTSSTATELOCAL_H #define _CONSTRAINTSSTATELOCAL_H - #ifdef HAVE_CONFIG_H Index: /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h (revision 26468) +++ /issm/trunk-jpl/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.h (revision 26469) @@ -15,4 +15,3 @@ void GetVectorFromInputsx(IssmDouble** pvector,int* pvector_size, FemModel* femmodel,int name); - #endif /* _GETVECTORFROMINPUTSXX_H */ Index: /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h =================================================================== --- /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h (revision 26468) +++ /issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h (revision 26469) @@ -13,4 +13,3 @@ void InputScaleFromDakotax(FemModel* femmodel,IssmDouble* distributed_values,IssmDouble* partition, int npart, int nt, int name); - #endif /* _INPUTUPDATEFROMDAKOTAXX_H */ Index: /issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h (revision 26468) +++ /issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h (revision 26469) @@ -25,5 +25,4 @@ int* index2d=NULL; int count=0; - switch(meshelementtype){ Index: /issm/trunk-jpl/src/c/shared/Matrix/matrix.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Matrix/matrix.h (revision 26468) +++ /issm/trunk-jpl/src/c/shared/Matrix/matrix.h (revision 26469) @@ -25,5 +25,5 @@ void Matrix4x4Determinant(IssmDouble* Adet,IssmDouble* A); void Matrix4x4Solve(IssmDouble* X,IssmDouble* A,IssmDouble* B); - + void newcell(IssmDouble** pcell, IssmDouble newvalue, bool top, int m); IssmDouble cellsum(IssmDouble* cell, int m); Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiSparseMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiSparseMat.h (revision 26468) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiSparseMat.h (revision 26469) @@ -90,5 +90,5 @@ /*}}}*/ void Init(int Min,int Nin){/*{{{*/ - + this->buckets=new DataSet(); @@ -288,5 +288,5 @@ } } - + /*Plug into matrix: */ for(int i=0;im;i++) this->matrix[i]->SetValues(numvalues_perrow[i],cols_perrow[i],values_perrow[i],mods_perrow[i]); Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h (revision 26468) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h (revision 26469) @@ -444,5 +444,4 @@ comm=IssmComm::GetComm(); num_procs=IssmComm::GetSize(); - /*Allocate: */ Index: /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h (revision 26468) +++ /issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h (revision 26469) @@ -334,5 +334,5 @@ } /*}}}*/ - + }; #endif //#ifndef _ISSM_SEQ_VEC_H_ Index: /issm/trunk-jpl/src/c/toolkits/issm/SparseRow.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SparseRow.h (revision 26468) +++ /issm/trunk-jpl/src/c/toolkits/issm/SparseRow.h (revision 26469) @@ -19,5 +19,5 @@ int* indices; doubletype* values; - + /*SparseRow constructors, destructors*/ SparseRow(){ /*{{{*/ @@ -28,5 +28,5 @@ } /*}}}*/ SparseRow(int in_M){/*{{{*/ - + M=in_M; ncols=0; @@ -87,5 +87,5 @@ indices=xNew(ncols); _assert_(indices); values=xNewZeroInit(ncols); _assert_(values); - + count=0; for(i=0;i