From 30a6aa3222b5cfd8de8f6926b3a6579ed8dbc543 Mon Sep 17 00:00:00 2001 From: ezlimen Date: Wed, 9 Aug 2023 12:56:23 -0700 Subject: [PATCH 1/3] changed version of cuda to 11.2 and also added devtoolset to be loaded in --- builds/make.host.lux | 2 +- builds/setup.lux.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builds/make.host.lux b/builds/make.host.lux index edf4e42c0..6ce455fcb 100644 --- a/builds/make.host.lux +++ b/builds/make.host.lux @@ -9,7 +9,7 @@ GPUFLAGS = -std=c++17 OMP_NUM_THREADS = 10 #-- Library -CUDA_ROOT = /cm/shared/apps/cuda10.2/toolkit/current +CUDA_ROOT = /cm/shared/apps/cuda11.2/toolkit/current HDF5_ROOT = /cm/shared/apps/hdf5/1.10.6 FFTW_ROOT = /home/brvillas/code/fftw-3.3.8 PFFT_ROOT = /data/groups/comp-astro/bruno/code_mpi_local/pfft diff --git a/builds/setup.lux.sh b/builds/setup.lux.sh index 6d6d408f3..ab3606d66 100755 --- a/builds/setup.lux.sh +++ b/builds/setup.lux.sh @@ -1,6 +1,6 @@ #!/bin/bash -module load hdf5/1.10.6 cuda10.2/10.2 openmpi/4.0.1 +module load hdf5/1.10.6 cuda11.2 openmpi/4.0.1 devtoolset-9 export MACHINE=lux export CHOLLA_ENVSET=1 From 265db2ece5d9812bd5c7a4089b89e25d174f80ad Mon Sep 17 00:00:00 2001 From: evazlimen <109487593+evazlimen@users.noreply.github.com> Date: Fri, 1 Sep 2023 15:01:11 -0700 Subject: [PATCH 2/3] fix parameter files so they can be run without modification -add y and z boundaries = 0 for 1D tests -add z boundaries = 0 for 2D tests -change name of initial conditions to Riemann on noh_1D.txt - change the domain to [-1,1] on Shu_Osher.txt - clarify that the Ryu_and_Jones_1a.txt param file is for test 1a and NOT 4d - change the output directory to the current directory for various 2 and 3D tests: 2D sound wave, 3D uniform, 3d spherical overpressure, 3d spherical collapse --- examples/1D/123.txt | 4 ++++ examples/1D/Creasey_shock.txt | 4 ++++ examples/1D/Shu_Osher.txt | 8 ++++++-- examples/1D/noh_1D.txt | 6 +++++- examples/1D/sound_wave.txt | 4 ++++ examples/1D/square_wave.txt | 4 ++++ examples/1D/stationary.txt | 4 ++++ examples/1D/strong_shock.txt | 4 ++++ examples/1D/test_3.txt | 4 ++++ examples/1D/trac_pen.txt | 4 ++++ examples/1D/two_shocks.txt | 4 ++++ examples/2D/Noh_2D.txt | 2 ++ examples/2D/sod.txt | 2 ++ examples/2D/sound_wave.txt | 3 ++- examples/3D/Ryu_and_Jones_1a.txt | 4 ++-- examples/3D/Spherical_Collapse.txt | 4 +--- examples/3D/Spherical_Overpressure.txt | 3 +-- examples/3D/Uniform.txt | 2 +- 18 files changed, 58 insertions(+), 12 deletions(-) diff --git a/examples/1D/123.txt b/examples/1D/123.txt index 79a3b23a3..3f693baa6 100644 --- a/examples/1D/123.txt +++ b/examples/1D/123.txt @@ -26,6 +26,10 @@ zlen=1.0 # type of boundary conditions xl_bcnd=3 xu_bcnd=3 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/1D/Creasey_shock.txt b/examples/1D/Creasey_shock.txt index f7d98d7dc..59821a945 100644 --- a/examples/1D/Creasey_shock.txt +++ b/examples/1D/Creasey_shock.txt @@ -26,6 +26,10 @@ zlen=3.08567758e18 # type of boundary conditions xl_bcnd=3 xu_bcnd=3 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/1D/Shu_Osher.txt b/examples/1D/Shu_Osher.txt index 5d78eba7d..42d8a7ccb 100644 --- a/examples/1D/Shu_Osher.txt +++ b/examples/1D/Shu_Osher.txt @@ -19,15 +19,19 @@ gamma=1.4 # name of initial conditions init=Shu_Osher # domain properties -xmin=0.0 +xmin=-1.0 ymin=0.0 zmin=0.0 -xlen=1.0 +xlen=2.0 ylen=1.0 zlen=1.0 # type of boundary conditions xl_bcnd=3 xu_bcnd=3 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/1D/noh_1D.txt b/examples/1D/noh_1D.txt index 3e9552295..d350c2479 100644 --- a/examples/1D/noh_1D.txt +++ b/examples/1D/noh_1D.txt @@ -14,7 +14,7 @@ tout=1.0 # time interval for output outstep=1.0 # name of initial conditions -init=Riemann_1D +init=Riemann # domain properties xmin=0.0 ymin=0.0 @@ -25,6 +25,10 @@ zlen=1.0 # type of boundary conditions xl_bcnd=3 xu_bcnd=3 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/1D/sound_wave.txt b/examples/1D/sound_wave.txt index 97b7c92b1..13c6f8d05 100644 --- a/examples/1D/sound_wave.txt +++ b/examples/1D/sound_wave.txt @@ -25,6 +25,10 @@ zlen=1.0 # type of boundary conditions xl_bcnd=1 xu_bcnd=1 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/1D/square_wave.txt b/examples/1D/square_wave.txt index d33805c15..d22282a66 100644 --- a/examples/1D/square_wave.txt +++ b/examples/1D/square_wave.txt @@ -26,6 +26,10 @@ zlen=1.0 # type of boundary conditions xl_bcnd=1 xu_bcnd=1 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/1D/stationary.txt b/examples/1D/stationary.txt index 28941e868..746592847 100644 --- a/examples/1D/stationary.txt +++ b/examples/1D/stationary.txt @@ -27,6 +27,10 @@ zlen=1.0 # type of boundary conditions xl_bcnd=3 xu_bcnd=3 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/1D/strong_shock.txt b/examples/1D/strong_shock.txt index 1726cf316..ff99eab23 100644 --- a/examples/1D/strong_shock.txt +++ b/examples/1D/strong_shock.txt @@ -25,6 +25,10 @@ zlen=1.0 # type of boundary conditions xl_bcnd=3 xu_bcnd=3 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/1D/test_3.txt b/examples/1D/test_3.txt index 60997270c..3eff8abcc 100644 --- a/examples/1D/test_3.txt +++ b/examples/1D/test_3.txt @@ -26,6 +26,10 @@ zlen=1.0 # type of boundary conditions xl_bcnd=3 xu_bcnd=3 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/1D/trac_pen.txt b/examples/1D/trac_pen.txt index 3c0081e5a..a24bf7167 100644 --- a/examples/1D/trac_pen.txt +++ b/examples/1D/trac_pen.txt @@ -26,6 +26,10 @@ zlen=1.0 # type of boundary conditions xl_bcnd=1 xu_bcnd=1 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/1D/two_shocks.txt b/examples/1D/two_shocks.txt index a998bae46..c1ac4616a 100644 --- a/examples/1D/two_shocks.txt +++ b/examples/1D/two_shocks.txt @@ -26,6 +26,10 @@ zlen=1.0 # type of boundary conditions xl_bcnd=3 xu_bcnd=3 +yl_bcnd=0 +yu_bcnd=0 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/2D/Noh_2D.txt b/examples/2D/Noh_2D.txt index 0e43af07d..5223983d5 100644 --- a/examples/2D/Noh_2D.txt +++ b/examples/2D/Noh_2D.txt @@ -29,6 +29,8 @@ xl_bcnd=2 xu_bcnd=4 yl_bcnd=2 yu_bcnd=4 +zl_bcnd=0 +zu_bcnd=0 custom_bcnd=noh # path to output directory outdir=./ diff --git a/examples/2D/sod.txt b/examples/2D/sod.txt index 27df1f256..1f60eab77 100644 --- a/examples/2D/sod.txt +++ b/examples/2D/sod.txt @@ -27,6 +27,8 @@ xl_bcnd=3 xu_bcnd=3 yl_bcnd=3 yu_bcnd=3 +zl_bcnd=0 +zu_bcnd=0 # path to output directory outdir=./ diff --git a/examples/2D/sound_wave.txt b/examples/2D/sound_wave.txt index 58608bac2..109eb8050 100644 --- a/examples/2D/sound_wave.txt +++ b/examples/2D/sound_wave.txt @@ -27,8 +27,9 @@ xl_bcnd=1 xu_bcnd=1 yl_bcnd=1 yu_bcnd=1 +zl_bcnd=0 +zu_bcnd=0 # path to output directory -#outdir=outputs/ outdir=./ ################################################# diff --git a/examples/3D/Ryu_and_Jones_1a.txt b/examples/3D/Ryu_and_Jones_1a.txt index 3b5b44400..c0c73cced 100644 --- a/examples/3D/Ryu_and_Jones_1a.txt +++ b/examples/3D/Ryu_and_Jones_1a.txt @@ -1,10 +1,10 @@ # -# Parameter File for 3D Ryu & Jones MHD shock tube 4d. +# Parameter File for 3D Ryu & Jones MHD shock tube 1a. # Citation: Ryu & Jones 1995 "Numerical Magnetohydrodynamics in Astrophysics: # Algorithms and Tests for One-Dimensional Flow" # # Note: There are many shock tubes in this paper. This settings file is -# specifically for shock tube 4d +# specifically for shock tube 1a # ################################################ diff --git a/examples/3D/Spherical_Collapse.txt b/examples/3D/Spherical_Collapse.txt index 8fad21920..739661216 100644 --- a/examples/3D/Spherical_Collapse.txt +++ b/examples/3D/Spherical_Collapse.txt @@ -32,6 +32,4 @@ yu_bcnd=1 zl_bcnd=1 zu_bcnd=1 # path to output directory -outdir=/data/groups/comp-astro/bruno/cosmo_sims/sphere_collapse/output_files/ -#outdir=/raid/bruno/data/cosmo_sims/cholla_pm/sphere_collapse/ -#outdir=/gpfs/alpine/scratch/bvilasen/ast149/sphere_collapse/output_files/ +outdir=./ diff --git a/examples/3D/Spherical_Overpressure.txt b/examples/3D/Spherical_Overpressure.txt index 7fec56a3b..0e77c4452 100644 --- a/examples/3D/Spherical_Overpressure.txt +++ b/examples/3D/Spherical_Overpressure.txt @@ -32,5 +32,4 @@ yu_bcnd=1 zl_bcnd=1 zu_bcnd=1 # path to output directory -#outdir=/gpfs/alpine/scratch/bvilasen/ast149/sphere_explosion/output_files/ -outdir=/raid/bruno/data/cosmo_sims/cholla_pm/sphere_explosion/ +outdir=./ diff --git a/examples/3D/Uniform.txt b/examples/3D/Uniform.txt index 84fd900f6..e08e76dba 100644 --- a/examples/3D/Uniform.txt +++ b/examples/3D/Uniform.txt @@ -32,4 +32,4 @@ yu_bcnd=1 zl_bcnd=1 zu_bcnd=1 # path to output directory -outdir=/raid/bruno/data/cosmo_sims/cholla_pm/uniform/ +outdir=./ From 1f2b35b9a7c09116913c0d4a7b5c430cc61d979a Mon Sep 17 00:00:00 2001 From: evazlimen <109487593+evazlimen@users.noreply.github.com> Date: Fri, 1 Sep 2023 15:07:05 -0700 Subject: [PATCH 3/3] reset to what cholla/dev has --- builds/make.host.lux | 2 +- builds/setup.lux.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builds/make.host.lux b/builds/make.host.lux index 6ce455fcb..edf4e42c0 100644 --- a/builds/make.host.lux +++ b/builds/make.host.lux @@ -9,7 +9,7 @@ GPUFLAGS = -std=c++17 OMP_NUM_THREADS = 10 #-- Library -CUDA_ROOT = /cm/shared/apps/cuda11.2/toolkit/current +CUDA_ROOT = /cm/shared/apps/cuda10.2/toolkit/current HDF5_ROOT = /cm/shared/apps/hdf5/1.10.6 FFTW_ROOT = /home/brvillas/code/fftw-3.3.8 PFFT_ROOT = /data/groups/comp-astro/bruno/code_mpi_local/pfft diff --git a/builds/setup.lux.sh b/builds/setup.lux.sh index ab3606d66..6d6d408f3 100755 --- a/builds/setup.lux.sh +++ b/builds/setup.lux.sh @@ -1,6 +1,6 @@ #!/bin/bash -module load hdf5/1.10.6 cuda11.2 openmpi/4.0.1 devtoolset-9 +module load hdf5/1.10.6 cuda10.2/10.2 openmpi/4.0.1 export MACHINE=lux export CHOLLA_ENVSET=1