Changeset 10377 for issm/trunk

Timestamp:

10/31/11 14:39:39 (13 years ago)

Author:

seroussi

Message:

removed shelf sync

Location:

issm/trunk/src/c

Files:

• modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (6 diffs)
• modules/GroundinglineMigrationx/GroundinglineMigrationx.h (modified) (1 diff)
• objects/Elements/Element.h (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (2 diffs)
• objects/Elements/Penta.h (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (4 diffs)
• objects/Elements/Tria.h (modified) (1 diff)

issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

@@ -13 +13 @@
 void GroundinglineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
 
-        int      i, migration_style;
+        int      i, migration_style,analysis_type;
         double*  vertices_potentially_ungrounding = NULL;
         double*  vertices_ungrounding             = NULL;
+        double*  old_floatingice                  = NULL;
         Element* element                          = NULL;
         
@@ -22 +23 @@
         /*retrieve parameters: */
         parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
+        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+
         if(migration_style==NoneEnum) return;
         if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum) _error_("%s not supported yet!",EnumToStringx(migration_style));
@@ -33 +36 @@
         }
 
+        /*Create vector with vertices initially floating*/
+        old_floatingice=CreateNodesOnIceShelf(nodes,analysis_type);
+
         /*Migrate grounding line : */
         for(i=0;i<elements->Size();i++){
                 element=(Element*)elements->GetObjectByOffset(i);
-                element->MigrateGroundingLine(vertices_ungrounding);
-        }
-
-        /*Synchronise mask: */
-        for(i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
-                element->ShelfSync();
+                element->MigrateGroundingLine(old_floatingice,vertices_ungrounding);
         }
 
@@ -48 +48 @@
         xfree((void**)&vertices_potentially_ungrounding);
         xfree((void**)&vertices_ungrounding);
+        xfree((void**)&old_floatingice);
 }
 /*FUNCTION PotentialSheetUngrounding {{{1*/
@@ -67 +68 @@
         }
 
-        /*Assemble vector: */
+        /*Assemble vector and serialize */
         VecAssemblyBegin(vec_vertices_potentially_ungrounding);
         VecAssemblyEnd(vec_vertices_potentially_ungrounding);
-
-        /*Serialize vector: */
         VecToMPISerial(&vertices_potentially_ungrounding,vec_vertices_potentially_ungrounding);
 
@@ -162 +161 @@
 }
 /*}}}*/
+/*FUNCTION CreateNodesOnIceShelf {{{1*/
+double* CreateNodesOnIceShelf(Nodes* nodes,int configuration_type){ 
+
+        int     i,numnods;
+        double* nodes_on_floatingice  = NULL;
+        Vec     vec_nodes_on_iceshelf = NULL;
+        Node*   node                  = NULL;
+
+        /*First, initialize nodes_on_iceshelf, which will track which nodes have changed status: */
+        numnods=nodes->NumberOfNodes(configuration_type);
+        vec_nodes_on_iceshelf=NewVec(numnods);
+
+        /*Loop through nodes, and fill vec_nodes_on_iceshelf: */
+        for(i=0;i<nodes->Size();i++){
+                node=(Node*)nodes->GetObjectByOffset(i);
+                if(node->InAnalysis(configuration_type)){
+                        if(node->IsFloating()){
+                                VecSetValue(vec_nodes_on_iceshelf,node->Sid(),1.0,INSERT_VALUES);
+                        }
+                }
+        }
+
+        /*Assemble vector: */
+        VecAssemblyBegin(vec_nodes_on_iceshelf);
+        VecAssemblyEnd(vec_nodes_on_iceshelf);
+        VecToMPISerial(&nodes_on_floatingice,vec_nodes_on_iceshelf);
+
+        /*Free ressources*/
+        VecFree(&vec_nodes_on_iceshelf);
+
+        return nodes_on_floatingice;
+}
+/*%}}}*/

issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.h

