Changeset 24657

Timestamp:

03/12/20 06:20:36 (5 years ago)

Author:

bdef

Message:

BUG:fix on SLURM keyword and treatment of masked array in import from netCDF

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/stallo.m (modified) (1 diff)
• classes/clusters/stallo.py (modified) (1 diff)
• io/loadvars.py (modified) (5 diffs)

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

@@ -106 +106 @@
                          fprintf(fid,'#!/bin/bash -l\n');
                          fprintf(fid,'#SBATCH --job-name=%s \n',modelname);
-                         fprintf(fid,'#SBATCH --partiion=%s \n',cluster.queue);
+                         fprintf(fid,'#SBATCH --qos=%s \n',cluster.queue);
                          fprintf(fid,'#SBATCH --nodes=%i \n',cluster.numnodes);
                          fprintf(fid,'#SBATCH --ntasks-per-node=%i \n',cluster.cpuspernode);

issm/trunk-jpl/src/m/classes/clusters/stallo.py

@@ -114 +114 @@
         fid.write('#!/bin/bash -l\n')
         fid.write('#SBATCH --job-name=%s \n' % shortname)
-        fid.write('#SBATCH --partition=%s \n' % self.queue)
+        fid.write('#SBATCH --qos=%s \n' % self.queue)
         fid.write('#SBATCH --nodes=%i \n' % self.numnodes)
         fid.write('#SBATCH --ntasks-per-node=%i \n' % self.cpuspernode)

issm/trunk-jpl/src/m/io/loadvars.py

@@ -127 +127 @@
                                 t = int(indexlist[i])
                                 if listtype == 'dict':
-                                    Tree[t][str(var)] = varval[0]
-
-                                else:
-                                    Tree[t].__dict__[str(var)] = varval[0]
+                                    Tree[t][str(var)] = varval[0].data
+
+                                else:
+                                    Tree[t].__dict__[str(var)] = varval[0].data
 
                             else:
@@ -144 +144 @@
                                 else:
                                     Tree.__dict__[str(var)] = varval[0].item()
-
                         elif vardim == 1:
                             if varval.dtype == str:
@@ -160 +159 @@
                                     t = int(indexlist[i])
                                     if listtype == 'dict':
-                                        Tree[t][str(var)] = varval[:]
+                                        Tree[t][str(var)] = varval[:].data
 
                                     else:
-                                        Tree[t].__dict__[str(var)] = varval[:]
-
+                                        Tree[t].__dict__[str(var)] = varval[:].data
                                 else:
                                     try:
@@ -189 +187 @@
                                     t = int(indexlist[i])
                                     if listtype == 'dict':
-                                        Tree[t][str(var)] = varval[:, :]
+                                        Tree[t][str(var)] = varval[:, :].data
                                     else:
-                                        Tree[t].__dict__[str(var)] = varval[:, :]
+                                        Tree[t].__dict__[str(var)] = varval[:, :].data
                                 else:
                                     Tree.__dict__[str(var)] = varval[:, :].data
@@ -198 +196 @@
                                 t = int(indexlist[i])
                                 if listtype == 'dict':
-                                    Tree[t][str(var)] = varval[:, :, :]
+                                    Tree[t][str(var)] = varval[:, :, :].data
                                 else:
                                     Tree[t].__dict__[str(var)] = varval[:, :, :]