Changeset 27026

Timestamp:

05/25/22 22:57:32 (3 years ago)

Author:

Cheng Gong

Message:

ADD: independentrate in calvingtest, with the direction in the outward normal of the calving front (not the flow velocity)

Location:

issm/trunk-jpl/src

Files:

• c/analyses/LevelsetAnalysis.cpp (modified) (2 diffs)
• c/classes/Elements/Tria.cpp (modified) (2 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• m/classes/calvingtest.m (modified) (4 diffs)

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

@@ -197 +197 @@
                         break;
                 case CalvingTestEnum:
-                        iomodel->FetchData(&transparam,&N,&M,"md.calving.speedfactor");
                         iomodel->FindConstant(&interp,"md.timestepping.interp_forcing");
                         iomodel->FindConstant(&cycle,"md.timestepping.cycle_forcing");
+                        iomodel->FetchData(&transparam,&N,&M,"md.calving.speedfactor");
                         if(N==1){
                                 _assert_(M==1);
@@ -207 +207 @@
             _assert_(N==2);
             parameters->AddObject(new TransientParam(CalvingTestSpeedfactorEnum,&transparam[0],&transparam[M],interp,cycle,M));
+         }
+                        xDelete<IssmDouble>(transparam);
+                        iomodel->FetchData(&transparam,&N,&M,"md.calving.independentrate");
+                        if(N==1){
+                                _assert_(M==1);
+                                parameters->AddObject(new DoubleParam(CalvingTestIndependentRateEnum,transparam[0]));
+         }
+         else{
+            _assert_(N==2);
+            parameters->AddObject(new TransientParam(CalvingTestIndependentRateEnum,&transparam[0],&transparam[M],interp,cycle,M));
          }
                         xDelete<IssmDouble>(transparam);

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -372 +372 @@
         IssmDouble  calvingratey[NUMVERTICES];
         IssmDouble  calvingrate[NUMVERTICES];
-        IssmDouble  vx,vy;
+        IssmDouble  vx,vy,vel;
+        IssmDouble  dphidx, dphidy, dphi;
         IssmDouble  time;
-        IssmDouble  coeff;
+        IssmDouble  coeff, indrate;
 
         /*Retrieve all inputs and parameters we will need*/
         parameters->FindParam(&time,TimeEnum);
         parameters->FindParam(&coeff,CalvingTestSpeedfactorEnum,time);
+        parameters->FindParam(&indrate,CalvingTestIndependentRateEnum,time);
 
         Input* vx_input = this->GetInput(VxEnum); _assert_(vx_input);
         Input* vy_input = this->GetInput(VyEnum); _assert_(vy_input);
+        Input *lsf_slopex_input  = this->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input);
+   Input *lsf_slopey_input  = this->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input);
 
         /* Start looping on the number of vertices: */
@@ -392 +396 @@
                 vy_input->GetInputValue(&vy,&gauss);
 
-                calvingratex[iv]= coeff*vx;
-                calvingratey[iv]= coeff*vy;
+                lsf_slopex_input->GetInputValue(&dphidx,&gauss);
+      lsf_slopey_input->GetInputValue(&dphidy,&gauss);
+
+      vel=sqrt(vx*vx + vy*vy) + 1e-14;
+      dphi=sqrt(dphidx*dphidx+dphidy*dphidy)+ 1e-14;
+
+                calvingratex[iv]= coeff*vx + indrate*dphidx/dphi;
+                calvingratey[iv]= coeff*vy + indrate*dphidy/dphi;
                 calvingrate[iv] = sqrt(calvingratex[iv]*calvingratex[iv] + calvingratey[iv]*calvingratey[iv]);
-
         }
 

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

@@ -107 +107 @@
         CalvingMinthicknessEnum,
         CalvingTestSpeedfactorEnum,
+        CalvingTestIndependentRateEnum,
         CalvingUseParamEnum,
         CalvingScaleThetaEnum,

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

@@ -7 +7 @@
         properties (SetAccess=public)
                 speedfactor = 1;
+                independentrate = 0;
         end
         methods
@@ -31 +32 @@
                 function self = setdefaultparameters(self) % {{{
                         self.speedfactor = 1;
+                        self.independentrate = 0;
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -36 +38 @@
                         if (~strcmp(solution,'TransientSolution') | md.transient.ismovingfront==0), return; end
                         md = checkfield(md,'fieldname','calving.speedfactor','>=',0,'NaN',1,'Inf',1, 'singletimeseries', 1);
+                        md = checkfield(md,'fieldname','calving.independentrate','NaN',1,'Inf',1, 'singletimeseries', 1);
                 end % }}}
                 function disp(self) % {{{
                         disp(sprintf('   Calving test parameters:'));
                         fielddisplay(self,'speedfactor','calving rate is proportional to the ice velocity (e.g. speedfactor=1 -> calving front should not move)');
+                        fielddisplay(self,'independentrate','calving rate is independent of the ice velocity.');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -45 +49 @@
                         WriteData(fid,prefix,'name','md.calving.law','data',8,'format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','speedfactor','format','DoubleMat','mattype',1,'timeserieslength',2,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','independentrate','format','DoubleMat','mattype',1,'timeserieslength',2,'yts',md.constants.yts,'scale',1./yts);
                 end % }}}
         end