Changeset 24044

Timestamp:

06/24/19 07:44:12 (6 years ago)

Author:

seroussi

Message:

NEW: added anomaly to ISMIP6 forcing

Location:

issm/trunk-jpl

Files:

• src/c/analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• src/c/classes/Elements/Element.cpp (modified) (3 diffs)
• src/c/shared/Enum/Enum.vim (modified) (1 diff)
• src/c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• src/m/classes/basalforcingsismip6.m (modified) (5 diffs)
• test/Archives/Archive472.arch (modified) ( previous)
• test/NightlyRun/test472.m (modified) (1 diff)

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

@@ -181 +181 @@
                 case BasalforcingsIsmip6Enum:{
                         iomodel->FetchDataToInput(elements,"md.basalforcings.basin_id",BasalforcingsIsmp6BasinIdEnum);
+                        iomodel->FetchDataToInput(elements,"md.basalforcings.melt_anomaly",BasalforcingsIsmp6MeltAnomalyEnum,0.);
                         IssmDouble** array3d = NULL; int* Ms = NULL; int* Ns = NULL; int K;
                         iomodel->FetchData(&array3d,&Ms,&Ns,&K,"md.basalforcings.tf");

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

@@ -2175 +2175 @@
 
         int         basinid,num_basins,M,N;
-        IssmDouble  tf,gamma0,base,delta_t_basin,mean_tf_basin,absval;
+        IssmDouble  tf,gamma0,base,delta_t_basin,mean_tf_basin,absval,meltanomaly;
         bool        islocal;
         IssmDouble* delta_t = NULL;
@@ -2203 +2203 @@
                 this->parameters->FindParam(&mean_tf,&N,BasalforcingsIsmp6AverageTfEnum); _assert_(N==num_basins);
         }
-        Input* tf_input=this->GetInput(BasalforcingsIsmp6TfShelfEnum);            _assert_(tf_input);
+        Input* tf_input = this->GetInput(BasalforcingsIsmp6TfShelfEnum);              _assert_(tf_input);
+        Input* meltanomaly_input = this->GetInput(BasalforcingsIsmp6MeltAnomalyEnum); _assert_(meltanomaly_input);
         delta_t_basin = delta_t[basinid];
         if(!islocal) mean_tf_basin = mean_tf[basinid];
@@ -2212 +2213 @@
                 gauss->GaussVertex(i);
                 tf_input->GetInputValue(&tf,gauss);
+                meltanomaly_input->GetInputValue(&meltanomaly,gauss);
                 if(!islocal) {
                         absval = mean_tf_basin+delta_t_basin;
                         if (absval<0) {absval = -1.*absval;}
-                        basalmeltrate[i] = gamma0*pow((rhow*cp)/(rhoi*lf),2)*(tf+delta_t_basin)*absval;
+                        basalmeltrate[i] = gamma0*pow((rhow*cp)/(rhoi*lf),2)*(tf+delta_t_basin)*absval + meltanomaly;
                 }
                 else{
-                        basalmeltrate[i] = gamma0*pow((rhow*cp)/(rhoi*lf),2)*pow(max(tf+delta_t_basin,0.),2);
+                        basalmeltrate[i] = gamma0*pow((rhow*cp)/(rhoi*lf),2)*pow(max(tf+delta_t_basin,0.),2) + meltanomaly;
                 }
         }

issm/trunk-jpl/src/c/shared/Enum/Enum.vim

@@ -457 +457 @@
 syn keyword cConstant BasalforcingsIsmp6TfEnum
 syn keyword cConstant BasalforcingsIsmp6TfShelfEnum
+syn keyword cConstant BasalforcingsIsmp6MeltAnomalyEnum
 syn keyword cConstant BasalforcingsPicoBasinIdEnum
 syn keyword cConstant BasalforcingsPicoBoxIdEnum

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

@@ -453 +453 @@
         BasalforcingsIsmp6TfEnum,
         BasalforcingsIsmp6TfShelfEnum,
+        BasalforcingsIsmp6MeltAnomalyEnum,
         BasalforcingsPicoBasinIdEnum,
         BasalforcingsPicoBoxIdEnum,

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

@@ -459 +459 @@
                 case BasalforcingsIsmp6TfEnum : return "BasalforcingsIsmp6Tf";
                 case BasalforcingsIsmp6TfShelfEnum : return "BasalforcingsIsmp6TfShelf";
+                case BasalforcingsIsmp6MeltAnomalyEnum : return "BasalforcingsIsmp6MeltAnomaly";
                 case BasalforcingsPicoBasinIdEnum : return "BasalforcingsPicoBasinId";
                 case BasalforcingsPicoBoxIdEnum : return "BasalforcingsPicoBoxId";

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

@@ -468 +468 @@
               else if (strcmp(name,"BasalforcingsIsmp6Tf")==0) return BasalforcingsIsmp6TfEnum;
               else if (strcmp(name,"BasalforcingsIsmp6TfShelf")==0) return BasalforcingsIsmp6TfShelfEnum;
+              else if (strcmp(name,"BasalforcingsIsmp6MeltAnomaly")==0) return BasalforcingsIsmp6MeltAnomalyEnum;
               else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
               else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;

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

@@ -15 +15 @@
                 geothermalflux            = NaN;
                 groundedice_melting_rate  = NaN;
+                melt_anomaly              = NaN;
         end
         methods
@@ -24 +25 @@
                         self.geothermalflux=project3d(md,'vector',self.geothermalflux,'type','element','layer',1); %bedrock only gets geothermal flux
                         self.groundedice_melting_rate=project3d(md,'vector',self.groundedice_melting_rate,'type','node','layer',1);
+                        self.melt_anomaly=project3d(md,'vector',self.melt_anomaly,'type','element','layer',1); %bedrock only gets geothermal flux
                 end % }}}
                 function self = basalforcingsismip6(varargin) % {{{
@@ -61 +63 @@
                         md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'>=',0,'timeseries',1);
                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
+                        if length(md.basalforcings.melt_anomaly)>1,
+                                md = checkfield(md,'fieldname','basalforcings.melt_anomaly','NaN',1,'Inf',1,'timeseries',1);
+                        end
 
                         md = checkfield(md,'fieldname','basalforcings.tf','size',[1,1,numel(md.basalforcings.tf_depths)]);
@@ -79 +84 @@
                         fielddisplay(self,'geothermalflux','geothermal heat flux (W/m^2)');
                         fielddisplay(self,'groundedice_melting_rate','basal melting rate (positive if melting) (m/yr)');
+                        fielddisplay(self,'melt_anomaly','floating ice basal melt anomaly (m/yr)');
 
                 end % }}}
@@ -95 +101 @@
                         WriteData(fid,prefix,'object',self,'fieldname','geothermalflux','format','DoubleMat','name','md.basalforcings.geothermalflux','mattype',1,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','melt_anomaly','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
 
                 end % }}}

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

@@ -32 +32 @@
 D = cell(1,1,3); D(:,:,1)={A}; D(:,:,2)={B}; D(:,:,3)={C};
 md.basalforcings.tf = D;
+
+%Add a melt anomaly
+md.basalforcings.melt_anomaly= ones(md.mesh.numberofvertices+1,2);
+md.basalforcings.melt_anomaly(:,2)= 2;
+md.basalforcings.melt_anomaly(end,:)=[1;2];
 
 %Boundary conditions: