Changeset 27155

Timestamp:

07/11/22 01:16:40 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing age model
:

Location:

issm/trunk-jpl/src/m/classes

Files:

• age.m (added)
• transient.js (modified) (5 diffs)
• transient.m (modified) (7 diffs)
• transient.py (modified) (6 diffs)

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

@@ -9 +9 @@
 
                 //full analysis: Stressbalance, Masstransport and Thermal but no groundingline migration for now
+                this.isage             = 0;
                 this.issmb             = 1;
                 this.ismasstransport   = 1;
@@ -32 +33 @@
                 console.log(sprintf('   transient solution parameters:'));
 
+                fielddisplay(this,'isage','indicates whether age model is requested in the transient');
                 fielddisplay(this,'issmb','indicates whether a surface mass balance solution is used in the transient');
                 fielddisplay(this,'ismasstransport','indicates whether a masstransport solution is used in the transient');
@@ -58 +60 @@
                         if (solution!='TransientSolution') return;
 
+                        checkfield(md,'fieldname','transient.isage','numel',[1],'values',[0, 1]);
                         checkfield(md,'fieldname','transient.issmb','numel',[1],'values',[0, 1]);
                         checkfield(md,'fieldname','transient.ismasstransport','numel',[1],'values',[0, 1]);
@@ -77 +80 @@
 
                         prefix='md.transient';
+                        WriteData(fid,prefix,'object',this,'fieldname','isage','format','Boolean');
                         WriteData(fid,prefix,'object',this,'fieldname','issmb','format','Boolean');
                         WriteData(fid,prefix,'object',this,'fieldname','ismasstransport','format','Boolean');
@@ -112 +116 @@
         // {{{
 
+        this.isage             = 0;
         this.issmb             = 0;
         this.ismasstransport   = 0;

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

@@ -6 +6 @@
 classdef transient
         properties (SetAccess=public) 
+                isage             = 0;
                 issmb             = 0;
                 ismasstransport   = 0;
@@ -34 +35 @@
 
                         %full analysis: Stressbalance, Masstransport and Thermal but no groundingline migration for now
+                        self.isage             = 0;
                         self.issmb             = 0;
                         self.ismasstransport   = 0;
@@ -55 +57 @@
 
                         %full analysis: Stressbalance, Masstransport and Thermal but no groundingline migration for now
+                        self.isage             = 0;
                         self.issmb             = 1;
                         self.ismasstransport   = 1;
@@ -85 +88 @@
                         if ~strcmp(solution,'TransientSolution'), return; end
 
+                        md = checkfield(md,'fieldname','transient.isage','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.issmb','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.ismasstransport','numel',[1],'values',[0 1]);
@@ -111 +115 @@
                         disp(sprintf('   transient solution parameters:'));
 
+                        fielddisplay(self,'isage','indicates whether an age model is used in the transient');
                         fielddisplay(self,'issmb','indicates whether a surface mass balance solution is used in the transient');
                         fielddisplay(self,'ismasstransport','indicates whether a masstransport solution is used in the transient');
@@ -129 +134 @@
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
+                        WriteData(fid,prefix,'object',self,'fieldname','isage','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','issmb','format','Boolean');
                         WriteData(fid,prefix,'object',self,'fieldname','ismasstransport','format','Boolean');
@@ -155 +161 @@
                 function savemodeljs(self,fid,modelname) % {{{
                 
+                        writejsdouble(fid,[modelname '.trans.isage'],self.isage);
                         writejsdouble(fid,[modelname '.trans.issmb'],self.issmb);
                         writejsdouble(fid,[modelname '.trans.ismasstransport'],self.ismasstransport);

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

@@ -12 +12 @@
 
     def __init__(self):  # {{{
+        self.isage = 0
         self.issmb = 0
         self.ismasstransport = 0
@@ -33 +34 @@
     def __repr__(self):  # {{{
         s = '   transient solution parameters:\n'
+        s += '{}\n'.format(fielddisplay(self, 'isage', 'indicates if age model is requested in the transient'))
         s += '{}\n'.format(fielddisplay(self, 'issmb', 'indicates if a surface mass balance solution is used in the transient'))
         s += '{}\n'.format(fielddisplay(self, 'ismasstransport', 'indicates if a masstransport solution is used in the transient'))
@@ -59 +61 @@
 
     def deactivateall(self):  #{{{
+        self.isage = 0
         self.issmb = 0
         self.ismasstransport = 0
@@ -82 +85 @@
         # Full analysis: Stressbalance, Masstransport and Thermal but no 
         # groundingline migration for now
+        self.isage = 0
         self.issmb = 1
         self.ismasstransport = 1
@@ -107 +111 @@
             return md
 
+        md = checkfield(md, 'fieldname', 'transient.isage', 'numel', [1], 'values', [0, 1])
         md = checkfield(md, 'fieldname', 'transient.issmb', 'numel', [1], 'values', [0, 1])
         md = checkfield(md, 'fieldname', 'transient.ismasstransport', 'numel', [1], 'values', [0, 1])
@@ -130 +135 @@
 
     def marshall(self, prefix, md, fid):  # {{{
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'isage', 'format', 'Boolean')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'issmb', 'format', 'Boolean')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'ismasstransport', 'format', 'Boolean')