Changeset 21260

Timestamp:

10/12/16 12:15:19 (8 years ago)

Author:

adhikari

Message:

NEW: added new ESA capability to compute 3D elastostatic crustal deformation

Location:

issm/trunk-jpl/src/m

Files:

• Makefile.am (modified) (1 diff)
• classes/esa.js (added)
• classes/esa.m (added)
• classes/esa.py (added)
• classes/model.m (modified) (4 diffs)
• classes/transient.m (modified) (7 diffs)
• consistency/ismodelselfconsistent.m (modified) (1 diff)
• solve/solve.m (modified) (2 diffs)

issm/trunk-jpl/src/m/Makefile.am

@@ -96 +96 @@
                                 ${ISSM_DIR}/src/m/classes/geometry.js \
                                 ${ISSM_DIR}/src/m/classes/gia.js \
+                                ${ISSM_DIR}/src/m/classes/esa.js \
                                 ${ISSM_DIR}/src/m/classes/groundingline.js \
                                 ${ISSM_DIR}/src/m/classes/hydrologyshreve.js \

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

@@ -41 +41 @@
                 calving          = 0;
                 gia              = 0;
+                esa              = 0;
 
                 autodiff         = 0;
@@ -126 +127 @@
                         if isa(md.slr,'double');
                                 md.slr=slr();
+                        end
+                        %2016 October 11
+                        if isa(md.esa,'double');
+                                md.esa=esa();
                         end
 
@@ -1094 +1099 @@
                         md.calving          = calving();
                         md.gia              = gia();
+                        md.esa              = esa();
                         md.autodiff         = autodiff();
                         md.inversion        = inversion();
@@ -1265 +1271 @@
                         disp(sprintf('%19s: %-22s -- %s','calving'         ,['[1x1 ' class(self.calving) ']'],'parameters for calving'));
                         disp(sprintf('%19s: %-22s -- %s','gia'             ,['[1x1 ' class(self.gia) ']'],'parameters for gia solution'));
+                        disp(sprintf('%19s: %-22s -- %s','esa'             ,['[1x1 ' class(self.esa) ']'],'parameters for elastic adjustment solution'));
                         disp(sprintf('%19s: %-22s -- %s','autodiff'        ,['[1x1 ' class(self.autodiff) ']'],'automatic differentiation parameters'));
                         disp(sprintf('%19s: %-22s -- %s','inversion'       ,['[1x1 ' class(self.inversion) ']'],'parameters for inverse methods'));

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

@@ -12 +12 @@
                 isgroundingline   = 0;
                 isgia             = 0;
+                isesa             = 0;
                 isdamageevolution = 0;
                 ismovingfront     = 0;
@@ -37 +38 @@
                         self.isgroundingline = 0;
                         self.isgia           = 0;
+                        self.isesa           = 0;
                         self.isdamageevolution = 0;
                         self.ismovingfront   =0;
@@ -55 +57 @@
                         self.isgroundingline = 0;
                         self.isgia           = 0;
+                        self.isesa           = 0;
                         self.isdamageevolution = 0;
                         self.ismovingfront   = 0;
@@ -82 +85 @@
                         md = checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'fieldname','transient.isesa','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.ismovingfront','numel',[1],'values',[0 1]);
@@ -99 +103 @@
                         fielddisplay(self,'isgroundingline','indicates whether a groundingline migration is used in the transient');
                         fielddisplay(self,'isgia','indicates whether a postglacial rebound model is used in the transient');
+                        fielddisplay(self,'isesa','indicates whether an elastic adjustment model is used in the transient');
                         fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient');
                         fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient');
@@ -114 +119 @@
                         WriteData(fid,prefix,'object',self,'fieldname','isgroundingline','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','isgia','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'fieldname','isesa','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','isdamageevolution','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','ishydrology','format','Boolean');
@@ -137 +143 @@
                         writejsdouble(fid,[modelname '.trans.isgroundingline'],self.isgroundingline);
                         writejsdouble(fid,[modelname '.trans.isgia'],self.isgia);
+                        writejsdouble(fid,[modelname '.trans.isesa'],self.isesa);
                         writejsdouble(fid,[modelname '.trans.isdamageevolution'],self.isdamageevolution);
                         writejsdouble(fid,[modelname '.trans.ismovingfront'],self.ismovingfront);

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m

@@ -66 +66 @@
         elseif strcmp(solutiontype,'GiaSolution')
                 analyses={'GiaAnalysis'};
+        elseif strcmp(solutiontype,'EsaSolution')
+                analyses={'EsaAnalysis'};
         elseif strcmp(solutiontype,'TransientSolution')
                 analyses={'StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologySommersAnalysis'};

issm/trunk-jpl/src/m/solve/solve.m

@@ -19 +19 @@
 %      - 'DamageEvolution'    or 'da'
 %                - 'Gia'                or 'gia'
+%                - 'Esa'                or 'esa'
 %                - 'Sealevelrise'       or 'slr'
 %
@@ -61 +62 @@
 elseif strcmpi(solutionstring,'gia') || strcmpi(solutionstring,'Gia')
         solutionstring = 'GiaSolution';
+elseif strcmpi(solutionstring,'esa') || strcmpi(solutionstring,'Esa')
+        solutionstring = 'EsaSolution';
 elseif strcmpi(solutionstring,'slr') || strcmpi(solutionstring,'Sealevelrise')
         solutionstring = 'SealevelriseSolution';