Merge branch 'master' of https://github.com/teuben/nemo

teuben · Nov 20, 2023 · ce5ce03 · ce5ce03
2 parents 75a6a22 + 3dd69f4
commit ce5ce03
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/docs/whatsnew.html b/docs/whatsnew.html
@@ -24,7 +24,8 @@ <H1> What's New in NEMO </H1>
 <A NAME=4_4_1>
 
 <H2> 4.4.2:  in github</H2>
-  <UL>
+<UL>
+  <LI> (Oct 12, 2023) fix density of hackdens, which assumed mass = nbody
   <LI> (Oct 11, 2023) add  qtrun as modern alternative to tkrun
   <LI> (Jul 7, 2023) python install now places the python_start.[c]sh scripts inside the anaconda3 directory
   </UL>

diff --git a/src/tutor/main/nemomain.c b/src/tutor/main/nemomain.c
@@ -13,6 +13,7 @@
  *  22-oct-90	V1.0	Created		    PJT
  *  21-may-92	V1.1	added usage	    PJT
  *  12-feb-95   V1.2    added format=       PJT
+ *  30-aug-23   V1.3    added a,b,c         PJT
  */
 
 #include <stdinc.h>                             /* standard NEMO include */

diff --git a/text/savekeys.design b/text/savekeys.design
@@ -102,6 +102,9 @@ is a filename controlled with the PPID, which in bash should be something like
    export NEMOVAR=/dev/shm/nemovar_$$.$USER
 
 Writing should be done with an exclusive lock. Reading can be done at will.
+This implies - for the simple file based version - that this system cannot
+be used for pipe, viz.
+
 
 
 

diff --git a/usr/jfwallin/Makefile b/usr/jfwallin/Makefile
@@ -22,4 +22,4 @@ install: JSPAM
 
 run1:
 	jspam
-	(rm a.snap; tabtos a.101 a.snap block1=pos,vel)
+	(rm a.snap; tabtos a.101 a.snap block1=pos,vel; snapplot3 a.snap)
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,4 +22,4 @@ install: JSPAM @@
     run1:
     	jspam
-    	(rm a.snap; tabtos a.101 a.snap block1=pos,vel)
+    	(rm a.snap; tabtos a.101 a.snap block1=pos,vel; snapplot3 a.snap)