Changeset 895 for trunk/src/series.m

Timestamp:

May 20, 2015, 11:21:25 AM (8 years ago)

Author:

sommeria

Message:

 

File:

• trunk/src/series.m (modified) (4 diffs)

trunk/src/series.m

@@ -1481 +1481 @@
     [success,message]=copyfile(fullfile(path_series,'PARAM.xml.default'),xmlfile);
 end
-RunTime='';
+% RunTime='';
 if strcmp(ActionExt,'.sh')
     if exist(xmlfile,'file')
         s=xml2struct(xmlfile);
         if strcmp(RunMode,'cluster_oar') && isfield(s,'BatchParam')
-            if isfield(s.BatchParam,'RunTime')
-                RunTime=s.BatchParam.RunTime;
-            end
+%             if isfield(s.BatchParam,'RunTime')
+%                 RunTime=s.BatchParam.RunTime;
+%             end
             if isfield(s.BatchParam,'NbCore')
                 NbCore=s.BatchParam.NbCore;
             end
         elseif (strcmp(RunMode,'background')||strcmp(RunMode,'local')) && isfield(s,'RunParam')
-            if isfield(s.RunParam,'RunTime')
-                RunTime=s.RunParam.RunTime;
-            end
+%             if isfield(s.RunParam,'RunTime')
+%                 RunTime=s.RunParam.RunTime;
+%             end
             if isfield(s.RunParam,'NbCore')
                 NbCore=s.RunParam.NbCore;
@@ -1501 +1501 @@
         end
     end
-    if isempty(RunTime) && strcmp(RunMode,'cluster_oar')
-       errormsg='RunTime name not found in PARAM.xml, compiled version .sh cannot run on cluster';
-        return
-    end
+%     if isempty(RunTime) && strcmp(RunMode,'cluster_oar')
+%        errormsg='RunTime name not found in PARAM.xml, compiled version .sh cannot run on cluster';
+%         return
+%     end
 end
 
@@ -1515 +1515 @@
     set(handles.series,'Pointer','watch') % set the mouse pointer to 'watch'
     set(handles.ActionExt,'BackgroundColor',[1 1 0])
-    ActionFullName=fullfile(get(handles.ActionPath,'String'),[ActionName '.sh']);
+    hver=ver('MATLAB');
+    MCRROOT=['MCRROOT' regexprep(hver.Version,'\.','')];%suppress the dot in version number
+    RunTime = getenv(MCRROOT);
+    ActionNameVersion=[ActionName '_' MCRROOT];
+    ActionFullName=fullfile(get(handles.ActionPath,'String'),[ActionNameVersion '.sh']);
     if ~exist(ActionFullName,'file')
         answer=msgbox_uvmat('INPUT_Y-N','compiled version has not been created: compile now?');
@@ -1531 +1535 @@
         end       
     else
-        sh_file_info=dir(fullfile(get(handles.ActionPath,'String'),[ActionName '.sh']));
+        sh_file_info=dir(fullfile(get(handles.ActionPath,'String'),[ActionNameVersion '.sh']));
         m_file_info=dir(fullfile(get(handles.ActionPath,'String'),[ActionName '.m']));
         if isfield(m_file_info,'datenum') && m_file_info.datenum>sh_file_info.datenum
             set(handles.ActionExt,'BackgroundColor',[1 1 0])
             drawnow
-            answer=msgbox_uvmat('INPUT_Y-N',[ActionName '.sh needs to be updated: recompile now?']);
+            answer=msgbox_uvmat('INPUT_Y-N',[ActionNameVersion '.sh needs to be updated: recompile now?']);
             if strcmp(answer,'Yes')
                 path_uvmat=fileparts(which('series'));