Changeset 27323

Timestamp:

10/24/22 06:14:57 (2 years ago)

Author:

rueckamp

Message:

CHG: some minor fixes for debris stuff

Location:

issm/trunk-jpl/src

Files:

• c/analyses/SmbAnalysis.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• c/shared/Enum/EnumToStringx.cpp (modified) (2 diffs)
• c/shared/Enum/StringToEnumx.cpp (modified) (6 diffs)
• m/classes/SMBdebrisML.m (modified) (2 diffs)
• m/classes/debris.m (modified) (1 diff)
• m/classes/model.m (modified) (5 diffs)

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

@@ -218 +218 @@
                         iomodel->FetchDataToInput(inputs,elements,"md.smb.dailytemperature",SmbDailytemperatureEnum);
                         break;
+                case SMBdebrisMLEnum:
+                        iomodel->FetchDataToInput(inputs,elements,"md.initialization.debris",DebrisThicknessEnum);
+                        break;
                 default:
                         _error_("Surface mass balance model "<<EnumToStringx(smb_model)<<" not supported yet");

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

@@ -168 +168 @@
         DebrisPackingFractionEnum,
         DebugProfilingEnum,
-        DebrisThicknessEnum,
         DomainDimensionEnum,
         DomainTypeEnum,
@@ -720 +719 @@
         DamageDbarOldEnum,
         DamageFEnum,
+        DebrisThicknessEnum,
         DegreeOfChannelizationEnum,
         DepthBelowSurfaceEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -176 +176 @@
                 case DebrisPackingFractionEnum : return "DebrisPackingFraction";
                 case DebugProfilingEnum : return "DebugProfiling";
-                case DebrisThicknessEnum : return "DebrisThickness";
                 case DomainDimensionEnum : return "DomainDimension";
                 case DomainTypeEnum : return "DomainType";
@@ -726 +725 @@
                 case DamageDbarOldEnum : return "DamageDbarOld";
                 case DamageFEnum : return "DamageF";
+                case DebrisThicknessEnum : return "DebrisThickness";
                 case DegreeOfChannelizationEnum : return "DegreeOfChannelization";
                 case DepthBelowSurfaceEnum : return "DepthBelowSurface";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -179 +179 @@
               else if (strcmp(name,"DebrisPackingFraction")==0) return DebrisPackingFractionEnum;
               else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
-              else if (strcmp(name,"DebrisThickness")==0) return DebrisThicknessEnum;
               else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
               else if (strcmp(name,"DomainType")==0) return DomainTypeEnum;
@@ -260 +259 @@
               else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum;
               else if (strcmp(name,"HydrologydcIsefficientlayer")==0) return HydrologydcIsefficientlayerEnum;
+              else if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"HydrologydcLeakageFactor")==0) return HydrologydcLeakageFactorEnum;
-              else if (strcmp(name,"HydrologydcMaxIter")==0) return HydrologydcMaxIterEnum;
+              if (strcmp(name,"HydrologydcMaxIter")==0) return HydrologydcMaxIterEnum;
               else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
               else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
@@ -383 +382 @@
               else if (strcmp(name,"OceanGridY")==0) return OceanGridYEnum;
               else if (strcmp(name,"OutputBufferPointer")==0) return OutputBufferPointerEnum;
+              else if (strcmp(name,"OutputBufferSizePointer")==0) return OutputBufferSizePointerEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"OutputBufferSizePointer")==0) return OutputBufferSizePointerEnum;
-              else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
+              if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
               else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
               else if (strcmp(name,"Outputdefinition")==0) return OutputdefinitionEnum;
@@ -506 +505 @@
               else if (strcmp(name,"SmbAccugrad")==0) return SmbAccugradEnum;
               else if (strcmp(name,"SmbAccuref")==0) return SmbAccurefEnum;
+              else if (strcmp(name,"SmbAdThresh")==0) return SmbAdThreshEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"SmbAdThresh")==0) return SmbAdThreshEnum;
-              else if (strcmp(name,"SmbARMATimestep")==0) return SmbARMATimestepEnum;
+              if (strcmp(name,"SmbARMATimestep")==0) return SmbARMATimestepEnum;
               else if (strcmp(name,"SmbARMAarOrder")==0) return SmbARMAarOrderEnum;
               else if (strcmp(name,"SmbARMAmaOrder")==0) return SmbARMAmaOrderEnum;
