Changeset 19749

Timestamp:

11/18/15 10:45:11 (9 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added Neumann BC to Hydro model

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/analyses/HydrologySommersAnalysis.cpp (modified) (5 diffs)
• c/classes/Loads/Neumannflux.cpp (added)
• c/classes/Loads/Neumannflux.h (added)
• c/classes/classes.h (modified) (1 diff)
• c/cores/hydrology_core.cpp (modified) (1 diff)
• c/cores/transient_core.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/ModelProcessorx.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (4 diffs)
• c/shared/Enum/EnumToStringx.cpp (modified) (4 diffs)
• c/shared/Enum/StringToEnumx.cpp (modified) (10 diffs)
• m/classes/constants.m (modified) (1 diff)
• m/classes/hydrologysommers.m (modified) (4 diffs)
• m/classes/mesh2d.m (modified) (3 diffs)
• m/enum/ConstantsOmegaEnum.m (deleted)
• m/enum/EnumDefinitions.py (modified) (4 diffs)
• m/enum/HydrologyNeumannfluxEnum.m (added)
• m/enum/MeshSegmentsEnum.m (added)
• m/enum/NeumannfluxEnum.m (added)

issm/trunk-jpl/src/c/Makefile.am

@@ -71 +71 @@
                                         ./classes/Loads/Moulin.cpp\
                                         ./classes/Loads/Numericalflux.cpp\
+                                        ./classes/Loads/Neumannflux.cpp\
                                         ./classes/matrix/ElementMatrix.cpp\
                                         ./classes/matrix/ElementVector.cpp\

issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.cpp

@@ -30 +30 @@
         if(hydrology_model!=HydrologysommersEnum) return;
 
-        //create penalties for nodes: no node can have water above the max
+        /*Create discrete loads for Moulins*/
         CreateSingleNodeToElementConnectivity(iomodel);
         for(int i=0;i<iomodel->numberofvertices;i++){
@@ -46 +46 @@
         }
         iomodel->DeleteData(1,MeshVertexonbaseEnum);
+
+        /*Deal with Neumann BC*/
+        int M,N;
+        int *segments = NULL;
+        iomodel->FetchData(&segments,&M,&N,MeshSegmentsEnum);
+
+        /*Check that the size seem right*/
+        _assert_(N==3); _assert_(M>=3);
+        for(int i=0;i<M;i++){
+                if(iomodel->my_elements[segments[i*3+2]-1]){
+                        loads->AddObject(new Neumannflux(iomodel->loadcounter+i+1,i,iomodel,segments,HydrologySommersAnalysisEnum));
+                }
+        }
+
+        xDelete<int>(segments);
 
 }/*}}}*/
@@ -100 +115 @@
         iomodel->FetchDataToInput(elements,HydrologyBumpHeightEnum);
         iomodel->FetchDataToInput(elements,HydrologyReynoldsEnum);
+        iomodel->FetchDataToInput(elements,HydrologyNeumannfluxEnum);
         iomodel->FetchDataToInput(elements,VxEnum);
         iomodel->FetchDataToInput(elements,VyEnum);
@@ -260 +276 @@
                 IssmDouble pressure_ice   = rho_ice*g*thickness;    _assert_(pressure_ice>0.); 
                 IssmDouble pressure_water = rho_water*g*(head-bed);
-                _assert_(pressure_water<=pressure_ice);
+                if(pressure_water>pressure_ice) pressure_water = pressure_ice;
 
                 meltrate = 1/latentheat*(G+frictionheat+rho_water*g*conductivity*(dh[0]*dh[0]+dh[1]*dh[1]));
@@ -457 +473 @@
                 IssmDouble pressure_ice   = rho_ice*g*thickness;    _assert_(pressure_ice>0.); 
                 IssmDouble pressure_water = rho_water*g*(head-bed);
-                _assert_(pressure_water<=pressure_ice);
+                if(pressure_water>pressure_ice) pressure_water = pressure_ice;
 
                 meltrate = 1/latentheat*(G+frictionheat+rho_water*g*conductivity*(dh[0]*dh[0]+dh[1]*dh[1]));

issm/trunk-jpl/src/c/classes/classes.h

@@ -34 +34 @@
 #include "./Loads/Friction.h"
 #include "./Loads/Numericalflux.h"
+#include "./Loads/Neumannflux.h"
 #include "./Loads/Riftfront.h"
 #include "./Loads/Penpair.h"

issm/trunk-jpl/src/c/cores/hydrology_core.cpp

@@ -79 +79 @@
 
         else if (hydrology_model==HydrologysommersEnum){
-                if(VerboseSolution()) _printf0_("   computing water head\n");
                 femmodel->SetCurrentConfiguration(HydrologySommersAnalysisEnum);
                 solutionsequence_nonlinear(femmodel,modify_loads);

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -79 +79 @@
                 femmodel->parameters->SetParam(step,StepEnum);
 
-                if(VerboseSolution()) _printf0_("iteration " << step << "/" << floor((finaltime-time)/dt)+step << "  time [yr]: " << setprecision(8) << time/yts << " (time step: " << dt/yts << ")\n");
+                if(VerboseSolution()) _printf0_("iteration " << step << "/" << floor((finaltime-time)/dt)+step << "  time [yr]: " << setprecision(4) << time/yts << " (time step: " << dt/yts << ")\n");
                 if(step%output_frequency==0 || (time >= finaltime - (yts*DBL_EPSILON)) || step==1)
                  save_results=true;

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -59 +59 @@
                  * constraints, and ids for objects created in next call to CreateDataSets
                  * will need to start at the end of the updated counters: */
-                iomodel->nodecounter       = nodes->MaximumId();
+                if(nodes->Size()) iomodel->nodecounter = nodes->MaximumId();
                 iomodel->loadcounter       = loads->NumberOfLoads();
                 iomodel->constraintcounter = constraints->NumberOfConstraints();
+
+                /*Make sure nodecounter is at least 0 (if no node exists, maxid will be -1*/
+                _assert_(iomodel->nodecounter>=0);
         }
 

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -57 +57 @@
         BaseEnum,
         ConstantsGEnum,
-        ConstantsOmegaEnum,
         ConstantsReferencetemperatureEnum,
         ConstantsYtsEnum,
@@ -164 +163 @@
         HydrologyMoulinInputEnum,
         HydrologyReynoldsEnum,
+        HydrologyNeumannfluxEnum,
         HydrologySpcheadEnum,
         HydrologyConductivityEnum,
@@ -277 +277 @@
         MeshZEnum,
         MeshElementtypeEnum,
+        MeshSegmentsEnum,
         DomainTypeEnum,
         DomainDimensionEnum,
@@ -579 +580 @@
         NumericalfluxEnum,
         NumericalfluxTypeEnum,
+        NeumannfluxEnum,
         ParamEnum,
         MoulinEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -63 +63 @@
                 case BaseEnum : return "Base";
                 case ConstantsGEnum : return "ConstantsG";
-                case ConstantsOmegaEnum : return "ConstantsOmega";
                 case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature";
                 case ConstantsYtsEnum : return "ConstantsYts";
@@ -170 +169 @@
                 case HydrologyMoulinInputEnum : return "HydrologyMoulinInput";
                 case HydrologyReynoldsEnum : return "HydrologyReynolds";
+                case HydrologyNeumannfluxEnum : return "HydrologyNeumannflux";
                 case HydrologySpcheadEnum : return "HydrologySpchead";
                 case HydrologyConductivityEnum : return "HydrologyConductivity";
@@ -283 +283 @@
                 case MeshZEnum : return "MeshZ";
                 case MeshElementtypeEnum : return "MeshElementtype";
+                case MeshSegmentsEnum : return "MeshSegments";
                 case DomainTypeEnum : return "DomainType";
                 case DomainDimensionEnum : return "DomainDimension";
@@ -571 +572 @@
                 case NumericalfluxEnum : return "Numericalflux";
                 case NumericalfluxTypeEnum : return "NumericalfluxType";
+                case NeumannfluxEnum : return "Neumannflux";
                 case ParamEnum : return "Param";
                 case MoulinEnum : return "Moulin";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -63 +63 @@
               else if (strcmp(name,"Base")==0) return BaseEnum;
               else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum;
-              else if (strcmp(name,"ConstantsOmega")==0) return ConstantsOmegaEnum;
               else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum;
               else if (strcmp(name,"ConstantsYts")==0) return ConstantsYtsEnum;
@@ -137 +136 @@
               else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum;
               else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum;
+              else if (strcmp(name,"HydrologydcSpceplHead")==0) return HydrologydcSpceplHeadEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"HydrologydcSpceplHead")==0) return HydrologydcSpceplHeadEnum;
-              else if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
+              if (strcmp(name,"HydrologydcMaskEplactiveNode")==0) return HydrologydcMaskEplactiveNodeEnum;
               else if (strcmp(name,"HydrologydcMaskEplactiveElt")==0) return HydrologydcMaskEplactiveEltEnum;
               else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum;
