Changeset 22770

Timestamp:

05/15/18 08:23:55 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: reverting changes

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/generic.m (modified) (2 diffs)
• classes/clusters/pfe.m (modified) (4 diffs)
• inversions/marshallcostfunctions.m (modified) (1 diff)
• inversions/supportedcontrols.m (modified) (1 diff)
• plot/subplotmodel.m (modified) (1 diff)
• solvers/mumpsoptions.m (modified) (1 diff)

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

@@ -111 +111 @@
                                 else
                                         %Add --gen-suppressions=all to get suppression lines
-                                        %fprintf(fid,'LD_PRELOAD=%s \\\n',cluster.valgrindlib);
+                                        fprintf(fid,'LD_PRELOAD=%s \\\n',cluster.valgrindlib);
                                         if ismac, 
                                                 if IssmConfig('_HAVE_MPI_'),
-                                                        fprintf(fid,'mpiexec -np %i %s --leak-check=full --gen-suppressions=all --error-limit=no --dsymutil=yes --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',...
+                                                        fprintf(fid,'mpiexec -np %i %s --leak-check=full --error-limit=no --dsymutil=yes --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',...
                                                         cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname], modelname,modelname,modelname);
                                                 else
@@ -122 +122 @@
                                         else
                                                 if IssmConfig('_HAVE_MPI_'),
-                                                        fprintf(fid,'mpiexec -np %i %s --leak-check=full --gen-suppressions=all --error-limit=no --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',...
+                                                        fprintf(fid,'mpiexec -np %i %s --leak-check=full --error-limit=no --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',...
                                                         cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname,modelname,modelname);
                                                 else

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

@@ -11 +11 @@
                  name           = 'pfe'
                  login          = '';
-                 modules        = {'comp-intel/2018.0.128' 'mpi-sgi/mpt'};
+                 modules        = {'comp-intel/2016.2.181' 'mpi-sgi/mpt'};
                  numnodes       = 20;
                  cpuspernode    = 8;
@@ -163 +163 @@
                          fprintf(fid,'#PBS -e %s.errlog \n\n',[cluster.executionpath '/' dirname '/' modelname]);
                          fprintf(fid,'. /usr/share/modules/init/bash\n\n');
-                         for i=1:numel(cluster.modules),
-                                 fprintf(fid,['module load ' cluster.modules{i} '\n']);
-                         end
+                         fprintf(fid,'module load comp-intel/2016.2.181\n');
+                         fprintf(fid,'module load mpi-sgi/mpt\n');
                          fprintf(fid,'export PATH="$PATH:."\n\n');
                          fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
-                         fprintf(fid,'export MKL_NUM_THREADS=2\n\n');
                          fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
                          fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
@@ -228 +226 @@
                          fprintf(fid,'#PBS -e %s.errlog \n\n',[cluster.executionpath '/' dirname '/' modelname]);
                          fprintf(fid,'. /usr/share/modules/init/bash\n\n');
-                         for i=1:numel(cluster.modules),
-                                 fprintf(fid,['module load ' cluster.modules{i} '\n']);
-                         end
+                         fprintf(fid,'module load comp-intel/2016.2.181\n');
+                         fprintf(fid,'module load mpi-sgi/mpt\n');
                          fprintf(fid,'export PATH="$PATH:."\n\n');
                          fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
@@ -356 +353 @@
                          fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
                          fprintf(fid,'. /usr/share/modules/init/bash\n\n');
-                         %for i=1:numel(cluster.modules),
-                         %       fprintf(fid,['module load ' cluster.modules{i} '\n']);
-                         %end
                          fprintf(fid,'module load comp-intel/2016.2.181\n');
                          fprintf(fid,'module load netcdf/4.4.1.1_mpt\n');

issm/trunk-jpl/src/m/inversions/marshallcostfunctions.m

@@ -15 +15 @@
         pos=find(cost_functions==510); data(pos) = {'ThicknessPositive'};
         pos=find(cost_functions==601); data(pos) = {'SurfaceAbsMisfit'};
-        pos=find(cost_functions==602); data(pos) = {'OmegaAbsGradient'};
-        pos=find(cost_functions==603); data(pos) = {'EtaDiff'};

issm/trunk-jpl/src/m/inversions/supportedcontrols.m

@@ -2 +2 @@
 
         list = {...
-                'BalancethicknessSpcthickness',...
                 'BalancethicknessThickeningRate',...
                 'FrictionCoefficient',...

issm/trunk-jpl/src/m/plot/subplotmodel.m

@@ -30 +30 @@
                 if(((i-1)*ncols+j)==num)
                         ha = axes('Units','normalized', ...
-                                'Position',[xmin ymin width height]);%,'XTickLabel','','YTickLabel','','Visible','off');
+                                'Position',[xmin ymin width height],'XTickLabel','','YTickLabel','','Visible','off');
                         return
                 end

issm/trunk-jpl/src/m/solvers/mumpsoptions.m

@@ -27 +27 @@
         mumps.pc_factor_mat_solver_package=getfieldvalue(options,'pc_factor_mat_solver_package','mumps');
         mumps.mat_mumps_icntl_14=getfieldvalue(options,'mat_mumps_icntl_14',120);
-
-        %Seems like this one is not needed anymore
         mumps.pc_factor_shift_positive_definite=getfieldvalue(options,'pc_factor_shift_positive_definite','true');
 
         %These 2 lines make raijin break (ptwgts error during solver with PETSc 3.3)
-        %mumps.mat_mumps_icntl_28=2; %1=serial, 2=parallel
-        %mumps.mat_mumps_icntl_29=2; %parallel ordering 1 = ptscotch, 2 = parmetis
+        mumps.mat_mumps_icntl_28=2; %1=serial, 2=parallel
+        mumps.mat_mumps_icntl_29=2; %parallel ordering 1 = ptscotch, 2 = parmetis
 end