Changeset 11224

Timestamp:

01/26/12 13:29:12 (13 years ago)

Author:

Mathieu Morlighem

Message:

Some updates required to support matlab versions older than 7.6

Location:

issm/trunk-jpl/src/m/model

Files:

• ismodelselfconsistent.m (modified) (1 diff)
• loadresultsfromcluster.m (modified) (1 diff)
• marshall.m (modified) (1 diff)
• solveparallel.m (modified) (1 diff)

issm/trunk-jpl/src/m/model/ismodelselfconsistent.m

@@ -28 +28 @@
 
         %Check consistency of the object
-        md.(field).checkconsistency(md,solution,analyses);
+        if verLessThan('matlab', '7.6')
+                checkconsistency(md.(field),md,solution,analyses);
+        else
+                md.(field).checkconsistency(md,solution,analyses);
+        end
 end
 

issm/trunk-jpl/src/m/model/loadresultsfromcluster.m

@@ -13 +13 @@
 
 %Download outputs from the cluster
-cluster.Download(md);
+if verLessThan('matlab', '7.6');
+        Download(cluster,md);
+else
+        cluster.Download(md);
+end
 
 %If we are here, no errors in the solution sequence, call loadresultsfromdisk.

issm/trunk-jpl/src/m/model/marshall.m

@@ -33 +33 @@
         %Marshall current object
         %disp(['marshalling ' field '...']);
-        md.(field).marshall(fid);
+        if verLessThan('matlab', '7.6')
+                marshall(md.(field),fid);
+        else
+                md.(field).marshall(fid);
+        end
 end
 

issm/trunk-jpl/src/m/model/solveparallel.m

@@ -16 +16 @@
         c=clock; md.private.runtimename=sprintf('%s-%i-%i-%i-%i-%i-%i-%i',md.miscellaneous.name,c(2),c(3),c(1),c(4),c(5),floor(c(6)),feature('GetPid'));
 
-        %Now, we need to build the queuing script, used by the cluster to launch the job.
-        cluster.BuildQueueScript(md);
-
-        %Now, launch the queueing script
-        cluster.LaunchQueueJob(md,options);
+        if verLessThan('matlab', '7.6')
+                BuildQueueScript(cluster,md);
+                LaunchQueueJob(cluster,md,options);
+        else
+                cluster.BuildQueueScript(md);
+                cluster.LaunchQueueJob(md,options);
+        end
 
         if ~strcmpi(options.upload,'on'), %did we even try to run? if so, wait on lock