Changeset 14361

Timestamp:

02/21/13 12:15:07 (12 years ago)

Author:

seroussi

Message:

HCG working on GL

Location:

issm/trunk-jpl/src

Files:

• c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (modified) (1 diff)
• m/classes/groundingline.m (modified) (2 diffs)
• m/classes/groundingline.py (modified) (2 diffs)

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

@@ -15 +15 @@
 
 void    UpdateElementsTransient(Elements* elements, Parameters* parameters,IoModel* iomodel,int analysis_counter,int analysis_type){
+
+        int         isgl,migration_style;
+        int         i,numberofvertices;
+        IssmDouble  rho_ice,rho_water;
+        IssmDouble *phi   = NULL;
+
+        /*Fetch data needed*/
+        iomodel->Constant(&isgl,TransientIsgroundinglineEnum);
+        iomodel->Constant(&migration_style,GroundinglineMigrationEnum);
+
+        if(isgl==1 && migration_style==SubelementMigrationEnum){
+
+                /*get parameters and constants: */
+                parameters->FindParam(&rho_ice,MaterialsRhoIceEnum);
+                parameters->FindParam(&rho_water,MaterialsRhoWaterEnum);
+                iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
+                iomodel->FetchData(2,ThicknessEnum,BathymetryEnum);
+
+                /*Create phi vector */
+                phi=xNew<IssmDouble>(numberofvertices);
+                for (i=0;i<numberofvertices;i++){
+                        if(iomodel->my_vertices[i]){
+                                phi[i] = iomodel->Data(ThicknessEnum)[i] + rho_water/rho_ice * iomodel->Data(BathymetryEnum)[i];
+                        }
+                }
+
+                /*Update elements: */
+                for(i=0;i<elements->Size();i++){
+                        Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+                        element->InputUpdateFromVector(phi,GLlevelsetEnum,VertexEnum);
+                }
+
+                /*Free ressources:*/
+                xDelete<IssmDouble>(phi);
+        }
 }

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

@@ -29 +29 @@
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
 
-                        md = checkfield(md,'groundingline.migration','values',{'None' 'AgressiveMigration' 'SoftMigration'});
+                        md = checkfield(md,'groundingline.migration','values',{'None' 'AgressiveMigration' 'SoftMigration' 'SubelementMigration'});
+
 
                         if ~strcmp(obj.migration,'None'),
@@ -42 +43 @@
                                 if any(md.geometry.bathymetry(pos)-md.geometry.bed(pos)>10^-9),
                                         md = checkmessage(md,['bathymetry superior to bed on floating ice!']);
+                                end
+                                if strcmp(obj.migration,'SubelementMigration') & md.mesh.dimension==3,
+                                        md = checkmessage(md,['SubelementMigration only implemented in 2d!']);
                                 end
                         end

issm/trunk-jpl/src/m/classes/groundingline.py

@@ -48 +48 @@
         def checkconsistency(self,md,solution,analyses):    # {{{
 
-                md = checkfield(md,'groundingline.migration','values',['None','AgressiveMigration','SoftMigration'])
+                md = checkfield(md,'groundingline.migration','values',['None','AgressiveMigration','SoftMigration','SubelementMigration'])
 
                 if not strcmp(self.migration,'None'):
@@ -59 +59 @@
                         if any(md.geometry.bathymetry[pos]-md.geometry.bed[pos]>10**-9):
                                 md.checkmessage("bathymetry superior to bed on floating ice!")
+                        if strcmp(self.migration,'SubelementMigration'):
+                                if md.mesh.dimension==3:
+                                        md.checkmessage("SubelementMigration only implemented in 2d!")
 
                 return md