Changeset 25960

Timestamp:

01/28/21 02:18:22 (4 years ago)

Author:

jdquinn

Message:

CHG: Partial fixes for SLC

Location:

issm/trunk-jpl/src

Files:

• c/analyses/SealevelchangeAnalysis.cpp (modified) (1 diff)
• c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (modified) (2 diffs)
• m/classes/surfaceload.m (modified) (12 diffs)

issm/trunk-jpl/src/c/analyses/SealevelchangeAnalysis.cpp ¶

@@ -44 +44 @@
         iomodel->FetchDataToInput(inputs,elements,"md.solidearth.surfaceload.icethicknesschange",SurfaceloadIceThicknessRateEnum);
         iomodel->FetchDataToInput(inputs,elements,"md.solidearth.surfaceload.waterheightchange",SurfaceloadWaterHeightRateEnum);
-        iomodel->FetchDataToInput(inputs,elements,"md.solidearth.surfaceload.other",SurfaceloadOtherRateEnum);
+        iomodel->FetchDataToInput(inputs,elements,"md.solidearth.surfaceload.otherchange",SurfaceloadOtherRateEnum);
                 
         /*dynamic sea level: */

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

@@ -169 +169 @@
 
 
-                if (femmodel->inputs->GetInputObjectEnum(SurfaceloadIceThicknessChangeEnum)==DatasetInputEnum)
-                        MmeToInput(femmodel,distributed_values,variable_partition,npart,SurfaceloadIceThicknessChangeEnum, P0Enum);
+                if (femmodel->inputs->GetInputObjectEnum(SurfaceloadIceThicknessRateEnum)==DatasetInputEnum)
+                        MmeToInput(femmodel,distributed_values,variable_partition,npart,SurfaceloadIceThicknessRateEnum, P0Enum);
 
                 if (femmodel->inputs->GetInputObjectEnum(MaskIceLevelsetEnum)==DatasetInputEnum)
@@ -259 +259 @@
         }
 
-        /*wipe out existing SurfaceloadIceThicknessChangeEnum dataset:*/
+        /*wipe out existing SurfaceloadIceThicknessRateEnum dataset:*/
         femmodel->inputs->ChangeEnum(DummyEnum,rootenum);
 

issm/trunk-jpl/src/m/classes/surfaceload.m ¶

@@ -8 +8 @@
                 icethicknesschange     = [];
                 waterheightchange      = [];
-                other                  = [];
+                otherchange            = [];
         end
         methods
@@ -23 +23 @@
                         icethicknesschange=[];
                         waterheightchange=[];
-                        other=[];
+                        otherchange=[];
                 
                 end % }}}
@@ -43 +43 @@
                                 md = checkfield(md,'fieldname','solidearth.surfaceload.waterheightchange','timeseries',1,'NaN',1,'Inf',1);
                         end
-                        if ~isempty(self.other),
+                        if ~isempty(self.otherchange),
                                 md = checkfield(md,'fieldname','solidearth.surfaceload.other','timeseries',1,'NaN',1,'Inf',1);
                         end
@@ -61 +61 @@
                         fielddisplay(self,'icethicknesschange','thickness change: ice height equivalent [mIce/yr]');
                         fielddisplay(self,'waterheightchange','water height change: water height equivalent [mWater/yr]');
-                        fielddisplay(self,'other','other loads (sediments) [kg/m^2/yr]');
+                        fielddisplay(self,'otherchange','other loads (sediments) [kg/m^2/yr]');
 
                 end % }}}
@@ -70 +70 @@
                                 self.icethicknesschange=zeros(md.mesh.numberofelements+1,1);
                         end
+                        
+                        yts=md.constants.yts;
 
                         if isa(self.icethicknesschange,'cell'),
@@ -82 +84 @@
                                 end
                                 WriteData(fid,prefix,'object',self,'fieldname','icethicknesschange','name','md.solidearth.surfaceload.icethicknesschange',...
-                                'format','MatArray','timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts,'scale',1/yts);
+                                'format','MatArray','timeserieslength',md.mesh.numberofelements+1,'yts',yts,'scale',1/yts);
                         else
                                 icethicknesschange=self.icethicknesschange;
@@ -91 +93 @@
 
                                 WriteData(fid,prefix,'object',self,'fieldname','icethicknesschange','name','md.solidearth.surfaceload.icethicknesschange',...
-                                'format','DoubleMat','mattype',2,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts,'scale',1/yts);
+                                'format','MatArray','timeserieslength',md.mesh.numberofelements+1,'yts',yts,'scale',1/yts);
                         end
                         %}}}
@@ -110 +112 @@
                                 end
                                 WriteData(fid,prefix,'object',self,'fieldname','waterheightchange','name','md.solidearth.surfaceload.waterheightchange',...
-                                'format','MatArray','timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts,'scale',1/yts);
+                                'format','MatArray','timeserieslength',md.mesh.numberofelements+1,'yts',yts,'scale',1/yts);
                         else
                                 waterheightchange=self.waterheightchange;
@@ -119 +121 @@
 
                                 WriteData(fid,prefix,'object',self,'fieldname','waterheightchange','name','md.solidearth.surfaceload.waterheightchange',...
-                                'format','DoubleMat','mattype',2,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts,'scale',1/yts);
+                                'format','MatArray','timeserieslength',md.mesh.numberofelements+1,'yts',yts,'scale',1/yts);
                         end
                         %}}}
                         %deal with other: {{{
-                        if isempty(self.other),
-                                self.other=zeros(md.mesh.numberofelements+1,1);
+                        if isempty(self.otherchange),
+                                self.otherchange=zeros(md.mesh.numberofelements+1,1);
                         end
 
@@ -138 +140 @@
                                 end
                                 WriteData(fid,prefix,'object',self,'fieldname','otherchange','name','md.solidearth.surfaceload.otherchange',...
-                                'format','MatArray','timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts,'scale',1/yts);
+                                'format','MatArray','timeserieslength',md.mesh.numberofelements+1,'yts',yts,'scale',1/yts);
                         else
                                 otherchange=self.otherchange;
@@ -147 +149 @@
 
                                 WriteData(fid,prefix,'object',self,'fieldname','otherchange','name','md.solidearth.surfaceload.otherchange',...
-                                'format','DoubleMat','mattype',2,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts,'scale',1/yts);
+                                'format','MatArray','timeserieslength',md.mesh.numberofelements+1,'yts',yts,'scale',1/yts);
                         end
                         %}}}
@@ -156 +158 @@
                         writejs1Darray(fid,[modelname '.surfaceload.icethicknesschange'],self.icethicknesschange);
                         writejs1Darray(fid,[modelname '.surfaceload.waterheightchange'],self.waterheightchange);
-                        writejs1Darray(fid,[modelname '.surfaceload.other'],self.other);
+                        writejs1Darray(fid,[modelname '.surfaceload.otherchange'],self.otherchange);
                 end % }}}
                 function self = extrude(self,md) % {{{