solstice-pp

commit 83bebebf379519979f99f6f55f754c224885971d
parent c67fd6f865f9d91dcf12e042c5dfa9c1c53d4ea3
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Tue, 23 Jun 2026 15:01:08 +0200

Fix examples

Example were broken by the changes in the -D option of solstice.

Diffstat:
M
cyl/Makefile
 | 
9
++++++---
M
themis/Makefile
 | 
11
+++++++----

2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/cyl/Makefile b/cyl/Makefile
@@ -29,13 +29,16 @@ SIMUL = simul
 default: run
 
 simul: $(INPUT)
-	solstice -D$(SUN_DIRS) -n$(NEXPERIMENTS) -R$(RCV) -fo $(SIMUL) $(INPUT)
-	solstice -D$(SUN_DIRS) -g format=obj:split=geometry -fo $(GEOM) $(INPUT)
+	solstice $$(for d in $(SUN_DIRS); do echo -f "-D$${d} "; done) \
+		-n$(NEXPERIMENTS) -R$(RCV) -fo $(SIMUL) $(INPUT)
+	solstice $$(for d in $(SUN_DIRS); do echo -f "-D$${d} "; done) \
+		-g format=obj:split=geometry -fo $(GEOM) $(INPUT)
 	../solppraw $(SIMUL)
 	../solpp $(GEOM) $(SIMUL)
 
 paths: $(PROG) $(INPUT)
-	solstice -D$(SUN_DIRS) -q -n$(NPATHS) -R$(RCV) -p default $(INPUT) | ../solpaths
+	solstice $$(for d in $(SUN_DIRS); do echo -f "-D$${d} "; done) \
+		-q -n$(NPATHS) -R$(RCV) -p default $(INPUT) | ../solpaths
 
 run: paths simul
 
diff --git a/themis/Makefile b/themis/Makefile
@@ -19,7 +19,7 @@ include ../config.mk
 
 NEXPERIMENTS = 1000000
 NPATHS = 30
-SUN_DIRS = 270,30:160,40
+SUN_DIRS = 270,30 160,40
 
 RCV = themis-rcv.yaml
 INPUT = themis.yaml
@@ -29,13 +29,16 @@ SIMUL = simul
 default: run
 
 simul: $(INPUT) $(PROG)
-	solstice -D$(SUN_DIRS) -n$(NEXPERIMENTS) -R$(RCV) -fo $(SIMUL) $(INPUT)
-	solstice -D$(SUN_DIRS) -g format=obj:split=geometry -fo $(GEOM) $(INPUT)
+	solstice $$(for d in $(SUN_DIRS); do echo -f "-D$${d} "; done) \
+		-n$(NEXPERIMENTS) -R$(RCV) -fo $(SIMUL) $(INPUT)
+	solstice $$(for d in $(SUN_DIRS); do echo -f "-D$${d} "; done) \
+		-g format=obj:split=geometry -fo $(GEOM) $(INPUT)
 	../solppraw $(SIMUL)
 	../solpp $(GEOM) $(SIMUL)
 
 paths: $(PROG) $(INPUT)
-	solstice -D$(SUN_DIRS) -q -n$(NPATHS) -R$(RCV) -p default $(INPUT) | ../solpaths
+	solstice $$(for d in $(SUN_DIRS); do echo -f "-D$${d} "; done) \
+		-q -n$(NPATHS) -R$(RCV) -p default $(INPUT) | ../solpaths
 
 run: paths simul