Changeset 26853

Timestamp:

02/07/22 04:40:54 (3 years ago)

Author:

bdef

Message:

CHG: CHanges to have conformity in hostnames with matlab

Location:

issm/trunk-jpl/src/m

Files:

• miscellaneous/MatlabFuncs.py (modified) (8 diffs)
• os/issmscpin.py (modified) (1 diff)
• os/issmscpout.py (modified) (2 diffs)
• os/issmssh.py (modified) (1 diff)

issm/trunk-jpl/src/m/miscellaneous/MatlabFuncs.py

@@ -2 +2 @@
 functions of the same, respective name.
 
-Where possible, users are encouraged to use native and/or the most efficient 
-methods in Python, but we provide these functions as a way to make translations 
+Where possible, users are encouraged to use native and/or the most efficient
+methods in Python, but we provide these functions as a way to make translations
 from the MATLAB to the Python ISSM API more seamless.
 """
@@ -82 +82 @@
 
 def cosdsingle(x):  # {{{
-    """function cosdsingle - Helper function for cosd to reduce repetition of 
+    """function cosdsingle - Helper function for cosd to reduce repetition of
     logic
 
@@ -162 +162 @@
     NOTE:
     - Only the following functionality is currently implemented:
-        - C = intersect(A,B) returns the data common to both A and B, with no 
+        - C = intersect(A,B) returns the data common to both A and B, with no
         repetitions. C is in sorted order.
 
@@ -175 +175 @@
 
     NOTE:
-    - Takes a type as its second argument (in contrast to the MATLAB function 
+    - Takes a type as its second argument (in contrast to the MATLAB function
     that it replicates, which takes a string representing the name of a type)
     """
@@ -204 +204 @@
 def ismember(a, s):  # {{{
     import numpy as np
-
     if not isinstance(s, (tuple, list, dict, np.ndarray)):
         s = [s]
@@ -215 +214 @@
     else:
         if not isinstance(s, np.ndarray):
-            b = np.empty_like(a)
+            b = np.empty_like(a).flat
             for i, item in enumerate(a.flat):
-                b.flat[i] = item in s
+                b[i] = item in s
         else:
             b = np.in1d(a.flat, s.flat).reshape(a.shape)
-
     return b
 # }}}
@@ -272 +270 @@
 def oshostname():  # {{{
     import socket
-
-    return socket.gethostname()
+    hostname = socket.gethostname()
+
+    return hostname.lower()
 # }}}
 
@@ -298 +297 @@
 
 def sindsingle(x):  # {{{
-    """function sindsingle - Helper function for sind to reduce repetition of 
+    """function sindsingle - Helper function for sind to reduce repetition of
     logic
 

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

@@ -22 +22 @@
             pass
     #if hostname and host are the same, do a simple copy
-    if hostname == host:
+    if strcmpi(hostname, host):  #hostname == host:
         for package in packages:
             try:

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

@@ -1 +1 @@
 import os
-from socket import gethostname
 import subprocess
 from MatlabFuncs import *
@@ -17 +16 @@
     #if hostname and host are the same, do a simple copy
 
-    if host == hostname:
+    if strcmpi(host, hostname):  #host == hostname:
         for package in packages:
             here = os.getcwd()

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

@@ -37 +37 @@
                 subprocess.call('ssh -l %s -p %d localhost "%s"' % (login, port, command), shell=True)
             else:
-                subprocess.call('ssh -l %s %s "%s"' % (login, host, command), shell=True)
+                subprocess.call('ssh -l {} {} "{}"'.format(login, host, command), shell=True)
 
     # The following code was added to fix: