Changeset 26274

Timestamp:

05/17/21 14:08:16 (4 years ago)

Author:

caronlam

Message:

CHG: removing BarystaticSealevel field from SolidEarth External solution. NEW: test2008 for additionalsolidearthsolution class

Location:

issm/trunk-jpl

Files:

• src/c/analyses/SealevelchangeAnalysis.cpp (modified) (4 diffs)
• src/c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• src/m/classes/mmeadditionalsolidearthsolution.m (modified) (7 diffs)
• src/m/classes/mmeofflinesolidearthsolution.m (modified) (6 diffs)
• src/m/classes/solidearthsolution.m (modified) (8 diffs)
• test/NightlyRun/test2007.m (modified) (1 diff)
• test/NightlyRun/test2008.m (added)

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

@@ -42 +42 @@
         /*external solidearthsolution: solid-Earth model*/
         iomodel->FetchData(&isexternal,"md.solidearth.isexternal");
+
         if(isexternal){
                 iomodel->FetchDataToInput(inputs,elements,"md.solidearth.external.displacementeast",SolidearthExternalDisplacementEastRateEnum);
@@ -47 +48 @@
                 iomodel->FetchDataToInput(inputs,elements,"md.solidearth.external.displacementup",SolidearthExternalDisplacementUpRateEnum);
                 iomodel->FetchDataToInput(inputs,elements,"md.solidearth.external.geoid",SolidearthExternalGeoidRateEnum);
-                iomodel->FetchDataToInput(inputs,elements,"md.solidearth.external.barystaticsealevel",SolidearthExternalBarystaticSeaLevelRateEnum);
+
 
                 /*Resolve Mmes using the modelid, if necessary:*/
@@ -61 +62 @@
                         MmeToInputFromIdx(inputs,elements,modelid,SolidearthExternalDisplacementUpRateEnum, P1Enum);
                         MmeToInputFromIdx(inputs,elements,modelid,SolidearthExternalGeoidRateEnum, P1Enum);
-                        MmeToInputFromIdx(inputs,elements,modelid,SolidearthExternalBarystaticSeaLevelRateEnum, P1Enum);
                 }
         }
@@ -159 +159 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.planetradius",SolidearthPlanetRadiusEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.cross_section_shape",SolidearthSettingsCrossSectionShapeEnum));
+
         parameters->AddObject(new DoubleParam(CumBslcEnum,0.0));
         parameters->AddObject(new DoubleParam(CumBslcIceEnum,0.0));

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

@@ -385 +385 @@
         SolidearthSettingsRigidEnum,
         SolidearthSettingsRotationEnum,
+        SolidearthSettingsMaxSHCoeffEnum,
         SealevelchangeRunCountEnum,
         SealevelchangeTransitionsEnum,
@@ -952 +953 @@
         SolidearthExternalDisplacementUpRateEnum,
         SolidearthExternalGeoidRateEnum,
-        SolidearthExternalBarystaticSeaLevelRateEnum,
         StackRSLEnum,
         StackUEnum,

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

@@ -957 +957 @@
                 case SolidearthExternalDisplacementUpRateEnum : return "SolidearthExternalDisplacementUpRate";
                 case SolidearthExternalGeoidRateEnum : return "SolidearthExternalGeoidRate";
-                case SolidearthExternalBarystaticSeaLevelRateEnum : return "SolidearthExternalBarystaticSeaLevelRate";
                 case StackRSLEnum : return "StackRSL";
                 case StackUEnum : return "StackU";

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

@@ -978 +978 @@
               else if (strcmp(name,"SolidearthExternalDisplacementUpRate")==0) return SolidearthExternalDisplacementUpRateEnum;
               else if (strcmp(name,"SolidearthExternalGeoidRate")==0) return SolidearthExternalGeoidRateEnum;
-              else if (strcmp(name,"SolidearthExternalBarystaticSeaLevelRate")==0) return SolidearthExternalBarystaticSeaLevelRateEnum;
               else if (strcmp(name,"StackRSL")==0) return StackRSLEnum;
               else if (strcmp(name,"StackU")==0) return StackUEnum;

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

@@ -32 +32 @@
                         sup=length(self.displacementup);
                         sgeoid=length(self.geoid);
-                        sbarystaticsealevel=length(self.barystaticsealevel);
 
                         if (seast-snorth)~=0,
@@ -45 +44 @@
                                 error('mmeadditionalsolidearthsolution checkconsistency error message: displacementeast and geoid should be the same size');
                         end
-
-                        if (seast-sbarystaticsealevel)~=0,
-                                error('mmeadditionalsolidearthsolution checkconsistency error message: displacementeast and barystaticsealevel should be the same size');
-                        end
                         
                         md = checkfield(md,'field',self.modelid,'NaN',1,'Inf',1,'>=',1,'<=',length(self.displacementeast));