@@ -15 +15 @@
 double*    PotentialSheetUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters);
 double*    PropagateFloatingiceToGrounded(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,double* vertices_potentially_ungrounding);
+double*    CreateNodesOnIceShelf(Nodes* nodes,int configuration_type);
 #endif  /* _GROUNDINGLINEMIGRATIONX_H */

issm/trunk/src/c/objects/Elements/Element.h

@@ -65 +65 @@
                 virtual int*   GetHorizontalNeighboorSids(void)=0;
                 virtual double TimeAdapt()=0;
-                virtual void   MigrateGroundingLine(double* sheet_ungrounding)=0;
-                virtual void   ShelfSync()=0;
+                virtual void   MigrateGroundingLine(double* old_floating_ice,double* sheet_ungrounding)=0;
                 virtual void   PotentialSheetUngrounding(Vec potential_sheet_ungrounding)=0;
                 virtual int    UpdatePotentialSheetUngrounding(double* potential_sheet_ungrounding,Vec vec_nodes_on_iceshelf,double* nodes_on_iceshelf)=0;

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -304 +304 @@
 void  Penta::AverageOntoPartition(Vec partition_contributions,Vec partition_areas,double* vertex_response,double* qmu_part){
         _error_("Not supported yet!");
-}
-/*}}}*/
-/*FUNCTION Penta::ShelfSync{{{1*/
-void  Penta::ShelfSync(void){
-        _error_("not supported yet!");
 }
 /*}}}*/
@@ -2042 +2037 @@
 }/*}}}*/
 /*FUNCTION Penta::MigrateGroundingLine{{{1*/
-void  Penta::MigrateGroundingLine(double* sheet_ungrounding){
+void  Penta::MigrateGroundingLine(double* old_floating_ice,double* sheet_ungrounding){
         _error_("not supported yet!");
 }

issm/trunk/src/c/objects/Elements/Penta.h

@@ -103 +103 @@
                 
                 void   InputToResult(int enum_type,int step,double time);
-                void   MigrateGroundingLine(double* sheet_ungrounding);
+                void   MigrateGroundingLine(double* old_floating_ice,double* sheet_ungrounding);
                 void   PotentialSheetUngrounding(Vec potential_sheet_ungrounding);
-                void   ShelfSync();
                 void   RequestedOutput(int output_enum,int step,double time);
                 void   ListResultsEnums(int** results_enums,int* num_results);

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -1923 +1923 @@
 }/*}}}*/
 /*FUNCTION Tria::MigrateGroundingLine{{{1*/
-void  Tria::MigrateGroundingLine(double* sheet_ungrounding){
+void  Tria::MigrateGroundingLine(double* old_floating_ice,double* sheet_ungrounding){
 
         int     i,migration_style,unground;
         bool    elementonshelf = false;
-        double  bed_hydro;
+        double  bed_hydro,yts,gl_melting_rate;
         double  rho_water,rho_ice,density;
+        double  melting[NUMVERTICES];
         double  h[NUMVERTICES],s[NUMVERTICES],b[NUMVERTICES],ba[NUMVERTICES];
 
         /*Recover info at the vertices: */
         parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
+        parameters->FindParam(&yts,ConstantsYtsEnum);
         GetInputListOnVertices(&h[0],ThicknessEnum);
         GetInputListOnVertices(&s[0],SurfaceEnum);
@@ -1944 +1946 @@
         for(i=0;i<NUMVERTICES;i++){
                 /*Ice shelf: if bed below bathymetry, impose it at the bathymetry and update surface, elso do nothing */
-                if (nodes[i]->IsFloating()){
+                if(old_floating_ice[nodes[i]->Sid()]){
                         if(b[i]<=ba[i]){ 
                                 b[i]=ba[i];
                                 s[i]=b[i]+h[i];
+                                nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,false));
+                                nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,true));
                         }
                 }