@@ -629 +628 @@
               else if (strcmp(name,"TransientIsdebris")==0) return TransientIsdebrisEnum;
               else if (strcmp(name,"TransientIsesa")==0) return TransientIsesaEnum;
+              else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum;
-              else if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
+              if (strcmp(name,"TransientIsgroundingline")==0) return TransientIsgroundinglineEnum;
               else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum;
               else if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum;
@@ -741 +740 @@
               else if (strcmp(name,"DamageDbarOld")==0) return DamageDbarOldEnum;
               else if (strcmp(name,"DamageF")==0) return DamageFEnum;
+              else if (strcmp(name,"DebrisThickness")==0) return DebrisThicknessEnum;
               else if (strcmp(name,"DegreeOfChannelization")==0) return DegreeOfChannelizationEnum;
               else if (strcmp(name,"DepthBelowSurface")==0) return DepthBelowSurfaceEnum;

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

@@ -1 @@
-%SMBdebriscover Class definition
+%SMBdebrisML Class definition
 %
 %   Usage:
-%      SMBdebriscover=SMBdebriscover();
+%      SMBdebrisML=SMBdebrisML();
 
-classdef SMBdebriscover
+classdef SMBdebrisML
         properties (SetAccess=public)
                 steps_per_step=1;
@@ -16 +16 @@
                                 case 1
                                         inputstruct=varargin{1};
-                                        list1 = properties('SMBdebriscover');
+                                        list1 = properties('SMBdebrisML');
                                                 list2 = fieldnames(inputstruct);
                                                 for i=1:length(list1)

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

@@ -117 +117 @@
                 function disp(self) % {{{
                         disp(sprintf('   Debris solution parameters:'));
-                        fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]');
-                        fielddisplay(self,'min_thickness','minimum ice thickness allowed [m]');
+                        fielddisplay(self,'spcthickness','debris thickness constraints (NaN means no constraint) [m]');
+                        fielddisplay(self,'min_thickness','minimum debris thickness allowed [m]');
                         fielddisplay(self,'packingfraction','fraction of debris covered in the ice');
                         fielddisplay(self,'stabilization','0: no stabilization, 1: artificial diffusion, 2: streamline upwinding, 3: streamline upwind Petrov-Galerkin (SUPG)');

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

@@ -35 +35 @@
                 groundingline    = 0;
                 hydrology        = 0;
+                debris           = 0;
                 masstransport    = 0;
                 thermal          = 0;
@@ -235 +236 @@
                         disp(sprintf('%19s: %-22s -- %s','groundingline'   ,['[1x1 ' class(self.groundingline) ']'],'parameters for groundingline solution'));
                         disp(sprintf('%19s: %-22s -- %s','hydrology'       ,['[1x1 ' class(self.hydrology) ']'],'parameters for hydrology solution'));
+                        disp(sprintf('%19s: %-22s -- %s','debris'          ,['[1x1 ' class(self.debris) ']'],'parameters for debris solution'));
                         disp(sprintf('%19s: %-22s -- %s','masstransport'   ,['[1x1 ' class(self.masstransport) ']'],'parameters for masstransport solution'));
                         disp(sprintf('%19s: %-22s -- %s','thermal'         ,['[1x1 ' class(self.thermal) ']'],'parameters for thermal solution'));
@@ -282 +284 @@
                         md.stressbalance    = stressbalance();
                         md.hydrology        = hydrologyshreve();
+                        md.debris           = debris();
                         md.masstransport    = masstransport();
                         md.thermal          = thermal();
@@ -425 +428 @@
                                 md.initialization.watercolumn=project2d(md,md.initialization.watercolumn,1);
                         end
+                        if ~isnan(md.initialization.debris),
+                                md.initialization.debris=project2d(md,md.initialization.debris,1);
+                        end
 
 
@@ -1185 +1191 @@
                         md.frontalforcings=extrude(md.frontalforcings,md);
                         md.hydrology = extrude(md.hydrology,md);
+                        md.debris = extrude(md.debris,md);
                         md.solidearth = extrude(md.solidearth,md);
                         md.dsl = extrude(md.dsl,md);