Merge pull request #1119 from sirocco-rt/version

Clean up names of executables, replase Setup_Py_Dir

.github/workflows/build.yml

@@ -53,7 +53,7 @@ jobs:
     - name: Checking Sirocco compiled and can read in inputs correctly
       run: |
         cd $SIROCCO/examples/gh-workflow/
-        $SIROCCO/bin/Setup_Py_Dir
+        $SIROCCO/bin/Setup_Sirocco_Dir
         $SIROCCO/bin/sirocco -i cv_macro_benchmark
         $SIROCCO/bin/sirocco -i cv_standard
         $SIROCCO/bin/sirocco -i fiducial_agn

source/Makefile

@@ -272,43 +272,43 @@ run_indent:
 swind: startup $(swind_objects) $(CUDA_OBJECTS)
 	$(CC) $(CFLAGS) $(swind_objects) $(CUDA_OBJECTS) $(LDFLAGS) -o swind
 	cp $@ $(BIN)
-	mv $@ $(BIN)/swind$(VERSION)
+	mv $@ $(BIN)/swind-$(VERSION)
 	@if [ $(INDENT) = yes ] ; then  ../py_progs/run_indent.py -changed ; fi
 
 windsave2table: startup $(table_objects) $(CUDA_OBJECTS)
 	$(CC) $(CFLAGS) $(table_objects) $(CUDA_OBJECTS) $(LDFLAGS) -o windsave2table
 	cp $@ $(BIN)
-	mv $@ $(BIN)/windsave2table$(VERSION)
+	mv $@ $(BIN)/windsave2table-$(VERSION)
 	@if [ $(INDENT) = yes ] ; then  ../py_progs/run_indent.py -changed ; fi
 
 windsave2fits: startup $(windsave2fits_objects) $(CUDA_OBJECTS)
 	$(CC) $(CFLAGS) $(windsave2fits_objects) $(CUDA_OBJECTS) $(LDFLAGS) -lcfitsio -o windsave2fits 
 	cp $@ $(BIN)
-	mv $@ $(BIN)/windsave2fits$(VERSION)
+	mv $@ $(BIN)/windsave2fits-$(VERSION)
 	@if [ $(INDENT) = yes ] ; then  ../py_progs/run_indent.py -changed ; fi
 
 rad_hydro_files: startup $(rhf_objects) $(CUDA_OBJECTS)
 	$(CC) $(CFLAGS) $(rhf_objects) $(CUDA_OBJECTS) $(LDFLAGS) -o rad_hydro_files
 	cp $@ $(BIN)
-	mv $@ $(BIN)/rad_hydro_files$(VERSION)
+	mv $@ $(BIN)/rad_hydro_files-$(VERSION)
 	@if [ $(INDENT) = yes ] ; then  ../py_progs/run_indent.py -changed ; fi
 
 modify_wind: startup $(modify_wind_objects) $(CUDA_OBJECTS)
 	$(CC) $(CFLAGS) $(modify_wind_objects) $(CUDA_OBJECTS) $(LDFLAGS) -o modify_wind
 	cp $@ $(BIN)
-	mv $@ $(BIN)/modify_wind$(VERSION)
+	mv $@ $(BIN)/modify_wind-$(VERSION)
 	@if [ $(INDENT) = yes ] ; then  ../py_progs/run_indent.py -changed ; fi
 
 inspect_wind: startup $(inspect_wind_objects) $(CUDA_OBJECTS)
 	$(CC) $(CFLAGS) $(inspect_wind_objects) $(CUDA_OBJECTS) $(LDFLAGS)  -o inspect_wind
 	cp $@ $(BIN)
-	mv $@ $(BIN)/inspect_wind$(VERSION)
+	mv $@ $(BIN)/inspect_wind-$(VERSION)
 	@if [ $(INDENT) = yes ] ; then  ../py_progs/run_indent.py -changed ; fi
 
 sirocco_optd: startup $(sirocco_optd_obj) $(CUDA_OBJECTS)
 	$(CC) $(CFLAGS) $(sirocco_optd_obj) $(CUDA_OBJECTS) $(LDFLAGS) -o $@
 	cp $@ $(BIN)
-	mv $@ $(BIN)/sirocco_optd$(VERSION)
+	mv $@ $(BIN)/sirocco_optd-$(VERSION)
 	@if [ $(INDENT) = yes ] ; then  ../py_progs/run_indent.py -changed ; fi
 
 # unit_tests allows one to test low level routines, but one must be aware that one needs to define

source/setup.c

@@ -906,7 +906,7 @@ setup_dfudge ()
 void
 setup_atomic_data (const char *atomic_filename)
 {
-  int rc;                       // Return code from running Setup_Py_Dir
+  int rc;                       // Return code from running Setup_Sirocco_Dir
   struct stat file_stat;        // Used to check the atomic data exists
   char answer[LINELENGTH];
 
@@ -924,19 +924,19 @@ setup_atomic_data (const char *atomic_filename)
   /*
    * Check that geo.atomic_filename exists - i.e. that the directory is readable
    * and in the directory Python is being executed from. If it isn't - then
-   * try to run Setup_Py_Dir. If both fail, then warn the user and exit Python
+   * try to run Setup_Sirocco_Dir. If both fail, then warn the user and exit Python
    */
 
   if (stat (atomic_filename, &file_stat))
   {
     Log ("Unable to open atomic masterfile %s\n", atomic_filename);
-    Log ("Running Setup_Py_Dir to try and fix the situation\n");
+    Log ("Running Setup_Sirocco_Dir to try and fix the situation\n");
     if (rank_global == 0)
     {
-      rc = system ("Setup_Py_Dir");
+      rc = system ("Setup_Sirocco_Dir");
       if (rc)
       {
-        Error ("Unable to open %s and run Setup_Py_Dir\n", atomic_filename);
+        Error ("Unable to open %s and run Setup_Sirocco_Dir\n", atomic_filename);
         Exit (1);
       }
     }

source/windsave.c

@@ -215,7 +215,7 @@ wind_read (filename)
 
   if (stat (geo.atomic_filename, &file_stat))
   {
-    if (system ("Setup_Py_Dir"))
+    if (system ("Setup_Sirocco_Dir"))
     {
       Error ("Unable to open %s or create link for atomic data\n", geo.atomic_filename);
       Exit (1);
@@ -498,8 +498,9 @@ spec_read (filename)
     Exit (EXIT_FAILURE);
   }
 
-  Log ("Reading specfile %s with %d spectra and %d wavelength bins, created with sirocco version %s and currently using sirocco version %s\n",
-       filename, nspectra, NWAVE_EXTRACT, version, VERSION);
+  Log
+    ("Reading specfile %s with %d spectra and %d wavelength bins, created with sirocco version %s and currently using sirocco version %s\n",
+     filename, nspectra, NWAVE_EXTRACT, version, VERSION);
 
   /* First allocate space */