Changeset 26034 for issm/trunk-jpl/src/m/classes

Timestamp:

02/26/21 10:56:08 (4 years ago)

Author:

jdquinn

Message:

CHG: Modifications to build system and additional configurations in support of Windows 10 MSYS2 MinGW build

Location:

issm/trunk-jpl/src/m/classes/clusters

Files:

• generic.m (modified) (2 diffs)
• localpfe.m (modified) (5 diffs)
• pfe.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/clusters/generic.m

@@ -28 +28 @@
 
                         %Change the defaults if ispc
-                        if ispc,
+                        if ispc & ~ismingw,
                                 cluster.codepath      = [issmdir() '\bin'];
                                 cluster.etcpath       = [issmdir() '\etc'];
@@ -145 +145 @@
 
                                 if cluster.np>1,
-                                        fprintf(fid,'"C:\\Program Files\\MPICH2\\bin\\mpiexec.exe" -n %i "%s/%s" %s ./ %s ',cluster.np,cluster.codepath,executable,solution,modelname);
+                                        % fprintf(fid,'"C:\\Program Files\\MPICH2\\bin\\mpiexec.exe" -n %i "%s/%s" %s ./ %s ',cluster.np,cluster.codepath,executable,solution,modelname);
+                                        fprintf(fid,'"C:\\PROGRA~1\\MICROS~1\\Bin\\mpiexec.exe" -n %i "%s/%s" %s ./ %s ',cluster.np,cluster.codepath,executable,solution,modelname);
                                 else
                                         fprintf(fid,'"%s/%s" %s ./ %s ',cluster.codepath,executable,solution,modelname);

issm/trunk-jpl/src/m/classes/clusters/localpfe.m

@@ -27 +27 @@
                 function cluster=localpfe(varargin) % {{{
 
-                        %Change the defaults if ispc
-                        if ispc,
+                        %Change the defaults if ispc and not ismingw
+                        if ispc & ~ismingw,
                                 cluster.codepath      = [issmdir() '\bin'];
                                 cluster.etcpath       = [issmdir() '\etc'];
@@ -106 +106 @@
                         executable='issm_slc.exe';
 
-                        if ispc(), error('BuildQueueScriptMultipleModels not support yet on windows machines');end;
+                        if ispc & ~ismingw, error('BuildQueueScriptMultipleModels not support yet on windows machines');end;
                         
                         %write queuing script 
@@ -170 +170 @@
 
                         %write queuing script 
-                        if ~ispc(),
+                        if ~ispc,
 
                                 fid=fopen([modelname '.queue'],'w');
@@ -214 +214 @@
                 %}}}
                 function UploadQueueJob(cluster,modelname,dirname,filelist)% {{{
-                        if ~ispc,
+                        if ~ispc | ismingw,
 
                                 %compress the files into one zip.
@@ -262 +262 @@
                 function Download(cluster,dirname,filelist)% {{{
 
-                        if ispc(),
+                        if ispc && ~ismingw,
                                 %do nothing
                                 return;

issm/trunk-jpl/src/m/classes/clusters/pfe.m

@@ -216 +216 @@
                         executable='issm_slc.exe';
 
-                        if ispc(), error('BuildQueueScriptMultipleModels not support yet on windows machines');end;
+                        if ispc & ~ismingw, error('BuildQueueScriptMultipleModels not support yet on windows machines');end;
 
                         %write queuing script