Changeset 27629

Timestamp:

03/02/23 11:15:42 (2 years ago)

Author:

Mathieu Morlighem

Message:

NEW: adding default option to md.miscellaneous.notes

Location:

issm/trunk-jpl/src/m/classes

Files:

• miscellaneous.m (modified) (1 diff)
• spatiallinearbasalforcings.m (modified) (1 diff)

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

@@ -25 +25 @@
                 end % }}}
                 function self = setdefaultparameters(self) % {{{
+
+                        %Add some information about the model for future reference
+                        self.notes = ['Model created on ' date ' by ' char(java.lang.System.getProperty('user.name')) ', ISSM v' num2str(issmversion()) ' (path: ' pwd() ')'];
+                        self.name  = '';
 
                 end % }}}

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

@@ -21 +21 @@
                                 case 1
                                         lb=varargin{1};
-                                        if strcmpi(class(lb),'linearbasalforcings'),
+                                        if isa(lb,'linearbasalforcings');
                                                 nvertices=length(lb.groundedice_melting_rate);
                                                 self.groundedice_melting_rate=lb.groundedice_melting_rate;
                                                 self.geothermalflux=lb.geothermalflux;
-                                                self.deepwater_elevation=lb.deepwater_elevation*ones(nvertices,1);
-                                                self.deepwater_melting_rate=lb.deepwater_melting_rate*ones(nvertices,1);
-                                                self.upperwater_melting_rate=lb.upperwater_melting_rate*ones(nvertices,1);
-                                                self.upperwater_elevation=lb.upperwater_elevation*ones(nvertices,1);
-                                                self.perturbation_melting_rate=lb.perturbation_melting_rate*ones(nvertices,1);
+                                                self.deepwater_elevation       = lb.deepwater_elevation*ones(nvertices,1);
+                                                self.deepwater_melting_rate    = lb.deepwater_melting_rate*ones(nvertices,1);
+                                                self.upperwater_melting_rate   = lb.upperwater_melting_rate*ones(nvertices,1);
+                                                self.upperwater_elevation      = lb.upperwater_elevation*ones(nvertices,1);
+                                                if ~isnan(lb.perturbation_melting_rate)
+                                                        self.perturbation_melting_rate = lb.perturbation_melting_rate*ones(nvertices,1);
+                                                end
                                         else 
                                                 self=structtoobj(spatiallinearbasalforcings(),varargin{1});