@@ -1959 +1963 @@
                                         s[i]=(1-density)*h[i];
                                         b[i]=-density*h[i];
+                                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true));
+                                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
                                 }
                                 else if(migration_style==SoftMigrationEnum && sheet_ungrounding[nodes[i]->Sid()]){
                                         s[i]=(1-density)*h[i];
                                         b[i]=-density*h[i];
+                                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true));
+                                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
                                 }
                         }
                 }
         }
+
+        /*If at least one vertex is now floating, the element is now floating*/
+        for(i=0;i<NUMVERTICES;i++){
+                if(nodes[i]->IsFloating()){
+                        elementonshelf=true;
+                        break;
+                }
+        }
+        
+   /*Add basal melting rate if element just ungrounded*/
+        if(!this->IsFloating() && elementonshelf==true){
+                for(i=0;i<NUMVERTICES;i++)melting[i]=gl_melting_rate/yts;
+                this->inputs->AddInput(new TriaVertexInput(BasalforcingsMeltingRateEnum,&melting[0]));
+        } 
+
+        /*Update inputs*/
+   this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,elementonshelf));
 
         /*Update inputs*/    
@@ -2108 +2133 @@
         else this->nodes=NULL;
 
-}
-/*}}}*/
-/*FUNCTION Tria::ShelfSync{{{1*/
-void  Tria::ShelfSync(void){
-
-        int     i;
-        bool    elementonshelf = false;
-        double  bed_hydro,gl_melting_rate;
-        double  yts,rho_water,rho_ice,density;
-        double  melting[NUMVERTICES];
-        double  h[NUMVERTICES],s[NUMVERTICES],b[NUMVERTICES],ba[NUMVERTICES];
-
-        /*recover parameters: */
-        parameters->FindParam(&yts,ConstantsYtsEnum);
-        parameters->FindParam(&gl_melting_rate,GroundinglineMeltingRateEnum);
-        rho_water=matpar->GetRhoWater();
-        rho_ice=matpar->GetRhoIce();
-        density=rho_ice/rho_water;
-
-        /*Recover info at the vertices: */
-        GetInputListOnVertices(&h[0],ThicknessEnum);
-        GetInputListOnVertices(&s[0],SurfaceEnum);
-        GetInputListOnVertices(&b[0],BedEnum);
-        GetInputListOnVertices(&ba[0],BathymetryEnum);
-
-        /*go through vertices, and update inputs, considering them to be TriaVertex type: */
-        for(i=0;i<NUMVERTICES;i++){
-                if(b[i]==ba[i]){
-                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,false));
-                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,true));
-                }
-                else{
-                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true));
-                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
-                }
-        }
-
-        /*If at least one vertex is now floating, the element is an iceshelf*/
-        for(i=0;i<NUMVERTICES;i++){
-                if(nodes[i]->IsFloating()){
-                        elementonshelf=true;
-                        break;
-                }
-        }
-        
-   /*Add basal melting rate if element just ungrounded*/
-        if(!this->IsFloating() && elementonshelf==true){
-                for(i=0;i<NUMVERTICES;i++)melting[i]=gl_melting_rate/yts;
-                this->inputs->AddInput(new TriaVertexInput(BasalforcingsMeltingRateEnum,&melting[0]));
-        } 
-
-        /*Update inputs*/
-   this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,elementonshelf));
 }
 /*}}}*/

issm/trunk/src/c/objects/Elements/Tria.h

@@ -102 +102 @@
                 void   DeleteResults(void);
                 void   MaterialUpdateFromTemperature(void){_error_("not implemented yet");};
-                void   MigrateGroundingLine(double* sheet_ungrounding);
-                void   ShelfSync();
+                void   MigrateGroundingLine(double* oldfloating,double* sheet_ungrounding);
                 void   PotentialSheetUngrounding(Vec potential_sheet_ungrounding);
                 void   RequestedOutput(int output_enum,int step,double time);