Changeset 27871

Timestamp:

08/03/23 02:27:17 (20 months ago)

Author:

seroussi

Message:

CHG: matlab/python change for isoceancoupling

Location:

issm/trunk-jpl/src/m/classes

Files:

• transient.m (modified) (3 diffs)
• transient.py (modified) (3 diffs)

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

@@ -101 +101 @@
                         md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1);
                         md = checkfield(md,'fieldname','transient.isslc','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'fieldname','transient.isoceancoupling','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'fieldname','transient.isoceancoupling','numel',[1],'values',[0 1 2]);
                         md = checkfield(md,'fieldname','transient.issampling','numel',[1],'values',[0 1]);  
                         md = checkfield(md,'fieldname','transient.amr_frequency','numel',[1],'>=',0,'NaN',1,'Inf',1);
@@ -129 +129 @@
                         fielddisplay(self,'issampling','indicates whether sampling is used in the transient')
                         fielddisplay(self,'isslc','indicates whether a sea-level change solution is used in the transient');
-                        fielddisplay(self,'isoceancoupling','indicates whether a coupling with an ocean model is used in the transient');
+                        fielddisplay(self,'isoceancoupling','indicates whether a coupling with an ocean model is used in the transient (1 for cartesian coordinates, 2 for lat/long coordinates');
                         fielddisplay(self,'amr_frequency','frequency at which mesh is refined in simulations with multiple time_steps');
                         fielddisplay(self,'requested_outputs','list of additional outputs requested');
@@ -149 +149 @@
                         WriteData(fid,prefix,'object',self,'fieldname','issampling','format','Boolean'); 
                         WriteData(fid,prefix,'object',self,'fieldname','isslc','format','Boolean');
-                        WriteData(fid,prefix,'object',self,'fieldname','isoceancoupling','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'fieldname','isoceancoupling','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','amr_frequency','format','Integer');
 

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

@@ -52 +52 @@
         s += '{}\n'.format(fielddisplay(self, 'issampling', 'indicates whether sampling is used in the transient'))
         s += '{}\n'.format(fielddisplay(self, 'isslc', 'indicates if a sea level change solution is used in the transient'))
-        s += '{}\n'.format(fielddisplay(self, 'isoceancoupling', 'indicates whether coupling with an ocean model is used in the transient'))
+        s += '{}\n'.format(fielddisplay(self, 'isoceancoupling', 'indicates whether coupling with an ocean model is used in the transient (1 for cartesian coordinates, 2 for lat/long coordinates'))
         s += '{}\n'.format(fielddisplay(self, 'amr_frequency', 'frequency at which mesh is refined in simulations with multiple time_steps'))
         s += '{}\n'.format(fielddisplay(self, 'requested_outputs', 'list of additional outputs requested'))
@@ -129 +129 @@
         md = checkfield(md, 'fieldname', 'transient.ismovingfront', 'numel', [1], 'values', [0, 1])
         md = checkfield(md, 'fieldname', 'transient.isslc', 'numel', [1], 'values', [0, 1])
-        md = checkfield(md, 'fieldname', 'transient.isoceancoupling', 'numel', [1], 'values', [0, 1])
+        md = checkfield(md, 'fieldname', 'transient.isoceancoupling', 'numel', [1], 'values', [0, 1 2])
         md = checkfield(md, 'fieldname', 'transient.amr_frequency', 'numel', [1], '>=', 0, 'NaN', 1, 'Inf', 1)
 
@@ -154 +154 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'issampling', 'format', 'Boolean')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'isslc', 'format', 'Boolean')
-        WriteData(fid, prefix, 'object', self, 'fieldname', 'isoceancoupling', 'format', 'Boolean')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'isoceancoupling', 'format', 'Integer')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'amr_frequency', 'format', 'Integer')