Merge branch 'develop'

LLNL · Feb 28, 2018 · e796946 · e796946
2 parents a1faf57 + db0e572
commit e796946
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pynamic-pyMPI-2.6a1/so_generator.py b/pynamic-pyMPI-2.6a1/so_generator.py
@@ -252,7 +252,7 @@ def barrier(self):
 myRank = mpi.rank
 nProcs = mpi.procs
 if myRank == 0:
-    print('Pynamic: Version 1.3')
+    print('Pynamic: Version 1.3.3')
     print('Pynamic: run on %s with %s MPI tasks\\n' %(time.strftime("%x %X"), nProcs))
     if len(sys.argv) > 1:
         start_time = float(sys.argv[1])

diff --git a/pynamic.README b/pynamic.README
@@ -200,7 +200,7 @@
     An optional 4th pynamic-bigexe-pyMPI and 5th pynamic-bigexe-sdb-pyMPI
     executable can be built with the -b option, which is equivalent to
     pynamic-pyMPI and pynamic-sdb-pyMPI respectively, but with extra code to
-    make the base executable much larger.
+    make the base executable much larger (this may take a long time to compile).
 
   3.1 TO TEST
     % python pynamic_driver.py `date +%s`