Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15105) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15106) @@ -1287,5 +1287,4 @@ IssmDouble gl[3]; IssmDouble f1,f2; - /*Recover parameters and values*/ Index: /issm/trunk-jpl/src/c/classes/classes.h =================================================================== --- /issm/trunk-jpl/src/c/classes/classes.h (revision 15105) +++ /issm/trunk-jpl/src/c/classes/classes.h (revision 15106) @@ -44,5 +44,4 @@ #include "./Elements/TriaHook.h" #include "./Elements/TriaRef.h" - /*Option parsing objects: */ Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (revision 15105) +++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (revision 15106) @@ -9,5 +9,5 @@ void solutionsequence_hydro_nonlinear(FemModel* femmodel){ - + /*solution : */ Vector* ug=NULL; @@ -19,10 +19,10 @@ Vector* ys=NULL; Vector* duf=NULL; - + Matrix* Kff=NULL; Matrix* Kfs=NULL; Vector* pf=NULL; Vector* df=NULL; - + bool sedconverged,eplconverged,hydroconverged; bool isefficientlayer; @@ -58,5 +58,4 @@ } - for(;;){ sedcount=1; @@ -75,5 +74,5 @@ femmodel->parameters->SetParam(HydrologySedimentEnum,HydrologyLayerEnum); femmodel->HydrologyTransferx(); - + /*Iteration on the sediment layer*/ for(;;){ @@ -85,5 +84,5 @@ delete old_uf; old_uf=uf_sed->Duplicate(); delete Kff; delete pf; delete ug; delete df; - + Mergesolutionfromftogx(&ug,uf_sed,ys,femmodel->nodes,femmodel->parameters); delete ys; InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug); @@ -187,10 +186,10 @@ } hydrocount++; - + if(hydroconverged)break; } InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); - + /*Free ressources: */ delete ug; @@ -201,4 +200,4 @@ delete aged_uf_epl; delete duf; - + } Index: /issm/trunk-jpl/src/m/classes/geometry.m =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.m (revision 15105) +++ /issm/trunk-jpl/src/m/classes/geometry.m (revision 15106) @@ -25,5 +25,5 @@ end % }}} function md = checkconsistency(obj,md,solution,analyses) % {{{ - + if (solution==TransientSolutionEnum() & md.transient.isgia) | (solution==GiaSolutionEnum()), md = checkfield(md,'geometry.thickness','forcing',1,'NaN',1,'>=',0); Index: /issm/trunk-jpl/src/m/classes/groundingline.m =================================================================== --- /issm/trunk-jpl/src/m/classes/groundingline.m (revision 15105) +++ /issm/trunk-jpl/src/m/classes/groundingline.m (revision 15106) @@ -31,5 +31,4 @@ md = checkfield(md,'groundingline.migration','values',{'None' 'AgressiveMigration' 'SoftMigration' 'SubelementMigration','SubelementMigration2'}); - if ~strcmp(obj.migration,'None'), if isnan(md.geometry.bathymetry), Index: /issm/trunk-jpl/src/m/classes/hydrologydc.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 15105) +++ /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 15106) @@ -20,5 +20,5 @@ sediment_thickness = 0; sediment_transmitivity = 0; - + spcepl_head = NaN; epl_compressibility = 0; @@ -26,5 +26,5 @@ epl_thickness = 0; epl_transmitivity = 0; - + end methods @@ -38,5 +38,5 @@ end % }}} function obj = setdefaultparameters(obj) % {{{ - + %Parameters from de Fleurian 2013 obj.water_compressibility = 5.04e-10; @@ -58,13 +58,13 @@ obj.epl_thickness = 1.0; obj.epl_transmitivity = 8.0e-02; - + end % }}} function md = checkconsistency(obj,md,solution,analyses) % {{{ - + %Early return if ~ismember(HydrologyDCInefficientAnalysisEnum(),analyses) & ~ismember(HydrologyDCEfficientAnalysisEnum(),analyses), return; end - + md = checkfield(md,'hydrology.water_compressibility','>',0,'numel',1); md = checkfield(md,'hydrology.isefficientlayer','numel',[1],'values',[0 1]); @@ -79,5 +79,5 @@ md = checkfield(md,'hydrology.leakage_factor','>',0,'numel',1); end - + md = checkfield(md,'hydrology.spcsediment_head','forcing',1); md = checkfield(md,'hydrology.sediment_compressibility','>',0,'numel',1); @@ -85,5 +85,5 @@ md = checkfield(md,'hydrology.sediment_thickness','>',0,'numel',1); md = checkfield(md,'hydrology.sediment_transmitivity','>',0,'numel',1); - + if obj.isefficientlayer==1, md = checkfield(md,'hydrology.spcepl_head','forcing',1); @@ -121,5 +121,5 @@ fielddisplay(obj,'sediment_thickness','sediment thickness [m]'); fielddisplay(obj,'sediment_transmitivity','sediment transmitivity [m^2/s]'); - + if obj.isefficientlayer==1, disp(sprintf(' - for the epl layer')); @@ -130,5 +130,5 @@ fielddisplay(obj,'epl_transmitivity','epl transmitivity [m^2/s]'); end - + end % }}} function marshall(obj,fid) % {{{ @@ -152,5 +152,5 @@ WriteData(fid,'object',obj,'fieldname','sediment_thickness','format','Double'); WriteData(fid,'object',obj,'fieldname','sediment_transmitivity','format','Double'); - + if obj.isefficientlayer==1, WriteData(fid,'object',obj,'fieldname','spcepl_head','format','DoubleMat','mattype',1); Index: /issm/trunk-jpl/src/m/classes/matdamageice.m =================================================================== --- /issm/trunk-jpl/src/m/classes/matdamageice.m (revision 15105) +++ /issm/trunk-jpl/src/m/classes/matdamageice.m (revision 15106) @@ -21,5 +21,5 @@ rheology_Z = NaN; rheology_law = ''; - + %gia: lithosphere_shear_modulus = 0.; @@ -27,5 +27,4 @@ mantle_shear_modulus = 0.; mantle_density = 0.; - end @@ -87,5 +86,5 @@ %available: none, paterson and arrhenius obj.rheology_law='Paterson'; - + %GIA: obj.lithosphere_shear_modulus = 6.7*10^10; % (Pa) @@ -151,5 +150,5 @@ WriteData(fid,'object',obj,'class','materials','fieldname','rheology_Z','format','DoubleMat','mattype',1); WriteData(fid,'data',StringToEnum(obj.rheology_law),'enum',MaterialsRheologyLawEnum(),'format','Integer'); - + WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_shear_modulus','format','Double'); WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_density','format','Double'); Index: /issm/trunk-jpl/src/m/classes/matice.m =================================================================== --- /issm/trunk-jpl/src/m/classes/matice.m (revision 15105) +++ /issm/trunk-jpl/src/m/classes/matice.m (revision 15106) @@ -145,5 +145,5 @@ WriteData(fid,'object',obj,'class','materials','fieldname','rheology_n','format','DoubleMat','mattype',2); WriteData(fid,'data',StringToEnum(obj.rheology_law),'enum',MaterialsRheologyLawEnum(),'format','Integer'); - + WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_shear_modulus','format','Double'); WriteData(fid,'object',obj,'class','materials','fieldname','lithosphere_density','format','Double'); Index: /issm/trunk-jpl/src/m/classes/model/model.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model/model.m (revision 15105) +++ /issm/trunk-jpl/src/m/classes/model/model.m (revision 15106) @@ -92,5 +92,4 @@ md.hydrology=hydrologyshreve(md.materials); end - end% }}} @@ -1150,10 +1149,10 @@ end % }}} function memory(obj) % {{{ - + disp(sprintf('\nMemory imprint:\n')); fields=properties('model'); mem=0; - + for i=1:length(fields), field=obj.(fields{i}); Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m =================================================================== --- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 15105) +++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 15106) @@ -80,5 +80,5 @@ numanalyses=1; analyses=[BedSlopeAnalysisEnum()]; - + case GiaSolutionEnum(), numanalyses=1; Index: /issm/trunk-jpl/src/m/contrib/paraview/writeVTKcell.m =================================================================== --- /issm/trunk-jpl/src/m/contrib/paraview/writeVTKcell.m (revision 15105) +++ /issm/trunk-jpl/src/m/contrib/paraview/writeVTKcell.m (revision 15106) @@ -47,10 +47,10 @@ fprintf(FID,'ASCII \n'); fprintf(FID,'DATASET UNSTRUCTURED_GRID \n'); - + fprintf(FID,'POINTS %d float\n',num_of_points); s='%f %f %f \n'; P=[points zeros(num_of_points,3-dim)]; fprintf(FID,s,P'); - + fprintf(FID,'CELLS %d %d\n',num_of_elt,num_of_elt*(point_per_elt+1)); s='%d'; @@ -60,13 +60,13 @@ s=cell2mat(horzcat(s,{'\n'})); fprintf(FID,s,[(point_per_elt)*ones(num_of_elt,1) model.mesh.elements-1]'); - + fprintf(FID,'CELL_TYPES %d\n',num_of_elt); s='%d\n'; fprintf(FID,s,celltype*ones(num_of_elt,1)); - + %check which field is a real result and print fprintf(FID,'POINT_DATA %s \n',num2str(num_of_points)); for j=1:num_of_fields - + if (length(sol_struct(1).(fieldnames{j}))==num_of_points); fprintf(FID,'SCALARS %s float 1 \n',fieldnames{j}); @@ -85,10 +85,10 @@ fprintf(FID,'ASCII \n'); fprintf(FID,'DATASET UNSTRUCTURED_GRID \n'); - + fprintf(FID,'POINTS %d float\n',num_of_points); s='%f %f %f \n'; P=[points zeros(num_of_points,3-dim)]; fprintf(FID,s,P'); - + fprintf(FID,'CELLS %d %d\n',num_of_elt,num_of_elt*(point_per_elt+1)); s='%d'; @@ -98,13 +98,13 @@ s=cell2mat(horzcat(s,{'\n'})); fprintf(FID,s,[(point_per_elt)*ones(num_of_elt,1) model.mesh.elements-1]'); - + fprintf(FID,'CELL_TYPES %d\n',num_of_elt); s='%d\n'; fprintf(FID,s,celltype*ones(num_of_elt,1)); - + %check which field is a real result and print fprintf(FID,'POINT_DATA %s \n',num2str(num_of_points)); for j=1:num_of_fields - + if (length(sol_struct(1).(fieldnames{j}))==num_of_points); fprintf(FID,'SCALARS %s float 1 \n',fieldnames{j}); Index: /issm/trunk-jpl/src/m/io/structtonc.m =================================================================== --- /issm/trunk-jpl/src/m/io/structtonc.m (revision 15105) +++ /issm/trunk-jpl/src/m/io/structtonc.m (revision 15106) @@ -130,3 +130,2 @@ %update counter counter = counter+1; - Index: /issm/trunk-jpl/src/m/lambert/lambert2xy.m =================================================================== --- /issm/trunk-jpl/src/m/lambert/lambert2xy.m (revision 15105) +++ /issm/trunk-jpl/src/m/lambert/lambert2xy.m (revision 15106) @@ -70,6 +70,2 @@ y=(B/D)*((cos(b0)*sin(b))-(sin(b0)*cos(b)*cos(lam-lam0))); end - - - - Index: /issm/trunk-jpl/src/m/mesh/ExportGmsh.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/ExportGmsh.m (revision 15105) +++ /issm/trunk-jpl/src/m/mesh/ExportGmsh.m (revision 15106) @@ -4,5 +4,4 @@ % Usage: % ExportGmsh(md,filename) - t1=clock;fprintf('%s',['writing gmsh mesh file']); @@ -52,3 +51,2 @@ fclose(fid); t2=clock;fprintf('%s\n',[' done (' num2str(etime(t2,t1)) ' seconds)']); - Index: /issm/trunk-jpl/src/m/mesh/roundmesh.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/roundmesh.m (revision 15105) +++ /issm/trunk-jpl/src/m/mesh/roundmesh.m (revision 15106) @@ -46,3 +46,2 @@ end - Index: /issm/trunk-jpl/src/m/miscellaneous/normcdf_issm.m =================================================================== --- /issm/trunk-jpl/src/m/miscellaneous/normcdf_issm.m (revision 15105) +++ /issm/trunk-jpl/src/m/miscellaneous/normcdf_issm.m (revision 15106) @@ -7,3 +7,2 @@ end - Index: /issm/trunk-jpl/src/m/miscellaneous/normfit_issm.m =================================================================== --- /issm/trunk-jpl/src/m/miscellaneous/normfit_issm.m (revision 15105) +++ /issm/trunk-jpl/src/m/miscellaneous/normfit_issm.m (revision 15106) @@ -60,3 +60,2 @@ end - Index: /issm/trunk-jpl/src/m/miscellaneous/norminv_issm.m =================================================================== --- /issm/trunk-jpl/src/m/miscellaneous/norminv_issm.m (revision 15105) +++ /issm/trunk-jpl/src/m/miscellaneous/norminv_issm.m (revision 15106) @@ -7,3 +7,2 @@ end - Index: /issm/trunk-jpl/src/m/miscellaneous/prctile_issm.m =================================================================== --- /issm/trunk-jpl/src/m/miscellaneous/prctile_issm.m (revision 15105) +++ /issm/trunk-jpl/src/m/miscellaneous/prctile_issm.m (revision 15106) @@ -85,3 +85,2 @@ end - Index: /issm/trunk-jpl/src/m/morphological/closing.m =================================================================== --- /issm/trunk-jpl/src/m/morphological/closing.m (revision 15105) +++ /issm/trunk-jpl/src/m/morphological/closing.m (revision 15106) @@ -4,3 +4,2 @@ mask=dilation(mask,neighboorhood); mask=erosion(mask,neighboorhood); - Index: /issm/trunk-jpl/src/m/morphological/vectorialize.m =================================================================== --- /issm/trunk-jpl/src/m/morphological/vectorialize.m (revision 15105) +++ /issm/trunk-jpl/src/m/morphological/vectorialize.m (revision 15106) @@ -2,5 +2,5 @@ vec=bwboundaries(mask,connectivity); - + contours=struct([]); for i=1:length(vec), Index: /issm/trunk-jpl/src/m/parameterization/contourenvelope.m =================================================================== --- /issm/trunk-jpl/src/m/parameterization/contourenvelope.m (revision 15105) +++ /issm/trunk-jpl/src/m/parameterization/contourenvelope.m (revision 15106) @@ -138,3 +138,2 @@ end segments=segments(1:count-1,:); - Index: /issm/trunk-jpl/src/m/plot/colormaps/ibcao.m =================================================================== --- /issm/trunk-jpl/src/m/plot/colormaps/ibcao.m (revision 15105) +++ /issm/trunk-jpl/src/m/plot/colormaps/ibcao.m (revision 15106) @@ -66,4 +66,3 @@ yland = interp1(1:lland,Jland,linspace(1,lland,nland),'*linear'); - map=[ysea;yland]; Index: /issm/trunk-jpl/src/m/plot/colormaps/seacolor.m =================================================================== --- /issm/trunk-jpl/src/m/plot/colormaps/seacolor.m (revision 15105) +++ /issm/trunk-jpl/src/m/plot/colormaps/seacolor.m (revision 15106) @@ -56,3 +56,2 @@ end y = interp1(1:l,J,linspace(1,l,n),'*linear'); - Index: /issm/trunk-jpl/src/m/plot/curvedarrow.m =================================================================== --- /issm/trunk-jpl/src/m/plot/curvedarrow.m (revision 15105) +++ /issm/trunk-jpl/src/m/plot/curvedarrow.m (revision 15106) @@ -24,5 +24,5 @@ %compute some values out of (x1,y1) and (x2,y2) length=distance*angle; - + if exist(options,'widthratio'), widthratio=getfieldvalue(options,'widthratio'); @@ -57,5 +57,5 @@ m=-m; end - + if exist(options,'arrowlength'), d=arrowlength; @@ -63,5 +63,5 @@ d=abs((distance*angle)*ratio); end - + %G is d distance from middle of E and F: G=(E+F)/2+d*m; Index: /issm/trunk-jpl/src/m/plot/plotboxpos.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plotboxpos.m (revision 15105) +++ /issm/trunk-jpl/src/m/plot/plotboxpos.m (revision 15106) Index: /issm/trunk-jpl/src/mobile/ios/ISSM_APP/ISSM_APP/ISSM_APP/AppDelegate.m =================================================================== --- /issm/trunk-jpl/src/mobile/ios/ISSM_APP/ISSM_APP/ISSM_APP/AppDelegate.m (revision 15105) +++ /issm/trunk-jpl/src/mobile/ios/ISSM_APP/ISSM_APP/ISSM_APP/AppDelegate.m (revision 15106) @@ -16,5 +16,5 @@ return YES; } - + - (void)applicationWillResignActive:(UIApplication *)application { Index: /issm/trunk-jpl/src/mobile/ios/ISSM_APP/ISSM_APP/ISSM_APPTests/ISSM_APPTests.m =================================================================== --- /issm/trunk-jpl/src/mobile/ios/ISSM_APP/ISSM_APP/ISSM_APPTests/ISSM_APPTests.m (revision 15105) +++ /issm/trunk-jpl/src/mobile/ios/ISSM_APP/ISSM_APP/ISSM_APPTests/ISSM_APPTests.m (revision 15106) @@ -14,5 +14,5 @@ { [super setUp]; - + // Set-up code here. } @@ -21,5 +21,5 @@ { // Tear-down code here. - + [super tearDown]; } Index: /issm/trunk-jpl/src/wrappers/AverageFilter/AverageFilter.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/AverageFilter/AverageFilter.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/AverageFilter/AverageFilter.cpp (revision 15106) @@ -43,5 +43,5 @@ FetchData(&imagein,&imagein_rows,&imagein_cols,IMAGEIN); FetchData(&smooth,SMOOTH); - + /*Run core hole filler routine: */ AverageFilterx( &imageout,imagein,imagein_rows,imagein_cols,smooth); Index: /issm/trunk-jpl/src/wrappers/Chaco/Chaco.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/Chaco/Chaco.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/Chaco/Chaco.cpp (revision 15106) @@ -17,5 +17,5 @@ }/*}}}*/ WRAPPER(Chaco){ - + int i; int nterms; @@ -83,5 +83,5 @@ nparts=xNew(1); nparts[0]=npart; //weird Chacox interface ain't it? FetchData(&goal,&nterms,GOAL_IN); - + /*Some debugging print: {{{*/ #ifdef _DEBUG_ @@ -106,8 +106,8 @@ #endif /*}}}*/ - + /*Allocate output: */ assignment = xNewZeroInit(nvtxs); - + /*Call core: */ Chacox(nvtxs, start, adjacency, vwgts, ewgts, x, y, z, assignment, options, nparts, goal); Index: /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.cpp (revision 15106) @@ -3,5 +3,5 @@ are inside this contour. */ - + #include "./ContourToMesh.h" Index: /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.h =================================================================== --- /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.h (revision 15105) +++ /issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.h (revision 15106) @@ -62,3 +62,2 @@ #endif /* _CONTOURTOMESH_H */ - Index: /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.cpp (revision 15106) @@ -2,5 +2,5 @@ \brief: takes a contour file, and figures out which nodes (x,y list) */ - + #include "./ContourToNodes.h" @@ -32,5 +32,5 @@ /*checks on arguments on the matlab side: */ CHECKARGUMENTS(NLHS,NRHS,&ContourToNodesUsage); - + /*Fetch inputs: */ FetchData(&x,&nods,NULL,XHANDLE); Index: /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.h =================================================================== --- /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.h (revision 15105) +++ /issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.h (revision 15106) @@ -54,3 +54,2 @@ #endif /* _CONTOURTONODES_H */ - Index: /issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.cpp (revision 15106) @@ -2,5 +2,5 @@ * \brief: edge detection for a boolean image */ - + #include "./EdgeDetection.h" Index: /issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.cpp (revision 15106) @@ -26,5 +26,5 @@ /*checks on arguments: */ CHECKARGUMENTS(NLHS,NRHS,&ElementConnectivityUsage); - + /*Input datasets: */ FetchData(&elements,&nels,NULL,ELEMENTS); Index: /issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.h =================================================================== --- /issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.h (revision 15105) +++ /issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.h (revision 15106) @@ -25,5 +25,5 @@ #undef __FUNCT__ #define __FUNCT__ "EnumToString" - + #ifdef _HAVE_MATLAB_MODULES_ /* serial input macros: */ Index: /issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp (revision 15106) @@ -87,5 +87,4 @@ } - }/*}}}*/ WRAPPER(ExpSimplify){ Index: /issm/trunk-jpl/src/wrappers/HoleFiller/HoleFiller.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/HoleFiller/HoleFiller.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/HoleFiller/HoleFiller.cpp (revision 15106) @@ -29,5 +29,4 @@ int smooth; - /* output: */ double* imageout=NULL; @@ -43,5 +42,5 @@ FetchData(&imagein,&imagein_rows,&imagein_cols,IMAGEIN); FetchData(&smooth_flag,SMOOTH); - + /*Get smooth flag setup: */ if (smooth_flag==0) Index: /issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.cpp (revision 15106) @@ -2,5 +2,5 @@ * \brief: data interpolation from a list of (x,y,values) into mesh vertices */ - + #include "./InterpFromGridToMesh.h" Index: /issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.cpp (revision 15106) @@ -2,5 +2,5 @@ * \brief: data interpolation from a list of (x,y,values) into mesh vertices */ - + #include "./InterpFromMesh2d.h" @@ -29,5 +29,5 @@ double* x_data=NULL; int x_data_rows; - + double* y_data=NULL; int y_data_rows; @@ -39,8 +39,7 @@ double* x_prime=NULL; double* y_prime=NULL; - + int x_prime_rows; int y_prime_rows; - double* default_values=NULL; @@ -93,5 +92,5 @@ if(nrhs>=8){ - + /*Call expread on filename to build a contour array in the matlab workspace: */ mexCallMATLAB( 1, &matlabstructure, 1, (mxArray**)&FILENAME, "expread"); @@ -127,5 +126,4 @@ } - /*some checks*/ if (x_data_rows!=y_data_rows){ @@ -135,5 +133,5 @@ _error_("vectors x_prime and y_prime should have the same length!"); } - + /*get number of elements and number of nodes in the data*/ nels_data=index_data_rows; Index: /issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.cpp (revision 15106) @@ -42,5 +42,4 @@ double* y_m=NULL; - /*Boot module: */ MODULEBOOT(); @@ -72,5 +71,5 @@ /*Free ressources: */ //let matlab do this. - + /*end module: */ MODULEEND(); Index: /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (revision 15106) @@ -2,5 +2,5 @@ * \brief: data interpolation from a list of (x,y,values) into mesh vertices */ - + #include "./InterpFromMeshToMesh3d.h" @@ -47,5 +47,5 @@ double* y_prime=NULL; double* z_prime=NULL; - + int x_prime_rows; int y_prime_rows; Index: /issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.cpp (revision 15106) @@ -2,5 +2,5 @@ * \brief: partition mesh according to number of areas, using Metis library. */ - + #include "./MeshPartition.h" @@ -67,5 +67,5 @@ element_partitioning[i]=(double)int_element_partitioning[i]+1; //Metis indexing from 0, matlab from 1. } - + node_partitioning=xNew(numberofvertices); for (i=0;i(); - + seqvec=new IssmSeqVec(); Index: /issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp (revision 15106) @@ -373,5 +373,4 @@ char id[100]; - /*Initialize field names*/ i=0; @@ -398,8 +397,8 @@ /*number of nods: */ SetStructureFieldi(dataref,i,"nods" ,contour->nods); - + /*density: */ SetStructureFieldi(dataref,i,"density" ,1); - + /*x and y: */ SetStructureFieldi(dataref,i,"x" ,contour->nods, 1,contour->x); Index: /issm/trunk-jpl/src/wrappers/python/include/wrapper_macros.h =================================================================== --- /issm/trunk-jpl/src/wrappers/python/include/wrapper_macros.h (revision 15105) +++ /issm/trunk-jpl/src/wrappers/python/include/wrapper_macros.h (revision 15106) @@ -43,5 +43,5 @@ /* WRAPPER 3.2 {{{*/ #define WRAPPER(modulename,...) \ -\ + static PyObject* modulename(PyObject* self,PyObject* args);\ static PyMethodDef modulename##_funcs[] = {\ @@ -49,5 +49,5 @@ {NULL,NULL,0,NULL}\ };\ -\ + static struct PyModuleDef modulename##module= {\ PyModuleDef_HEAD_INIT,\ @@ -58,11 +58,11 @@ modulename##_funcs\ };\ -\ + PyMODINIT_FUNC PyInit_##modulename(void){\ -\ + import_array();\ return PyModule_Create(&modulename##module);\ }\ -\ + static PyObject* modulename(PyObject* self,PyObject* args) /*}}}*/ @@ -70,5 +70,5 @@ /* WRAPPER 2.7 {{{*/ #define WRAPPER(modulename,...) \ -\ + static PyObject* modulename(PyObject* self,PyObject* args);\ static PyMethodDef modulename##_funcs[] = {\ @@ -76,11 +76,11 @@ {NULL,NULL,0,NULL}\ };\ -\ + PyMODINIT_FUNC init##modulename(void){\ -\ + import_array();\ (void) Py_InitModule(#modulename, modulename##_funcs);\ }\ -\ + static PyObject* modulename(PyObject* self,PyObject* args) /*}}}*/ Index: /issm/trunk-jpl/src/wrappers/python/io/ApiPrintf.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/python/io/ApiPrintf.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/python/io/ApiPrintf.cpp (revision 15106) @@ -19,5 +19,5 @@ /*use printf: */ printf(format,string); - + return; } Index: /issm/trunk-jpl/src/wrappers/python/io/WritePythonData.cpp =================================================================== --- /issm/trunk-jpl/src/wrappers/python/io/WritePythonData.cpp (revision 15105) +++ /issm/trunk-jpl/src/wrappers/python/io/WritePythonData.cpp (revision 15106) @@ -298,5 +298,5 @@ /*use printf: */ printf(format,string); - + return; }