@@ -173 +172 @@
               else if (strcmp(name,"HydrologyMoulinInput")==0) return HydrologyMoulinInputEnum;
               else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum;
+              else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum;
               else if (strcmp(name,"HydrologySpchead")==0) return HydrologySpcheadEnum;
               else if (strcmp(name,"HydrologyConductivity")==0) return HydrologyConductivityEnum;
@@ -289 +289 @@
               else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
               else if (strcmp(name,"MeshElementtype")==0) return MeshElementtypeEnum;
+              else if (strcmp(name,"MeshSegments")==0) return MeshSegmentsEnum;
               else if (strcmp(name,"DomainType")==0) return DomainTypeEnum;
               else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
@@ -382 +383 @@
               else if (strcmp(name,"SmbV")==0) return SmbVEnum;
               else if (strcmp(name,"SmbDswrf")==0) return SmbDswrfEnum;
-              else if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SmbP")==0) return SmbPEnum;
+              if (strcmp(name,"SmbDlwrf")==0) return SmbDlwrfEnum;
+              else if (strcmp(name,"SmbP")==0) return SmbPEnum;
               else if (strcmp(name,"SmbSwf")==0) return SmbSwfEnum;
               else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
@@ -505 +506 @@
               else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
               else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
-              else if (strcmp(name,"SurfaceNormalVelocity")==0) return SurfaceNormalVelocityEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
+              if (strcmp(name,"SurfaceNormalVelocity")==0) return SurfaceNormalVelocityEnum;
+              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
               else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
               else if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum;
@@ -583 +584 @@
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
               else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum;
+              else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
               else if (strcmp(name,"Param")==0) return ParamEnum;
               else if (strcmp(name,"Moulin")==0) return MoulinEnum;
@@ -627 +629 @@
               else if (strcmp(name,"Water")==0) return WaterEnum;
               else if (strcmp(name,"Closed")==0) return ClosedEnum;
-              else if (strcmp(name,"Free")==0) return FreeEnum;
-              else if (strcmp(name,"Open")==0) return OpenEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
+              if (strcmp(name,"Free")==0) return FreeEnum;
+              else if (strcmp(name,"Open")==0) return OpenEnum;
+              else if (strcmp(name,"Adjointp")==0) return AdjointpEnum;
               else if (strcmp(name,"Adjointx")==0) return AdjointxEnum;
               else if (strcmp(name,"Adjointy")==0) return AdjointyEnum;
@@ -750 +752 @@
               else if (strcmp(name,"OneLayerP4z")==0) return OneLayerP4zEnum;
               else if (strcmp(name,"CrouzeixRaviart")==0) return CrouzeixRaviartEnum;
-              else if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum;
-              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
+              if (strcmp(name,"LACrouzeixRaviart")==0) return LACrouzeixRaviartEnum;
+              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
+              else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
               else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
               else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
@@ -873 +875 @@
               else if (strcmp(name,"MisfitDefinitionenum")==0) return MisfitDefinitionenumEnum;
               else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
-              else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
-              else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"MisfitLocal")==0) return MisfitLocalEnum;
+              if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
+              else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
+              else if (strcmp(name,"MisfitLocal")==0) return MisfitLocalEnum;
               else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
               else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;

issm/trunk-jpl/src/m/classes/constants.m

