Changeset 21324

Timestamp:

10/29/16 16:54:30 (8 years ago)

Author:

Eric.Larour

Message:

CHG: introducing ocean area scaling from Surendra's work.

Location:

issm/branches/trunk-larour-NatGeoScience2016/src

Files:

• c/analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• c/classes/Elements/Tria.cpp (modified) (3 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (2 diffs)
• m/classes/slr.m (modified) (10 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/c/analyses/SealevelriseAnalysis.cpp

@@ -72 +72 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.slr.rigid",SealevelriseRigidEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.slr.elastic",SealevelriseElasticEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.slr.ocean_area_scaling",SealevelriseOceanAreaScalingEnum));
 
         iomodel->FetchData(&elastic,"md.slr.elastic");

issm/branches/trunk-larour-NatGeoScience2016/src/c/classes/Elements/Tria.cpp

@@ -3636 +3636 @@
         bool computerigid = true;
         bool computeelastic= true;
+        bool scaleoceanarea= false;
         
         /*early return if we are not on an ice cap:*/
@@ -3651 +3652 @@
         this->parameters->FindParam(&computerigid,SealevelriseRigidEnum);
         this->parameters->FindParam(&computeelastic,SealevelriseElasticEnum);
+        this->parameters->FindParam(&scaleoceanarea,SealevelriseOceanAreaScalingEnum);
 
         /*recover elastic green function:*/
@@ -3714 +3716 @@
         /*Compute eustatic compoent:*/
         _assert_(oceanarea>0.);
+        if(scaleoceanarea) oceanarea=3.619e+14; // use true ocean area, m^2 
         eustatic += rho_ice*area*I/(oceanarea*rho_water); 
 

issm/branches/trunk-larour-NatGeoScience2016/src/c/shared/Enum/EnumDefinitions.h

@@ -773 +773 @@
         SealevelriseRigidEnum,
         SealevelriseElasticEnum,
+        SealevelriseOceanAreaScalingEnum,
         SealevelriseGElasticEnum,
         SealevelriseUElasticEnum,

issm/branches/trunk-larour-NatGeoScience2016/src/c/shared/Enum/EnumToStringx.cpp

@@ -754 +754 @@
                 case SealevelriseRigidEnum : return "SealevelriseRigid";
                 case SealevelriseElasticEnum : return "SealevelriseElastic";
+                case SealevelriseOceanAreaScalingEnum : return "SealevelriseOceanAreaScaling";
                 case SealevelriseGElasticEnum : return "SealevelriseGElastic";
                 case SealevelriseUElasticEnum : return "SealevelriseUElastic";

issm/branches/trunk-larour-NatGeoScience2016/src/c/shared/Enum/StringToEnumx.cpp

@@ -772 +772 @@
               else if (strcmp(name,"SealevelriseRigid")==0) return SealevelriseRigidEnum;
               else if (strcmp(name,"SealevelriseElastic")==0) return SealevelriseElasticEnum;
+              else if (strcmp(name,"SealevelriseOceanAreaScaling")==0) return SealevelriseOceanAreaScalingEnum;
               else if (strcmp(name,"SealevelriseGElastic")==0) return SealevelriseGElasticEnum;
               else if (strcmp(name,"SealevelriseUElastic")==0) return SealevelriseUElasticEnum;
@@ -874 +875 @@
               else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
               else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
-              else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
+              if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
+              else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
               else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
               else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/slr.m

@@ -8 +8 @@
                 deltathickness = NaN;
                 sealevel       = NaN; 
+                spcthickness   = NaN; 
                 maxiter        = 0;
                 reltol         = 0;
@@ -19 +20 @@
                 elastic        = 0;
                 rotation       = 0;
+                ocean_area_scaling = 0;
                 degacc         = 0;
                 requested_outputs      = {};
@@ -45 +47 @@
                 self.elastic=1;
                 self.rotation=1;
+                self.ocean_area_scaling=0;
 
                 %tidal love numbers: 
@@ -65 +68 @@
                         md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
                         md = checkfield(md,'fieldname','slr.sealevel','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'fieldname','slr.spcthickness','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','slr.love_h','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','slr.love_k','NaN',1,'Inf',1);
@@ -98 +102 @@
                         fielddisplay(self,'deltathickness','thickness change (main loading of the slr solution core [m]');
                         fielddisplay(self,'sealevel','current sea level (prior to computation) [m]');
+                        fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]');
                         fielddisplay(self,'reltol','sea level rise relative convergence criterion, (default, NaN: not applied)');
                         fielddisplay(self,'abstol','sea level rise absolute convergence criterion, NaN: not applied');
@@ -107 +112 @@
                         fielddisplay(self,'tide_love_h','tidal load Love number (deg 2)');
                         fielddisplay(self,'rotation','earth rotational potential perturbation');
+                        fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area [default: No correction]'); 
                         fielddisplay(self,'rigid','rigid earth graviational potential perturbation');
                         fielddisplay(self,'elastic','elastic earth graviational potential perturbation');
@@ -117 +123 @@
                         WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',2);
                         WriteData(fid,prefix,'object',self,'fieldname','sealevel','mattype',1,'format','DoubleMat','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','reltol','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','abstol','format','Double');
@@ -128 +135 @@
                         WriteData(fid,prefix,'object',self,'fieldname','elastic','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','rotation','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'fieldname','ocean_area_scaling','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','degacc','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','transitions','format','MatArray');
@@ -145 +153 @@
                         writejs1Darray(fid,[modelname '.slr.deltathickness'],self.deltathickness);
                         writejs1Darray(fid,[modelname '.slr.sealevel'],self.sealevel);
+                        writejs1Darray(fid,[modelname '.slr.spcthickness'],self.spcthickness);
                         writejsdouble(fid,[modelname '.slr.maxiter'],self.maxiter);
                         writejsdouble(fid,[modelname '.slr.reltol'],self.reltol);
@@ -155 +164 @@
                         writejsdouble(fid,[modelname '.slr.rigid'],self.rigid);
                         writejsdouble(fid,[modelname '.slr.rotation'],self.rotation);
+                        writejsdouble(fid,[modelname '.slr.ocean_area_scaling'],self.ocean_area_scaling);
                         writejsdouble(fid,[modelname '.slr.elastic'],self.elastic);
                         writejsdouble(fid,[modelname '.slr.degacc'],self.degacc);