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

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

Files:

• classes/clusters/generic.m (modified) (2 diffs)
• classes/clusters/localpfe.m (modified) (5 diffs)
• classes/clusters/pfe.m (modified) (1 diff)
• dev/devpath.m (modified) (2 diffs)
• os/ismingw.m (added)
• os/issmscpin.m (modified) (1 diff)
• os/issmscpout.m (modified) (2 diffs)
• os/issmssh.m (modified) (1 diff)
• os/oshostname.m (modified) (1 diff)
• solve/loadresultsfromdisk.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 

issm/trunk-jpl/src/m/dev/devpath.m

@@ -3 +3 @@
 
 %Recover ISSM_DIR , or if on a Windows machine, ISSM_DIR_WIN
-if ~ispc,
+if ispc,
+        ISSM_DIR=getenv('ISSM_DIR_WIN');
+else
         ISSM_DIR=getenv('ISSM_DIR');
-else
-        ISSM_DIR=getenv('ISSM_DIR_WIN');
 end
+
 if (isempty(ISSM_DIR)),
         error('''ISSM_DIR'' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!');
@@ -18 +19 @@
 %ISSM path
 addpath([ISSM_DIR '/src/m/os/']); %load recursivepath
-addpath([ISSM_DIR '/lib']);       %load mex
+addpath([ISSM_DIR '/lib']);       %load MEX files
 addpath(recursivepath([ISSM_DIR '/src/m']));
 addpath(recursivepath([ISSM_DIR '/externalpackages/scotch']));

issm/trunk-jpl/src/m/os/issmscpin.m

@@ -18 +18 @@
 %if hostname and host are the same, do a simple copy
 if strcmpi(hostname,host),
-
-    for i=1:numel(packages),
+        for i=1:numel(packages),
                 success=copyfile([path '/' packages{i}]); %keep going, even if success=0
         end
-
 else
-
-        if ispc(),
+        if ispc & ~ismingw,
                 %use the putty project pscp.exe: it should be in the path.
 

issm/trunk-jpl/src/m/os/issmscpout.m

@@ -24 +24 @@
                 system(['rm -rf ' packages{i} ]);
                 if no_symlinks,
-                        system(['cp  ' here '/' packages{i} ' .']);
+                        system(['cp ' here '/' packages{i} ' .']);
                 else
                         system(['ln -s ' here '/' packages{i} ' .']);
@@ -31 +31 @@
         end
 else 
-        if ispc(),
+        if ispc & ~ismingw,
                 %use the putty project pscp.exe: it should be in the path.
 

issm/trunk-jpl/src/m/os/issmssh.m

@@ -12 +12 @@
         system(command);
 else
-        if ispc(),
+        if ispc & ~ismingw,
                 %use the putty project plink.exe: it should be in the path.
 

issm/trunk-jpl/src/m/os/oshostname.m

@@ -22 +22 @@
 %Method 3, last chance
 if isempty(hostname),
-        if ispc
+        if ispc % If OS is MinGW, $COMPUTERNAME and $HOSTNAME are identical
                 hostname = getenv('COMPUTERNAME');
         else

issm/trunk-jpl/src/m/solve/loadresultsfromdisk.m

@@ -12 +12 @@
 
 if ~md.qmu.isdakota,
-
         %Check that file exists
         if ~exist(filename,'file'),