Reorganize CCE static exec tarball

This will require us to edit the python file in the google drive
sxs-collaboration · Oct 4, 2024 · e17305c · e17305c
1 parent adb7afd
commit e17305c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 17 deletions.
diff --git a/.github/workflows/DeployStaticExecutables.yaml b/.github/workflows/DeployStaticExecutables.yaml
@@ -53,38 +53,50 @@ jobs:
           gdown \
           "https://drive.google.com/uc?id=1uaESVdylNmcHwpZwogX4TVrNs8JbWNF1"
           gdown \
-          "https://drive.google.com/uc?id=1rfzjtXtrP9pQE2az3935uN0z_5aSF1hy"
+          "https://drive.google.com/uc?id=1yYMM4PVUec9pIjKTxI4aCpo0Umqconr8"
       - name: Copy CCE executables from the container
         run: >
-          mkdir CceExecutables
+          mkdir CceExecutables;
+          mkdir ./CceExecutables/ReduceCceWorldtube;
+          mkdir ./CceExecutables/Tests;
 
           cp ./tests/InputFiles/Cce/CharacteristicExtract.yaml
           ./CceExecutables/CharacteristicExtract.yaml
 
           cp ./tests/InputFiles/ReduceCceWorldtube/ReduceCceWorldtube.yaml
-          ./CceExecutables/ReduceCceWorldtube.yaml
+          ./CceExecutables/ReduceCceWorldtube/ReduceCceWorldtube.yaml
 
-          for i in CharacteristicExtract ReduceCceWorldtube; do
-            docker cp static-execs:/work/spectre/build/bin/$i ./CceExecutables;
-          done
+          docker cp
+          static-execs:/work/spectre/build/bin/CharacteristicExtract
+          ./CceExecutables/
+
+          docker cp static-execs:/work/spectre/build/bin/ReduceCceWorldtube
+          ./CceExecutables/ReduceCceWorldtube/
       - name: Test CCE executable outside of container
         run: |
-          sed -i 's/CceR0257/BondiSachsCceR0200/g' \
+          mv BondiSachsCceR0200.h5 ./CceExecutables/Tests/
+          mv CheckCceOutput.py ./CceExecutables/Tests/
+          mv CharacteristicExtractReduction_Expected.h5 \
+          ./CceExecutables/Tests/
+
+          sed -i 's/CceR0257/Tests\/BondiSachsCceR0200/g' \
           ./CceExecutables/CharacteristicExtract.yaml
           sed -i 's/H5IsBondiData: False/H5IsBondiData: True/g' \
           ./CceExecutables/CharacteristicExtract.yaml
-          ./CceExecutables/CharacteristicExtract \
-          --input-file ./CceExecutables/CharacteristicExtract.yaml
-          python ./CheckCceOutput.py
+
+          cd ./CceExecutables/
+
+          ./CharacteristicExtract \
+          --input-file ./CharacteristicExtract.yaml
+          python ./Tests/CheckCceOutput.py
           rm CharacteristicExtractReduction.h5
+
+          cd ../
       - name: Create CCE executables release asset
         # Note: We use xz compression since it's much better than gzip, even
         # though it's a decent bit slower. Specifically, xz is two thirds the
         # size of gzip.
         run:  |
-          mv BondiSachsCceR0200.h5 ./CceExecutables/
-          mv CharacteristicExtractReduction_Expected.h5 ./CceExecutables/
-          mv CheckCceOutput.py ./CceExecutables/
           tar cJf CceExecutables.tar.xz CceExecutables
       - name: Upload to release
         uses: softprops/action-gh-release@v2

diff --git a/docs/Tutorials/CCE.md b/docs/Tutorials/CCE.md
@@ -20,12 +20,16 @@ of the release (there may be a lot of text detailing what's been updated in this
 release). Inside this tarball is
 
 - the CCE executable `CharacteristicExtract`
-- an example set of Bondi-Sachs worldtube data (see
-   [Input worldtube data formats](#input_worldtube_data_formats) section)
 - an example YAML input file
-- example output from CCE
+- an example set of Bondi-Sachs worldtube data in the `Tests/` directory (see
+   [Input worldtube data formats](#input_worldtube_data_formats) section)
+- example output from CCE in the `Tests/` directory
 - a `ReduceCceWorldtube` executable and YAML file for converting between
-   [worldtube data formats](#input_worldtube_data_formats)
+   [worldtube data formats](#input_worldtube_data_formats) in the
+   `ReduceCceWorldtube/` diretory
+- a python script `CheckCceOutput.py` (meant to be run from the root of the
+  tarball and after you run the example YAML input file also in the root of the
+  tarball) that will check if the example output is correct
 
 \note The tarball is `.xz` so use `tar -xf TarName.tar.xz` to extract. The `-z`
 flag to use gzip will cause an error.