Changeset 19105 for issm/trunk/src/m/classes/modellist.m

Timestamp:

02/12/15 16:48:40 (10 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 19103

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/modellist.m (modified) (10 diffs)

issm/trunk

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

issm/trunk/src/m/classes/modellist.m

@@ -122 +122 @@
 
                 end % }}}
-                function obj = modellist(varargin) % {{{
+                function self = modellist(varargin) % {{{
 
                         %initialize list
@@ -146 +146 @@
                                 end
 
-                                obj.models  = celllist;
-                                obj.cluster = obj.models{1}.cluster;
-                        end
-                end % }}}
-                function val = get(obj, propName)% {{{
+                                self.models  = celllist;
+                                self.cluster = self.models{1}.cluster;
+                        end
+                end % }}}
+                function val = get(self, propName)% {{{
                 %GET - gets model propertie from a specified object ans returns the value
                 % 
@@ -158 +158 @@
                         switch propName
                                 case 'numberofelements'
-                                        val = obj.numberofelements;
+                                        val = self.numberofelements;
                                 case 'numberofnodes'
-                                        val = obj.numberofnodes;
+                                        val = self.numberofnodes;
                                 case 'elements' 
-                                        val = obj.elements;
+                                        val = self.elements;
                                 case 'x' 
-                                        val = obj.x;
+                                        val = self.x;
                                 case 'y' 
-                                        val = obj.y;
+                                        val = self.y;
                                 case 'z' 
-                                        val = obj.z;
+                                        val = self.z;
                                 otherwise
                                         error(['get error message: ' propName,' is not a valid model property'])
                         end
                 end % }}}
-                function obj = loadmultipleresultsfromcluster(obj) % {{{
+                function self = loadmultipleresultsfromcluster(self) % {{{
                         %LOADMULTIPLERESULTSFROMCLUSTER - load multiple results of solution sequences from cluster
                         %
                         %   Usage:
-                        %      obj=loadresultsfromcluster(obj);
-
-                        nummodels=length(obj.models);
+                        %      self=loadresultsfromcluster(self);
+
+                        nummodels=length(self.models);
 
                         %Get cluster settings
-                        cluster=obj.cluster;
-                        name=obj.name;
+                        cluster=self.cluster;
+                        name=self.name;
                         cluster_rc_location=which('cluster.rc');
                         [codepath,executionpath]=ClusterParameters(cluster,cluster_rc_location);
@@ -200 +200 @@
                         for i=1:nummodels,
                                 %load  results for this model
-                                obj.models{i}=loadresultsfromdisk(obj.models{i},[name '-' num2str(i) 'vs' num2str(nummodels) '.outbin']);
+                                self.models{i}=loadresultsfromdisk(self.models{i},[name '-' num2str(i) 'vs' num2str(nummodels) '.outbin']);
 
                                 delete([name '-' num2str(i) 'vs' num2str(nummodels) '.outbin']);
@@ -208 +208 @@
                         delete('ModelResults.tar.gz');
                 end % }}}
-                function obj = solve(obj,varargin)% {{{
+                function self = solve(self,varargin)% {{{
                         %SOLVE - apply solution sequence for  a list of models. Used in batch mode.
                         %
                         %   Usage:
-                        %      obj=solve(obj,varargin)
+                        %      self=solve(self,varargin)
                         %      where varargin is a lit of paired arguments. 
                         %      arguments can be: 'analysis_type': 'stressbalance','thermal','masstransport','transient'
                         %
                         %   Examples:
-                        %      obj=solve(obj,'analysis_type','stressbalance');
+                        %      self=solve(self,'analysis_type','stressbalance');
 
                         %recover options
@@ -226 +226 @@
 
                         %length of list
-                        nummodels=length(obj.models);
+                        nummodels=length(self.models);
 
                         %name of queue: to make it unique, add a time stamp
-                        name=[obj.name '-' datestr(now,1) '-' datestr(now,'HH-MM-SS') ];
+                        name=[self.name '-' datestr(now,1) '-' datestr(now,'HH-MM-SS') ];
 
                         %name of cluster will be first name of list
-                        cluster=obj.cluster;
+                        cluster=self.cluster;
 
                         %Figure out parameters for this particular cluster
@@ -242 +242 @@
 
                                 %model
-                                mdex=obj.models{i};
+                                mdex=self.models{i};
 
                                 %recover some fields
@@ -248 +248 @@
 
                                 mdex.name=[name '-' num2str(i) 'vs' num2str(nummodels)];
-                                mdex.time=obj.time;
-                                mdex.queue=obj.queue;
-                                mdex.cluster=obj.cluster;
-                                if ~isnan(obj.np),
-                                        mdex.np=obj.np;
+                                mdex.time=self.time;
+                                mdex.queue=self.queue;
+                                mdex.cluster=self.cluster;
+                                if ~isnan(self.np),
+                                        mdex.np=self.np;
                                 end
 
@@ -263 +263 @@
 
                                 %feed back
-                                obj.models{i}=mdex;
+                                self.models{i}=mdex;
                         end
 
@@ -287 +287 @@
 
                         %save name: 
-                        obj.name=name;
+                        self.name=name;
                 end % }}}
         end

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh