Changeset 24465

Timestamp:

12/10/19 21:44:25 (5 years ago)

Author:

schlegel

Message:

CHG: load old model partitions, extrude thickness_obs, and include pfe conditions requested by nas

Location:

issm/trunk-jpl/src/m/classes

Files:

• clusters/pfe.m (modified) (2 diffs)
• model.m (modified) (1 diff)
• model.py (modified) (1 diff)
• qmu.m (modified) (1 diff)

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

@@ -165 +165 @@
                          for i=1:numel(cluster.modules), fprintf(fid,['module load ' cluster.modules{i} '\n']); end
                          fprintf(fid,'export PATH="$PATH:."\n\n');
+                         fprintf(fid,'export MPI_LAUNCH_TIMEOUT=520\n');
                          fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
                          fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
@@ -170 +171 @@
                          fprintf(fid,'cd %s/%s/\n\n',cluster.executionpath,dirname);
                          if ~isvalgrind,
-                                 fprintf(fid,'mpiexec -np %i %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
+                                 fprintf(fid,'/u/scicon/tools/bin/several_tries mpiexec -np %i /u/scicon/tools/bin/mbind.x -cs -n%i %s/%s %s %s %s\n',cluster.np,cluster.cpuspernode,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);
                          else
                                  fprintf(fid,'mpiexec -np %i valgrind --leak-check=full %s/%s %s %s %s\n',cluster.np,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname);

issm/trunk-jpl/src/m/classes/model.m

@@ -253 +253 @@
                         if ~isnan(md.inversion.vy_obs), md.inversion.vy_obs=project2d(md,md.inversion.vy_obs,md.mesh.numberoflayers); end;
                         if ~isnan(md.inversion.vel_obs), md.inversion.vel_obs=project2d(md,md.inversion.vel_obs,md.mesh.numberoflayers); end;
+                        if ~isnan(md.inversion.thickness_obs), md.inversion.thickness_obs=project2d(md,md.inversion.thickness_obs,md.mesh.numberoflayers); end;
                         if ~isnan(md.inversion.cost_functions_coefficients), md.inversion.cost_functions_coefficients=project2d(md,md.inversion.cost_functions_coefficients,md.mesh.numberoflayers); end;
                         if numel(md.inversion.min_parameters)>1, md.inversion.min_parameters=project2d(md,md.inversion.min_parameters,md.mesh.numberoflayers); end;

issm/trunk-jpl/src/m/classes/model.py

@@ -741 +741 @@
         if not np.isnan(md.inversion.vel_obs).all():
             md.inversion.vel_obs = project2d(md, md.inversion.vel_obs, md.mesh.numberoflayers)
+        if not np.isnan(md.inversion.thickness_obs).all():
+            md.inversion.thickness_obs = project2d(md, md.inversion.thickness_obs, md.mesh.numberoflayers)
         if not np.isnan(md.inversion.cost_functions_coefficients).all():
             md.inversion.cost_functions_coefficients = project2d(md, md.inversion.cost_functions_coefficients, md.mesh.numberoflayers)

issm/trunk-jpl/src/m/classes/qmu.m

@@ -25 +25 @@
                 vertex_weight               = NaN;
         end
+        methods (Static)
+                function self = loadobj(self) % {{{
+                        % This function is directly called by matlab when a model object is
+                        % loaded. If the input is a struct it is an old version of this class and
+                        % old fields must be recovered (make sure they are in the deprecated
+                        % model properties)
+
+                        if verLessThan('matlab','7.9'),
+                                disp('Warning: your matlab version is old and there is a risk that load does not work correctly');
+                                disp('         if the model is not loaded correctly, rename temporarily loadobj so that matlab does not use it');
+
+                                % This is a Matlab bug: all the fields of md have their default value
+                                % Example of error message:
+                                % Warning: Error loading an object of class 'model':
+                                % Undefined function or method 'exist' for input arguments of type 'cell'
+                                %
+                                % This has been fixed in MATLAB 7.9 (R2009b) and later versions
+                        end
+
+                        if isstruct(self)
+                                disp('Recovering qmu from older version');
+                                objstruct = self;
+                                self = structtoobj(qmu(),objstruct);
+
+                                %2019 Dec 7th
+                                if isfield(objstruct,'partition'),      self.vpartition     = objstruct.partition;       end;
+                        end
+
+                end% }}}
+        end
         methods
                 function self = extrude(self,md) % {{{