Changeset 26965

Timestamp:

04/22/22 08:37:19 (3 years ago)

Author:

Cheng Gong

Message:

CHG: killberg for element that is not connected to fully grounded elements and add reinitialization after kill icebergs

Location:

issm/trunk-jpl/src

Files:

• c/cores/movingfront_core.cpp (modified) (2 diffs)
• c/modules/KillIcebergsx/KillIcebergsx.cpp (modified) (3 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• m/parameterization/killberg.m (modified) (1 diff)

issm/trunk-jpl/src/c/cores/movingfront_core.cpp ¶

@@ -16 +16 @@
 
         /* intermediaries */
-        bool save_results,isstressbalance,ismasstransport,isthermal,isenthalpy,islevelset,ismovingfront,killicebergs;
+        bool save_results,isstressbalance,ismasstransport,isthermal,isenthalpy,islevelset,ismovingfront,killicebergs,haskillberg;
         int  domaintype, num_extrapol_vars, index,reinit_frequency,step;
         int* extrapol_vars=NULL;
@@ -122 +122 @@
                 if(VerboseSolution()) _printf0_("   looking for icebergs to kill\n");
                 KillIcebergsx(femmodel);
+                femmodel->parameters->FindParam(&haskillberg,LevelsetHasKillIcebergsEnum);
+                if (haskillberg) {
+                        if(VerboseSolution()) _printf0_("   reinitializing level set after killing icebergs\n");
+                        femmodel->ResetLevelset();
+                        ResetBoundaryConditions(femmodel,LevelsetAnalysisEnum);
+                }
         }
 

issm/trunk-jpl/src/c/modules/KillIcebergsx/KillIcebergsx.cpp ¶

@@ -28 +28 @@
                 }
                 else{
-                        if(element->IsGrounded()){
+                        if(element->IsAllGrounded()){
                                 int numvertices = element->GetNumberOfVertices();
                                 for(int v=0;v<numvertices;v++) local_mask[element->vertices[v]->Lid()] = 1.;
@@ -99 +99 @@
         xDelete<bool>(element_flag);
 
+        bool killbergReinit = false;
         /*OK, now deactivate iceberg and count the number of deactivated vertices*/
         for(Object* & object : femmodel->elements->objects){
@@ -120 +121 @@
                                 element->AddInput(MaskIceLevelsetEnum,values,P1Enum);
                                 xDelete<IssmDouble>(values);
+                                killbergReinit = true;
                         }
                 }
         }
+        /*Recompute the sign distance for the levelset function*/
+   femmodel->parameters->SetParam(killbergReinit,LevelsetHasKillIcebergsEnum);
 
         /*cleanup*/

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

@@ -270 +270 @@
         LevelsetReinitFrequencyEnum,
         LevelsetStabilizationEnum,
+        LevelsetHasKillIcebergsEnum,
         LockFileNameEnum,
         LoveAllowLayerDeletionEnum,

issm/trunk-jpl/src/m/parameterization/killberg.m ¶

@@ -25 +25 @@
 %do not go through elements that are grounded, mark flag as 1 (done) need at least 2 vertices!
 %and initialize mask as 1 for all vertices of these elements
-isgrounded=(sum(md.mask.ocean_levelset(md.mesh.elements)>0,2)>1);
+isgrounded=(sum(md.mask.ocean_levelset(md.mesh.elements)>0,2)>2);
 %isgrounded = max(md.mask.ocean_levelset(md.mesh.elements),[],2)>0;
 pos = find(isgrounded);