Changeset 27280

Timestamp:

09/13/22 12:54:42 (3 years ago)

Author:

Cheng Gong

Message:

CHG: add linear relationship in calving parameterization using normalized vel

Location:

issm/trunk-jpl/src

Files:

• c/classes/Elements/Tria.cpp (modified) (2 diffs)
• m/classes/calvingparameterization.m (modified) (2 diffs)

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

@@ -910 +910 @@
                         case 0:
                                 /* 0 Linear: f(x) = y_{o} + \alpha (x+x_{o}) */
-                                gamma = yoffset = alpha * (bed+xoffset);
+                                gamma = yoffset + alpha * (bed+xoffset);
                                 break;
                         case 1:
@@ -927 +927 @@
                                 /* 4 tanh(normal vel), cross (0,0): f(x)=y_{o}-\frac{\theta}{2}\tanh(\alpha(x+x_{o})) */
                                 gamma = 0.5*theta*(tanh(alpha*xoffset) - tanh(alpha*(truncateVrate+xoffset)));
+                                break;
+                        case 5:
+                                /* 5 Linear: f(x) = y_{o} + \alpha (x+x_{o}) */
+                                gamma = yoffset + alpha * (truncateVrate+xoffset);
                                 break;
                         case -1:

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

@@ -63 +63 @@
 
                         md = checkfield(md,'fieldname','calving.min_thickness','>=',0,'NaN',1,'Inf',1,'numel',1);
-                        md = checkfield(md,'fieldname','calving.use_param','values',[-1, 0, 1, 2, 3, 4]);
+                        md = checkfield(md,'fieldname','calving.use_param','values',[-1, 0, 1, 2, 3, 4, 5]);
                         md = checkfield(md,'fieldname','calving.theta','NaN',1,'Inf',1,'numel',1);
                         md = checkfield(md,'fieldname','calving.alpha','NaN',1,'Inf',1,'numel',1);
@@ -75 +75 @@
                         disp(sprintf('   Calving test parameters:'));
                         fielddisplay(self,'min_thickness','minimum thickness below which no ice is allowed [m]');
-                        fielddisplay(self,'use_param','-1 - just use frontal ablation rate, 0 - f(x) = y_{o} + \alpha (x+x_{o}), 1 - f(x)=y_{o}-\frac{\theta}{2}\tanh(\alpha(x+x_{o})), 2 - tanh(thickness), 3 - tanh(normalized vel), 4 - tanh(truncated vel)');
+                        fielddisplay(self,'use_param','-1 - just use frontal ablation rate, 0 - f(x) = y_{o} + \alpha (x+x_{o}), 1 - f(x)=y_{o}-\frac{\theta}{2}\tanh(\alpha(x+x_{o})), 2 - tanh(thickness), 3 - tanh(normalized vel), 4 - tanh(truncated vel), 5 - linear(truncated vel)');
                         fielddisplay(self,'theta','the amplifier');
                         fielddisplay(self,'alpha','the slope');