@@ -61 +61 @@
                 function marshall(self,md,fid) % {{{
                         WriteData(fid,'object',self,'fieldname','g','format','Double');
-                        WriteData(fid,'object',self,'fieldname','omega','format','Double');
                         WriteData(fid,'object',self,'fieldname','yts','format','Double');
                         WriteData(fid,'object',self,'fieldname','referencetemperature','format','Double');

issm/trunk-jpl/src/m/classes/hydrologysommers.m

@@ -14 +14 @@
                 reynolds        = NaN;
                 spchead         = NaN;
+                neumannflux     = NaN;
         end
         methods
-                function self = extrude(self,md) % {{{
+                function self = extrud,e(self,md) % {{{
                 end % }}}
                 function self = hydrologysommers(varargin) % {{{
@@ -44 +45 @@
                         md = checkfield(md,'fieldname','hydrology.moulin_input','>=',0,'NaN',1,'timeseries',1);
                         md = checkfield(md,'fieldname','hydrology.reynolds','>',0,'size',[md.mesh.numberofelements 1],'NaN',1);
+                        md = checkfield(md,'fieldname','hydrology.neumannflux','timeseries',1,'NaN',1);
                         md = checkfield(md,'fieldname','hydrology.spchead','size',[md.mesh.numberofvertices 1]);
                 end % }}}
@@ -55 +57 @@
                         fielddisplay(self,'moulin_input','liquid water input from moulins (at the vertices) to subglacial system (m^3/s)');
                         fielddisplay(self,'reynolds','Reynolds'' number');
+                        fielddisplay(self,'neumannflux','water flux applied along the model boundary (m^2/s)');
                         fielddisplay(self,'spchead','water head constraints (NaN means no constraint) (m)');
                 end % }}}
@@ -69 +72 @@
                         WriteData(fid,'object',self,'class','hydrology','fieldname','moulin_input','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
                         WriteData(fid,'object',self,'class','hydrology','fieldname','reynolds','format','DoubleMat','mattype',2);
+                        WriteData(fid,'object',self,'class','hydrology','fieldname','neumannflux','format','DoubleMat','mattype',2,'timeserieslength',md.mesh.numberofelements+1);
                         WriteData(fid,'object',self,'class','hydrology','fieldname','spchead','format','DoubleMat','mattype',1);
                 end % }}}

issm/trunk-jpl/src/m/classes/mesh2d.m

@@ -91 +91 @@
                         md = checkfield(md,'fieldname','mesh.numberofvertices','>',0);
                         md = checkfield(md,'fieldname','mesh.average_vertex_connectivity','>=',9,'message','''mesh.average_vertex_connectivity'' should be at least 9 in 2d');
+                        md = checkfield(md,'fieldname','mesh.segments','NaN',1,'>',0,'size',[NaN 3]);
 
                         switch(solution),
@@ -126 +127 @@
                         fielddisplay(self,'epsg','EPSG code (ex: 3413 for UPS Greenland, 3031 for UPS Antarctica)');
                 end % }}}
-                function createxml(self,fid) % {{{
-                        fprintf(fid, '<!-- 2D tria Mesh (horizontal) -->\n');
-
-                        %elements and vertices
-                        fprintf(fid,'%s\n%s\n%s\n','<frame key="1" label="Elements and vertices">','<section name="mesh" />');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','  <parameter key ="numberofelements" type="',class(self.numberofelements),'" default="',convert2str(self.numberofelements),'">','     <section name="mesh" />','     <help> number of elements </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','  <parameter key ="numberofvertices" type="',class(self.numberofvertices),'" default="',convert2str(self.numberofvertices),'">','     <section name="mesh" />','     <help> number of vertices </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','  <parameter key ="elements" type="',class(self.elements),'" default="',convert2str(self.elements),'">','     <section name="mesh" />','     <help> vertex indices of the mesh elements </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="x" type="',class(self.x),'" default="',convert2str(self.x),'">','     <section name="mesh" />','     <help> vertices x coordinate [m] </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="y" type="',class(self.y),'" default="',convert2str(self.y),'">','     <section name="mesh" />','     <help> vertices y coordinate [m] </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="edges" type="',class(self.edges),'" default="',convert2str(self.edges),'">','     <section name="mesh" />','     <help> edges of the 2d mesh (vertex1 vertex2 element1 element2) </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="numberofedges" type="',class(self.numberofedges),'" default="',convert2str(self.numberofedges),'">','     <section name="mesh" />','     <help> number of edges of the 2d mesh </help>','  </parameter>');
-                        fprintf(fid,'%s\n%s\n','</frame>');
-
-                        % properties
-                        fprintf(fid,'%s\n%s\n%s\n','<frame key="2" label="Properties">','<section name="mesh" />');             
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="vertexonboundary" type="',class(self.vertexonboundary),'" default="',convert2str(self.vertexonboundary),'">','     <section name="mesh" />','     <help> vertices on the boundary of the domain flag list </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="segments" type="',class(self.segments),'" default="',convert2str(self.segments),'">','     <section name="mesh" />','     <help> edges on domain boundary (vertex1 vertex2 element) </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="segmentmarkers" type="',class(self.segmentmarkers),'" default="',convert2str(self.segmentmarkers),'">','     <section name="mesh" />','     <help> number associated to each segment </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="vertexconnectivity" type="',class(self.vertexconnectivity),'" default="',convert2str(self.vertexconnectivity),'">','     <section name="mesh" />','     <help> list of vertices connected to vertex_i </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="elementconnectivity" type="',class(self.elementconnectivity),'" default="',convert2str(self.elementconnectivity),'">','     <section name="mesh" />','     <help> list of vertices connected to element_i </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="average_vertex_connectivity" type="',class(self.average_vertex_connectivity),'" default="',convert2str(self.average_vertex_connectivity),'">','     <section name="mesh" />','     <help> average number of vertices connected to one vertex </help>','  </parameter>');
-                        fprintf(fid,'%s\n%s\n','</frame>');
-
-                        %extracted model
-                        fprintf(fid,'%s\n%s\n%s\n','<frame key="3" label="Extracted Model">','<section name="mesh" />'); 
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="extractedvertices" type="',class(self.extractedvertices),'" default="',convert2str(self.extractedvertices),'">','     <section name="mesh" />','     <help> vertices extracted from the model </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="extractedelements" type="',class(self.extractedelements),'" default="',convert2str(self.extractedelements),'">','     <section name="mesh" />','     <help> elements extracted from the model </help>','  </parameter>');
-                        fprintf(fid,'%s\n%s\n','</frame>');
-
-                        %projection
-                        fprintf(fid,'%s\n%s\n%s\n','<frame key="4" label="Projection">','<section name="mesh" />'); 
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="lat" type="',class(self.lat),'" default="',convert2str(self.lat),'">','     <section name="mesh" />','     <help> vertices latitude [degrees] </help>','  </parameter>');
-                        fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="long" type="',class(self.long),'" default="',convert2str(self.long),'">','     <section name="mesh" />','     <help> verticies longitude [degrees] </help>','  </parameter>');
-                        % choice (epsg) 'n' or 's'
-                        fprintf(fid,'%s\n%s\n%s\n','  <parameter key ="epsg" type="alternative" optional="false">','     <section name="mesh" />','     <help> Indicate epsg ''n'' or ''s'' </help>');
-                        fprintf(fid,'%s\n','       <option value="n" type="string" default="true"> </option>');
-                        fprintf(fid,'%s\n','       <option value="s" type="string" default="false"> </option>');
-                        fprintf(fid,'%s\n','  </parameter>');
-                        fprintf(fid,'%s\n%s\n','</frame>');
-
-                end % }}}
                 function marshall(self,md,fid) % {{{
                         WriteData(fid,'enum',DomainTypeEnum(),'data',StringToEnum(['Domain' domaintype(self)]),'format','Integer');
@@ -180 +139 @@
                         WriteData(fid,'object',self,'class','mesh','fieldname','average_vertex_connectivity','format','Integer');
                         WriteData(fid,'object',self,'class','mesh','fieldname','vertexonboundary','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',self,'class','mesh','fieldname','segments','format','DoubleMat','mattype',3);
                 end % }}}
                 function t = domaintype(self) % {{{

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -55 +55 @@
 def BaseEnum(): return StringToEnum("Base")[0]
 def ConstantsGEnum(): return StringToEnum("ConstantsG")[0]
-def ConstantsOmegaEnum(): return StringToEnum("ConstantsOmega")[0]
 def ConstantsReferencetemperatureEnum(): return StringToEnum("ConstantsReferencetemperature")[0]
 def ConstantsYtsEnum(): return StringToEnum("ConstantsYts")[0]
@@ -162 +161 @@
 def HydrologyMoulinInputEnum(): return StringToEnum("HydrologyMoulinInput")[0]
 def HydrologyReynoldsEnum(): return StringToEnum("HydrologyReynolds")[0]
+def HydrologyNeumannfluxEnum(): return StringToEnum("HydrologyNeumannflux")[0]
 def HydrologySpcheadEnum(): return StringToEnum("HydrologySpchead")[0]
 def HydrologyConductivityEnum(): return StringToEnum("HydrologyConductivity")[0]
@@ -275 +275 @@
 def MeshZEnum(): return StringToEnum("MeshZ")[0]
 def MeshElementtypeEnum(): return StringToEnum("MeshElementtype")[0]
+def MeshSegmentsEnum(): return StringToEnum("MeshSegments")[0]
 def DomainTypeEnum(): return StringToEnum("DomainType")[0]
 def DomainDimensionEnum(): return StringToEnum("DomainDimension")[0]
@@ -563 +564 @@
 def NumericalfluxEnum(): return StringToEnum("Numericalflux")[0]
 def NumericalfluxTypeEnum(): return StringToEnum("NumericalfluxType")[0]
+def NeumannfluxEnum(): return StringToEnum("Neumannflux")[0]
 def ParamEnum(): return StringToEnum("Param")[0]
 def MoulinEnum(): return StringToEnum("Moulin")[0]