Changeset 28160

Timestamp:

03/21/24 07:13:18 (12 months ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBpdd.m (modified) (1 diff)
• SMBpdd.py (modified) (1 diff)
• dsl.m (modified) (1 diff)
• dsl.py (modified) (1 diff)

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

@@ -90 +90 @@
                                 md = checkfield(md,'fieldname','smb.rlapslgm','>=',0,'numel',1);
                                 if(self.isdelta18o==0 & self.ismungsm==0)
-                                        md = checkfield(md,'fieldname','smb.monthlytemperatures','timeseries',1,'NaN',1,'Inf',1);
-                                        md = checkfield(md,'fieldname','smb.precipitation','timeseries',1,'NaN',1,'Inf',1);
+                                        md = checkfield(md,'fieldname','smb.monthlytemperatures','size',[md.mesh.numberofvertices 12],'NaN',1,'Inf',1);
+                                        md = checkfield(md,'fieldname','smb.precipitation','size',[md.mesh.numberofvertices 12],'NaN',1,'Inf',1);
                                 elseif(self.isdelta18o==1)
                                         md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'Inf',1,'size',[2,NaN],'singletimeseries',1);

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

@@ -153 +153 @@
 
             if (self.isdelta18o == 0 and self.ismungsm == 0):
-                md = checkfield(md, 'fieldname', 'smb.monthlytemperatures', 'NaN', 1, 'Inf', 1, 'timeseries', 1)
-                md = checkfield(md, 'fieldname', 'smb.precipitation', 'NaN', 1, 'Inf', 1, 'timeseries', 1)
+                md = checkfield(md, 'fieldname', 'smb.monthlytemperatures', 'size', [md.mesh.numberofvertices, 12], 'NaN', 1, 'Inf', 1)
+                md = checkfield(md, 'fieldname', 'smb.precipitation', 'size', [md.mesh.numberofvertices, 12], 'NaN', 1, 'Inf', 1)
             elif self.isdelta18o:
                 md = checkfield(md, 'fieldname', 'smb.delta18o', 'NaN', 1, 'Inf', 1, 'size', [2, np.nan], 'singletimeseries', 1)

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

@@ -69 +69 @@
                         if isnan(self.global_average_thermosteric_sea_level)
                                 self.global_average_thermosteric_sea_level=[0;0];
-                                disp('      no dsl.global_average_thermosteric_sea_level specified: transient values set at zero');
+                                disp('      no dsl.global_average_thermosteric_sea_level specified: transient values set to zero');
                         end
                         if isnan(self.sea_surface_height_above_geoid)
                                 self.sea_surface_height_above_geoid=[zeros(md.mesh.numberofvertices,1);0];
-                                disp('      no dsl.sea_surface_height_above_geoid specified: transient values set at zero');
+                                disp('      no dsl.sea_surface_height_above_geoid specified: transient values set to zero');
                         end
                         if isnan(self.sea_water_pressure_at_sea_floor)
                                 self.sea_water_pressure_at_sea_floor=[zeros(md.mesh.numberofvertices,1);0];
-                                disp('      no dsl.sea_water_pressure_at_sea_floor specified: transient values set at zero');
+                                disp('      no dsl.sea_water_pressure_at_sea_floor specified: transient values set to zero');
                         end
                 end % }}}

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

@@ -70 +70 @@
         if np.isnan(self.global_average_thermosteric_sea_level):
             self.global_average_thermosteric_sea_level = np.array([0, 0]).reshape(-1, 1)
-            print('      no dsl.global_average_thermosteric_sea_level specified: transient values set at zero')
+            print('      no dsl.global_average_thermosteric_sea_level specified: transient values set to zero')
 
         if np.isnan(self.sea_surface_height_above_geoid):
             self.sea_surface_height_above_geoid = np.append(np.zeros((md.mesh.numberofvertices, 1)), 0).reshape(-1, 1)
-            print('      no dsl.sea_surface_height_above_geoid specified: transient values set at zero')
+            print('      no dsl.sea_surface_height_above_geoid specified: transient values set to zero')
 
         if np.isnan(self.sea_water_pressure_at_sea_floor):
             self.sea_water_pressure_at_sea_floor = np.append(np.zeros((md.mesh.numberofvertices, 1)), 0).reshape(-1, 1)
-            print('      no dsl.sea_water_pressure_at_sea_floor specified: transient values set at zero')
+            print('      no dsl.sea_water_pressure_at_sea_floor specified: transient values set to zero')
     # }}}