Changeset 11995 for issm/trunk/src/m/model/solveparallel.m

Timestamp:

04/16/12 14:57:18 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11994M

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src/m/model/solveparallel.m (modified) (1 diff)

issm/trunk

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

issm/trunk/src/m/model/solveparallel.m

@@ -11 +11 @@
         md=loadresultsfromcluster(md);
 else
+
+        %In parallel mode, we need to make sure we have PETSC support, otherwise, we run with only one cpu: 
+        if ~ispetsc,
+                disp('PETSC support not included, running on 1 cpu only!');
+                cluster.np=1;
+        end
 
         %First, build a runtime name that is unique, that we will use to create 

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in