@@ -57 +52 @@
                                 md = checkfield(md,'field',self.displacementnorth{i},'NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'field',self.geoid{i},'NaN',1,'Inf',1,'timeseries',1);
-                                md = checkfield(md,'field',self.barystaticsealevel{i},'NaN',1,'Inf',1,'timeseries',1);
                         end
 
@@ -80 +74 @@
                                 displacementup=self.displacementup{i}; 
                                 geoid=self.geoid{i}; 
-                                barystaticsealevel=self.barystaticsealevel{i}; 
 
                                 time=displacementeast(end,:);
@@ -89 +82 @@
                                 displacementup_rate=diff(displacementup(1:end-1,:),1,2)./dt;
                                 geoid_rate=diff(geoid(1:end-1,:),1,2)./dt;
-                                barystaticsealevel_rate=diff(barystaticsealevel(1:end-1,:),1,2)./dt;
 
                                 self.displacementeast{i}=displacementeast_rate; 
@@ -95 +87 @@
                                 self.displacementup{i}=displacementup_rate; 
                                 self.geoid{i}=geoid_rate; 
-                                self.barystaticsealevel{i}=barystaticsealevel_rate; 
                         end
                         
@@ -102 +93 @@
                         WriteData(fid,prefix,'object',self,'fieldname','displacementnorth','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1/yts);
                         WriteData(fid,prefix,'object',self,'fieldname','geoid','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1/yts);
-                        WriteData(fid,prefix,'object',self,'fieldname','barystaticsealevel','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1/yts);
 
                 end % }}}

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

@@ -32 +32 @@
                         sup=length(self.displacementup);
                         sgeoid=length(self.geoid);
-                        sbarystaticsealevel=length(self.barystaticsealevel);
 
                         if (seast-snorth)~=0,
@@ -45 +44 @@
                                 error('mmeofflinesolidearthsolution checkconsistency error message: displacementeast and geoid should be the same size');
                         end
-
-                        if (seast-sbarystaticsealevel)~=0,
-                                error('mmeofflinesolidearthsolution checkconsistency error message: displacementeast and barystaticsealevel should be the same size');
-                        end
                         
                         md = checkfield(md,'field',self.modelid,'NaN',1,'Inf',1,'>=',1,'<=',length(self.displacementeast));
@@ -57 +52 @@
                                 md = checkfield(md,'field',self.displacementnorth{i},'NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'field',self.geoid{i},'NaN',1,'Inf',1,'timeseries',1);
-                                md = checkfield(md,'field',self.barystaticsealevel{i},'NaN',1,'Inf',1,'timeseries',1);
                         end
 
@@ -79 +73 @@
                                 displacementup=self.displacementup{i}; 
                                 geoid=self.geoid{i}; 
-                                barystaticsealevel=self.barystaticsealevel{i}; 
 
                                 time=displacementeast(end,:);
@@ -94 +87 @@
                                 self.displacementup{i}=displacementup_rate; 
                                 self.geoid{i}=geoid_rate; 
-                                self.barystaticsealevel{i}=barystaticsealevel_rate; 
                         end
                         
@@ -101 +93 @@
                         WriteData(fid,prefix,'object',self,'fieldname','displacementnorth','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1/yts);
                         WriteData(fid,prefix,'object',self,'fieldname','geoid','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1/yts);
-                        WriteData(fid,prefix,'object',self,'fieldname','barystaticsealevel','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1/yts);
 
                 end % }}}

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

@@ -10 +10 @@
                 displacementup=[];
                 geoid=[];
-                barystaticsealevel=[];
         end
         methods
@@ -27 +26 @@
                         self.displacementup=[];
                         self.geoid=[];
-                        self.barystaticsealevel=[];
         
                 end % }}}
@@ -36 +34 @@
                         md = checkfield(md,'fieldname','solidearth.external.displacementup','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','solidearth.external.geoid','Inf',1,'timeseries',1);
-                        md = checkfield(md,'fieldname','solidearth.external.barystaticsealevel','Inf',1,'timeseries',1);
 
                 end % }}}
@@ -45 +42 @@
                         fielddisplay(self,'displacementup','solid-Earth bedrock uplift time series (m)');
                         fielddisplay(self,'geoid','solid-Earth geoid time series (m)');
-                        fielddisplay(self,'barystaticsealevel','barystatic absolute sea-level time series (m)');
 
                 end % }}}
@@ -58 +54 @@
                                 displacementup_rate=[self.displacementup;0];
                                 geoid_rate=[self.geoid;0];
-                                barystaticsealevel_rate=[self.barystaticsealevel;0];
                         else
                                 time=self.displacementeast(end,:);
@@ -70 +65 @@
                                 geoid_rate=diff(self.geoid(1:end-1,:),1,2)./dt;
                                 geoid_rate(end+1,:)=time(1:end-1);
-                                barystaticsealevel_rate=diff(self.barystaticsealevel(1:end-1,:),1,2)./dt;
-                                barystaticsealevel_rate(end+1,:)=time(1:end-1);
                         end
                         WriteData(fid,prefix,'object',self,'fieldname','displacementeast','data',displacementeast_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementeast','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
@@ -77 +70 @@
                         WriteData(fid,prefix,'object',self,'fieldname','displacementnorth','data',displacementnorth_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementnorth','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','geoid','data',geoid_rate,'format','DoubleMat','name', 'md.solidearth.external.geoid','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                        WriteData(fid,prefix,'object',self,'fieldname','barystaticsealevel','data',barystaticsealevel_rate,'format','DoubleMat','name', 'md.solidearth.external.barystaticsealevel','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         
                 end % }}}
@@ -85 +77 @@
                         writejs1Darray(fid,[modelname '.solidearth.external.displacementup'],self.displacementup);
                         writejs1Darray(fid,[modelname '.solidearth.external.geoid'],self.geoid);
-                        writejs1Darray(fid,[modelname '.solidearth.external.barystaticsealevel'],self.barystaticsealevel);
                 end % }}}
                 function self = extrude(self,md) % {{{

issm/trunk-jpl/test/NightlyRun/test2007.m

@@ -24 +24 @@
 md.solidearth.external.displacementnorth=longe .*time;
 md.solidearth.external.displacementnorth(end+1,:)=time;
-md.solidearth.external.barystaticsealevel=0*late .*time;
-md.solidearth.external.barystaticsealevel(end+1,:)=time;
 md.initialization.sealevel=zeros(md.mesh.numberofvertices,1);