diff --git a/.github/workflows/joss-paper.yaml b/.github/workflows/joss-paper.yaml index d320739..bfd393e 100644 --- a/.github/workflows/joss-paper.yaml +++ b/.github/workflows/joss-paper.yaml @@ -16,7 +16,7 @@ jobs: # This should be the path to the paper within your repo. paper-path: paper/paper.md - name: Upload - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: paper # This is the output path where Pandoc will write the compiled diff --git a/.github/workflows/run-grdzhadzha-tests-intel.yml b/.github/workflows/run-grdzhadzha-tests-intel.yml index 84ea6bb..add3ae6 100644 --- a/.github/workflows/run-grdzhadzha-tests-intel.yml +++ b/.github/workflows/run-grdzhadzha-tests-intel.yml @@ -64,17 +64,17 @@ jobs: run: | source /opt/intel/oneapi/setvars.sh cp $GRCHOMBO_HOME/InstallNotes/MakeDefsLocalExamples/intel-classic-no-hdf5-minimal.Make.defs.local $CHOMBO_HOME/mk/Make.defs.local - make -j 4 AMRTimeDependent AMRTools BaseTools BoxTools $BUILD_ARGS + make -j 4 AMRTimeDependent AMRTools BaseTools BoxTools working-directory: ${{ env.CHOMBO_HOME }} - name: Build GRDzhadzha Tests run: | source /opt/intel/oneapi/setvars.sh - make test -j 4 $BUILD_ARGS + make test -j 4 working-directory: ${{ github.workspace }}/GRDzhadzha - name: Run GRDzhadzha Tests run: | source /opt/intel/oneapi/setvars.sh - make run -j 2 $BUILD_ARGS + make run -j 2 working-directory: ${{ github.workspace }}/GRDzhadzha diff --git a/Examples/BoostedBHComplexScalar/params.txt b/Examples/BoostedBHComplexScalar/params.txt index 26c35bf..c1c504d 100755 --- a/Examples/BoostedBHComplexScalar/params.txt +++ b/Examples/BoostedBHComplexScalar/params.txt @@ -7,7 +7,7 @@ verbosity = 0 # location / naming of output files -output_path = "/nfs/st01/hpc-gr-epss/eaf49/PR-dump" # Main path for all files. Must exist! +output_path = "" # Main path for all files. Must exist! chk_prefix = BoostedBH_ plot_prefix = BoostedBHp_ # restart_file = BoostedBH_000000.3d.hdf5 diff --git a/Examples/BoostedBHComplexScalar/plot_conservation.py b/Examples/BoostedBHComplexScalar/plot_conservation.py index 4f68399..8436ca2 100644 --- a/Examples/BoostedBHComplexScalar/plot_conservation.py +++ b/Examples/BoostedBHComplexScalar/plot_conservation.py @@ -12,15 +12,13 @@ plt.rcParams.update({'figure.figsize' : '6, 4.2'}) plt.rcParams.update({'figure.autolayout': True}) -symmetry = 4.0 - EMS = np.loadtxt('data/EnergyIntegrals.dat') F = np.loadtxt('data/FluxIntegrals.dat') timedata = EMS[:,0][1:] dt = timedata[1] - timedata[0] -E = EMS[:,1][1:]*symmetry -M = EMS[:,2][1:]*symmetry -S = EMS[:,3][1:]*symmetry +E = EMS[:,1][1:] +M = EMS[:,2][1:] +S = EMS[:,3][1:] E0 = E-E[0] M0 = M-M[0] FEi = F[:,1]