Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 18785) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 18786) @@ -437,4 +437,5 @@ ./classes/Massfluxatgate.h \ ./classes/Misfit.h \ + ./classes/Masscon.h \ ./modules/ModelProcessorx/CreateOutputDefinitions.cpp\ ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.h\ Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 18785) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 18786) @@ -205,4 +205,5 @@ virtual bool IsOnSurface()=0; virtual void GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating)=0; + virtual void GetLevelsetPositivePart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlynegative,IssmDouble* levelsetvalues)=0; virtual IssmDouble GetGroundedPortion(IssmDouble* xyz_list)=0; virtual void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype)=0; @@ -273,4 +274,5 @@ virtual IssmDouble TotalSmb(void)=0; virtual IssmDouble Misfit(int modelenum,int observationenum,int weightsenum)=0; + virtual IssmDouble Masscon(IssmDouble* levelset)=0; virtual IssmDouble MisfitArea(int weightsenum)=0; virtual int VertexConnectivity(int vertexindex)=0; Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 18785) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 18786) @@ -74,4 +74,5 @@ Element* GetUpperElement(void); Element* GetBasalElement(void); + void GetLevelsetPositivePart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlynegative,IssmDouble* levelsetvalues){_error_("not implemented yet");}; void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating); IssmDouble GetGroundedPortion(IssmDouble* xyz_list); @@ -132,4 +133,5 @@ IssmDouble Misfit(int modelenum,int observationenum,int weightsenum){_error_("not implemented yet");}; IssmDouble MisfitArea(int weightsenum){_error_("not implemented yet");}; + IssmDouble Masscon(IssmDouble* levelset){_error_("not implemented yet");}; void MigrateGroundingLine(IssmDouble* sheet_ungrounding); Index: /issm/trunk-jpl/src/c/classes/Elements/Seg.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 18785) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 18786) @@ -109,4 +109,5 @@ int VelocityInterpolation(void){_error_("not implemented yet");}; int TensorInterpolation(void){_error_("not implemented yet");}; + void GetLevelsetPositivePart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlynegative,IssmDouble* levelsetvalues){_error_("not implemented yet");}; void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating){_error_("not implemented yet");}; IssmDouble GetGroundedPortion(IssmDouble* xyz_list){_error_("not implemented yet");}; @@ -157,4 +158,5 @@ IssmDouble Misfit(int modelenum,int observationenum,int weightsenum){_error_("not implemented yet");}; IssmDouble MisfitArea(int weightsenum){_error_("not implemented yet");}; + IssmDouble Masscon(IssmDouble* levelset){_error_("not implemented yet");}; #ifdef _HAVE_GIA_ Index: /issm/trunk-jpl/src/c/classes/Elements/Tetra.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tetra.h (revision 18785) +++ /issm/trunk-jpl/src/c/classes/Elements/Tetra.h (revision 18786) @@ -114,4 +114,5 @@ int VelocityInterpolation(void); int TensorInterpolation(void); + void GetLevelsetPositivePart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlynegative,IssmDouble* levelsetvalues){_error_("not implemented yet");}; void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating){_error_("not implemented yet");}; IssmDouble GetGroundedPortion(IssmDouble* xyz_list){_error_("not implemented yet");}; @@ -161,4 +162,5 @@ IssmDouble Misfit(int modelenum,int observationenum,int weightsenum){_error_("not implemented yet");}; IssmDouble MisfitArea(int weightsenum){_error_("not implemented yet");}; + IssmDouble Masscon(IssmDouble* levelset){_error_("not implemented yet");}; #ifdef _HAVE_GIA_ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 18785) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 18786) @@ -666,4 +666,54 @@ return this->element_type; +} +/*}}}*/ +void Tria::GetLevelsetPositivePart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlynegative,IssmDouble* gl){/*{{{*/ + + /*Computeportion of the element that has a positive levelset*/ + + bool negative=true; + int point; + const IssmPDouble epsilon= 1.e-15; + IssmDouble f1,f2; + + /*Be sure that values are not zero*/ + if(gl[0]==0.) gl[0]=gl[0]+epsilon; + if(gl[1]==0.) gl[1]=gl[1]+epsilon; + if(gl[2]==0.) gl[2]=gl[2]+epsilon; + + /*Check that not all nodes are positive or negative*/ + if(gl[0]>0 && gl[1]>0 && gl[2]>0){ // All positive + point=0; + f1=1.; + f2=1.; + } + else if(gl[0]<0 && gl[1]<0 && gl[2]<0){ //All negative + point=0; + f1=0.; + f2=0.; + } + else{ + if(gl[0]*gl[1]*gl[2]<0) negative=false; + + if(gl[0]*gl[1]>0){ //Nodes 0 and 1 are similar, so points must be found on segment 0-2 and 1-2 + point=2; + f1=gl[2]/(gl[2]-gl[0]); + f2=gl[2]/(gl[2]-gl[1]); + } + else if(gl[1]*gl[2]>0){ //Nodes 1 and 2 are similar, so points must be found on segment 0-1 and 0-2 + point=0; + f1=gl[0]/(gl[0]-gl[1]); + f2=gl[0]/(gl[0]-gl[2]); + } + else if(gl[0]*gl[2]>0){ //Nodes 0 and 2 are similar, so points must be found on segment 1-0 and 1-2 + point=1; + f1=gl[1]/(gl[1]-gl[2]); + f2=gl[1]/(gl[1]-gl[0]); + } + } + *point1=point; + *fraction1=f1; + *fraction2=f2; + *mainlynegative=negative; } /*}}}*/ @@ -2716,4 +2766,60 @@ } /*}}}*/ +IssmDouble Tria::Masscon(IssmDouble* levelset){ /*{{{*/ + + + /*intermediary: */ + IssmDouble* values=NULL; + Input* thickness_input=NULL; + IssmDouble thickness; + IssmDouble weight; + IssmDouble Jdet; + IssmDouble volume; + IssmDouble rho_ice; + IssmDouble* xyz_list=NULL; + int point1; + IssmDouble fraction1,fraction2; + bool mainlynegative=true; + + /*Output:*/ + volume=0; + + /* Get node coordinates and dof list: */ + GetVerticesCoordinates(&xyz_list); + + /*Retrieve inputs required:*/ + thickness_input=this->GetInput(ThicknessEnum); _assert_(thickness_input); + + /*Retrieve material parameters: */ + rho_ice=matpar->GetRhoIce(); + + /*Retrieve values of the levelset defining the masscon: */ + values = xNew(NUMVERTICES); + for(int i=0;ivertices[i]->Sid()]; + } + + /*Ok, use the level set values to figure out where we put our gaussian points:*/ + this->GetLevelsetPositivePart(&point1,&fraction1,&fraction2,&mainlynegative,values); + Gauss* gauss = this->NewGauss(point1,fraction1,fraction2,mainlynegative,4); + + volume=0; + + for(int ig=gauss->begin();igend();ig++){ + gauss->GaussPoint(ig); + + this->JacobianDeterminant(&Jdet,xyz_list,gauss); + thickness_input->GetInputValue(&thickness, gauss); + + volume+=thickness*gauss->weight*Jdet; + } + + /* clean up and Return: */ + xDelete(xyz_list); + xDelete(values); + delete gauss; + return rho_ice*volume; +} +/*}}}*/ #ifdef _HAVE_GIA_ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 18785) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 18786) @@ -69,4 +69,5 @@ Element* GetUpperElement(void){_error_("not implemented yet");}; Element* GetBasalElement(void){_error_("not implemented yet");}; + void GetLevelsetPositivePart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlynegative,IssmDouble* levelsetvalues); void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating); IssmDouble GetGroundedPortion(IssmDouble* xyz_list); @@ -123,4 +124,5 @@ IssmDouble MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id); void ElementResponse(IssmDouble* presponse,int response_enum); + IssmDouble Masscon(IssmDouble* levelset); IssmDouble Misfit(int modelenum,int observationenum,int weightsenum); IssmDouble MisfitArea(int weightsenum); Index: /issm/trunk-jpl/src/c/classes/Masscon.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Masscon.h (revision 18786) +++ /issm/trunk-jpl/src/c/classes/Masscon.h (revision 18786) @@ -0,0 +1,105 @@ +/*!\file Masscon.h + * \brief: header file for Masscon object + */ + +#ifndef _MASSCON_H_ +#define _MASSCON_H_ + +/*Headers:*/ +/*{{{*/ +#include "./Definition.h" +#include "../datastructures/datastructures.h" +#include "./Elements/Element.h" +#include "./Elements/Elements.h" +#include "./FemModel.h" +#include "../classes/Params/Parameters.h" +/*}}}*/ + +class Masscon: public Object, public Definition{ + + public: + + char* name; + IssmDouble* levelset; + int M; + + /*Masscon constructors, destructors :*/ + Masscon(){/*{{{*/ + + this->name = NULL; + this->levelset=NULL; + this->M=0; + + } + /*}}}*/ + Masscon(char* in_name, IssmDouble* levelsetin, int Min){ /*{{{*/ + + this->name = xNew(strlen(in_name)+1); + xMemCpy(this->name,in_name,strlen(in_name)+1); + + this->levelset = xNew(Min); + xMemCpy(this->levelset, levelsetin, Min); + + this->M=Min; + + } + /*}}}*/ + ~Masscon(){/*{{{*/ + if(this->name)xDelete(this->name); + if(this->levelset)xDelete(this->levelset); + } + /*}}}*/ + /*Object virtual function resolutoin: */ + void Echo(void){/*{{{*/ + _printf_(" Masscon: " << name << "\n"); + _printf_(" levelset: " << this->levelset << "\n"); + _printf_(" M: " << this->M << "\n"); + } + /*}}}*/ + void DeepEcho(void){/*{{{*/ + this->Echo(); + } + /*}}}*/ + int Id(void){/*{{{*/ + return -1; + } + /*}}}*/ + int ObjectEnum(void){/*{{{*/ + return MassconEnum; + } + /*}}}*/ + Object* copy() {/*{{{*/ + Masscon* mf = new Masscon(this->name,this->levelset,this->M); + return (Object*) mf; + } + /*}}}*/ + /*Definition virtual function resolutoin: */ + char* Name(){/*{{{*/ + + char* name2=xNew(strlen(this->name)+1); + xMemCpy(name2,this->name,strlen(this->name)+1); + + return name2; + } + /*}}}*/ + IssmDouble Response(FemModel* femmodel){/*{{{*/ + + int i; + IssmDouble mass_t=0.; + IssmDouble all_mass_t=0.; + + + for(i=0;ielements->Size();i++){ + Element* element=(Element*)femmodel->elements->GetObjectByOffset(i); + mass_t+=element->Masscon(this->levelset); + } + + 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; + } + /*}}}*/ +}; + +#endif /* _MASSCON_H_ */ Index: /issm/trunk-jpl/src/c/classes/classes.h =================================================================== --- /issm/trunk-jpl/src/c/classes/classes.h (revision 18785) +++ /issm/trunk-jpl/src/c/classes/classes.h (revision 18786) @@ -19,4 +19,5 @@ #include "./Massfluxatgate.h" #include "./Misfit.h" +#include "./Masscon.h" /*Constraints: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (revision 18785) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (revision 18786) @@ -114,5 +114,38 @@ /*}}}*/ } + else if (output_definition_enums[i]==MassconEnum){ + /*Deal with masscons: {{{*/ + + /*masscon variables: */ + int nummasscons; + char** masscon_name_s = NULL; + IssmDouble** masscon_levelset_s = NULL; + int* masscon_levelset_M_s = NULL; + int* masscon_levelset_N_s = NULL; + /*Fetch name and levelset, etc ... (see src/m/classes/masscon.m): */ + iomodel->FetchMultipleData(&masscon_name_s,&nummasscons,MassconNameEnum); + iomodel->FetchMultipleData(&masscon_levelset_s,&masscon_levelset_M_s,&masscon_levelset_N_s,&nummasscons,MassconLevelsetEnum); + for(j=0;jAddObject(new Masscon(masscon_name_s[j],masscon_levelset_s[j],masscon_levelset_M_s[j])); + + } + + /*Free ressources:*/ + for(j=0;j(string); + matrix = masscon_levelset_s[j]; xDelete(matrix); + } + xDelete(masscon_name_s); + xDelete(masscon_levelset_s); + xDelete(masscon_levelset_M_s); + xDelete(masscon_levelset_N_s); + /*}}}*/ + } else _error_("output definition enum " << output_definition_enums[i] << "not supported yet!"); } Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18785) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 18786) @@ -491,4 +491,7 @@ ProfilerEnum, MatrixParamEnum, + MassconEnum, + MassconNameEnum, + MassconLevelsetEnum, NodeSIdEnum, VectorParamEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18785) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 18786) @@ -488,4 +488,7 @@ case ProfilerEnum : return "Profiler"; case MatrixParamEnum : return "MatrixParam"; + case MassconEnum : return "Masscon"; + case MassconNameEnum : return "MassconName"; + case MassconLevelsetEnum : return "MassconLevelset"; case NodeSIdEnum : return "NodeSId"; case VectorParamEnum : return "VectorParam"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18785) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 18786) @@ -497,4 +497,7 @@ else if (strcmp(name,"Profiler")==0) return ProfilerEnum; else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum; + else if (strcmp(name,"Masscon")==0) return MassconEnum; + else if (strcmp(name,"MassconName")==0) return MassconNameEnum; + else if (strcmp(name,"MassconLevelset")==0) return MassconLevelsetEnum; else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum; else if (strcmp(name,"VectorParam")==0) return VectorParamEnum; @@ -503,11 +506,11 @@ else if (strcmp(name,"Segment")==0) return SegmentEnum; else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; - else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; - else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; - else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; + if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; + else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; + else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; + else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; else if (strcmp(name,"StringParam")==0) return StringParamEnum; else if (strcmp(name,"Seg")==0) return SegEnum; @@ -626,11 +629,11 @@ else if (strcmp(name,"P1")==0) return P1Enum; else if (strcmp(name,"P1DG")==0) return P1DGEnum; - else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; - else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; - else if (strcmp(name,"P2")==0) return P2Enum; else stage=6; } if(stage==6){ - if (strcmp(name,"P2bubble")==0) return P2bubbleEnum; + if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; + else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; + else if (strcmp(name,"P2")==0) return P2Enum; + else if (strcmp(name,"P2bubble")==0) return P2bubbleEnum; else if (strcmp(name,"P2bubblecondensed")==0) return P2bubblecondensedEnum; else if (strcmp(name,"P2xP1")==0) return P2xP1Enum; @@ -749,11 +752,11 @@ else if (strcmp(name,"OptionCell")==0) return OptionCellEnum; else if (strcmp(name,"OptionStruct")==0) return OptionStructEnum; - else if (strcmp(name,"Cuffey")==0) return CuffeyEnum; - else if (strcmp(name,"Paterson")==0) return PatersonEnum; - else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum; + if (strcmp(name,"Cuffey")==0) return CuffeyEnum; + else if (strcmp(name,"Paterson")==0) return PatersonEnum; + else if (strcmp(name,"Arrhenius")==0) return ArrheniusEnum; + else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum; else if (strcmp(name,"TransientIslevelset")==0) return TransientIslevelsetEnum; else if (strcmp(name,"ExtrapolationVariable")==0) return ExtrapolationVariableEnum; Index: /issm/trunk-jpl/src/m/classes/masscon.m =================================================================== --- /issm/trunk-jpl/src/m/classes/masscon.m (revision 18786) +++ /issm/trunk-jpl/src/m/classes/masscon.m (revision 18786) @@ -0,0 +1,59 @@ +%MASSCON class definition +% +% Usage: +% masscon=masscon(); +% masscon=masscon('name','MassCon58',... %name of a North-East Greenland JPL MassCon +% 'levelset',level); +% +% where level is a levelset vectorial field. +% +% See also: MISFIT + +classdef masscon + properties (SetAccess=public) + %masscon + name = ''; + levelset = NaN; %levelset vectorial field which identifies the boundaries of the masscon + end + + methods + function obj = masscon(varargin) % {{{ + if nargin==0, + obj=setdefaultparameters(obj); + else + %use provided options to change fields + options=pairoptions(varargin{:}); + + %get name + obj.name=getfieldvalue(options,'name',''); + obj.levelset=getfieldvalue(options,'levelset'); + + end + end % }}} + function obj = setdefaultparameters(obj) % {{{ + end % }}} + function md = checkconsistency(obj,md,solution,analyses) % {{{ + + if ~ischar(obj.name), + error('masscon error message: ''name'' field should be a string!'); + end + + md = checkfield(md,'fieldname','obj.levelset','field',obj.levelset,'forcing',1,'NaN',1); + + end % }}} + function md = disp(obj) % {{{ + + disp(sprintf(' Misfit:\n')); + + fielddisplay(obj,'name','identifier for this masscon response'); + fielddisplay(obj,'levelset','levelset vectorial field which identifies the boundaries of the masscon'); + + end % }}} + function md = marshall(obj,md,fid) % {{{ + + WriteData(fid,'object',obj,'fieldname','name','format','String'); + WriteData(fid,'object',obj,'fieldname','levelset','format','DoubleMat','mattype',1); + + end % }}} + end +end Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 18785) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 18786) @@ -480,4 +480,7 @@ def ProfilerEnum(): return StringToEnum("Profiler")[0] def MatrixParamEnum(): return StringToEnum("MatrixParam")[0] +def MassconEnum(): return StringToEnum("Masscon")[0] +def MassconNameEnum(): return StringToEnum("MassconName")[0] +def MassconLevelsetEnum(): return StringToEnum("MassconLevelset")[0] def NodeSIdEnum(): return StringToEnum("NodeSId")[0] def VectorParamEnum(): return StringToEnum("VectorParam")[0] Index: /issm/trunk-jpl/src/m/enum/MassconEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MassconEnum.m (revision 18786) +++ /issm/trunk-jpl/src/m/enum/MassconEnum.m (revision 18786) @@ -0,0 +1,11 @@ +function macro=MassconEnum() +%MASSCONENUM - Enum of Masscon +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MassconEnum() + +macro=StringToEnum('Masscon'); Index: /issm/trunk-jpl/src/m/enum/MassconLevelsetEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MassconLevelsetEnum.m (revision 18786) +++ /issm/trunk-jpl/src/m/enum/MassconLevelsetEnum.m (revision 18786) @@ -0,0 +1,11 @@ +function macro=MassconLevelsetEnum() +%MASSCONLEVELSETENUM - Enum of MassconLevelset +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MassconLevelsetEnum() + +macro=StringToEnum('MassconLevelset'); Index: /issm/trunk-jpl/src/m/enum/MassconNameEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MassconNameEnum.m (revision 18786) +++ /issm/trunk-jpl/src/m/enum/MassconNameEnum.m (revision 18786) @@ -0,0 +1,11 @@ +function macro=MassconNameEnum() +%MASSCONNAMEENUM - Enum of MassconName +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MassconNameEnum() + +macro=StringToEnum('MassconName'); Index: /issm/trunk-jpl/src/m/exp/exp_to_levelset.m =================================================================== --- /issm/trunk-jpl/src/m/exp/exp_to_levelset.m (revision 18785) +++ /issm/trunk-jpl/src/m/exp/exp_to_levelset.m (revision 18786) @@ -23,6 +23,6 @@ cleanup=1; if cleanup, - flags=zeros(length(segments),1); - for j=1:length(segments), + flags=zeros(size(segments,1),1); + for j=1:size(segments,1), segment=segments(j,:); x1=segment(1); x2=segment(3); @@ -74,6 +74,6 @@ %cleanup: remove 0 length segments: if cleanup, - flags=zeros(length(segments),1); - for j=1:length(segments), + flags=zeros(size(segments,1),1); + for j=1:size(segments,1), segment=segments(j,:); x1=segment(1); x2=segment(3); Index: /issm/trunk-jpl/src/m/plot/applyoptions.m =================================================================== --- /issm/trunk-jpl/src/m/plot/applyoptions.m (revision 18785) +++ /issm/trunk-jpl/src/m/plot/applyoptions.m (revision 18786) @@ -427,5 +427,5 @@ end hold on,p=plot(x,y,'k.'); - markersize=getfieldvalue(options,'markersize',5); + markersize=getfieldvalue(options,'markersize',12); color=getfieldvalue(options,'cloudcolor','k'); set(p,'Color',color);