Skip to content

Commit 10b2209

Browse files
mrodrig6Sawyer Remillardsawyer-remmcarcanaNazarii Koval
authored
Hypoelasticity to HLLC, preliminary features for RMT (update) (#727)
Co-authored-by: Sawyer Remillard <[email protected]> Co-authored-by: Sawyer Remillard <[email protected]> Co-authored-by: Mirelys Carcana Barbosa <[email protected]> Co-authored-by: Nazarii Koval <[email protected]> Co-authored-by: Nazarii Koval <[email protected]> Co-authored-by: mcarcana <[email protected]> Co-authored-by: Avery Trevino <[email protected]> Co-authored-by: Ben Wilfong <[email protected]> Co-authored-by: Spencer Bryngelson <[email protected]> Co-authored-by: wilfonba <[email protected]>
1 parent 108805c commit 10b2209

File tree

75 files changed

+5378
-939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+5378
-939
lines changed

‎.github/workflows/lint-source.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ jobs:
3636

3737
- name: No double precision intrinsics
3838
run: |
39-
! grep -iR 'dexp\|dlog\|dble\|dabs\|double\ precision\|real(8)\|real(4)\|dprod\|dmin\|dmax\|dfloat\|dreal\|dcos\|dsin\|dtan\|dsign\|dtanh\|dsinh\|dcosh\|\.d0\|\dd0' --exclude-dir=syscheck ./src/*
39+
! grep -iR 'dsqrt\|dexp\|dlog\|dble\|dabs\|double\ precision\|real(8)\|real(4)\|dprod\|dmin\|dmax\|dfloat\|dreal\|dcos\|dsin\|dtan\|dsign\|dtanh\|dsinh\|dcosh\|d0' --exclude-dir=syscheck --exclude="*nvtx*" ./src/*
40+

‎.github/workflows/test.yml‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,32 +67,21 @@ jobs:
6767
- name: Setup Ubuntu (Intel)
6868
if: matrix.os == 'ubuntu' && matrix.intel == true
6969
run: |
70-
sudo apt update -y
71-
sudo apt install -y tar wget make cmake python3 python3-dev
7270
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
7371
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
74-
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
75-
sudo echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
72+
sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
7673
sudo apt-get update
77-
sudo apt-get install -y intel-oneapi-common-vars intel-oneapi-compiler-fortran-2022.1.0 intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-2022.1.0 intel-oneapi-mkl-2021.4.0 intel-oneapi-mpi-2021.7.1 intel-oneapi-mpi-devel-2021.7.1
74+
sudo apt-get install -y intel-oneapi-compiler-fortran intel-oneapi-mpi intel-oneapi-mpi-devel
7875
source /opt/intel/oneapi/setvars.sh
79-
echo "CXX=$(which icpc)" >> $GITHUB_ENV
80-
echo "CC=$(which icc)" >> $GITHUB_ENV
81-
echo "FC=$(which ifort)" >> $GITHUB_ENV
82-
echo "OMPI_FC=$(which ifort)" >> $GITHUB_ENV
83-
echo "OMPI_CXX=$(which icpc)" >> $GITHUB_ENV
84-
echo "OMPI_MPICC=$(which icc)" >> $GITHUB_ENV
85-
echo "MPI_HOME=/opt/intel/oneapi/mpi/2021.7.1/" >> $GITHUB_ENV
86-
echo "I_MPI_ROOT=/opt/intel/oneapi/mpi/2021.7.1/" >> $GITHUB_ENV
76+
printenv >> $GITHUB_ENV
77+
8778
8879
- name: Build
8980
run: |
90-
if [ '${{ matrix.intel }}' == 'true' ]; then . /opt/intel/oneapi/setvars.sh; fi
9181
/bin/bash mfc.sh build -j $(nproc) --${{ matrix.debug }} --${{ matrix.mpi }} --${{ matrix.precision }}
9282
9383
- name: Test
9484
run: |
95-
if [ '${{ matrix.intel }}' == 'true' ]; then . /opt/intel/oneapi/setvars.sh; fi
9685
/bin/bash mfc.sh test --max-attempts 3 -j $(nproc) $OPT1 $OPT2
9786
env:
9887
OPT1: ${{ matrix.mpi == 'mpi' && '--test-all' || '' }}
@@ -142,4 +131,4 @@ jobs:
142131
if: always()
143132
with:
144133
name: logs-${{ strategy.job-index }}-${{ matrix.device }}
145-
path: test-${{ matrix.device }}.out
134+
path: test-${{ matrix.device }}.out

‎benchmarks/hypo_hll/case.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979

8080
# Turning on Hypoelasticity ================================
8181
'hypoelasticity' : 'T',
82+
'fd_order' : 4,
8283
# ==========================================================
8384

8485
# Formatted Database Files Structure Parameters ============

‎benchmarks/ibm/case.py‎

Lines changed: 63 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -35,101 +35,102 @@
3535

3636
# Configuring case dictionary
3737
print(json.dumps({
38-
# Logistics ================================================
39-
'run_time_info' : 'F',
38+
# Logistics ================================================
39+
'run_time_info' : 'F',
4040
# ==========================================================
41-
41+
4242
# Computational Domain Parameters ==========================
43-
'x_domain%beg' : 0.E+00,
44-
'x_domain%end' : 1.E+00,
43+
'x_domain%beg' : 0.E+00,
44+
'x_domain%end' : 1.E+00,
4545
'y_domain%beg' : 0,
4646
'y_domain%end' : 0.5,
4747
'z_domain%beg' : 0.,
48-
'z_domain%end' : 0.5,
49-
'm' : Nx,
50-
'n' : Ny,
51-
'p' : Nz,
52-
'dt' : mydt,
53-
't_step_start' : 0,
48+
'z_domain%end' : 0.5,
49+
'm' : Nx,
50+
'n' : Ny,
51+
'p' : Nz,
52+
'dt' : mydt,
53+
't_step_start' : 0,
5454
't_step_stop' : int(20*(95*size + 5)),
5555
't_step_save' : int(20*(95*size + 5)),
56-
# ==========================================================
57-
56+
# ==========================================================
57+
5858
# Simulation Algorithm Parameters ==========================
59-
'num_patches' : 2,
60-
'model_eqns' : 2,
61-
'alt_soundspeed' : 'F',
62-
'num_fluids' : 1,
63-
'mpp_lim' : 'F',
64-
'mixture_err' : 'F',
65-
'time_stepper' : 3,
66-
'weno_order' : 5,
59+
'num_patches' : 2,
60+
'model_eqns' : 2,
61+
'alt_soundspeed' : 'F',
62+
'num_fluids' : 1,
63+
'mpp_lim' : 'F',
64+
'mixture_err' : 'F',
65+
'time_stepper' : 3,
66+
'weno_order' : 5,
6767
'weno_eps' : 1.E-16,
68-
'weno_Re_flux' : 'F',
68+
'weno_Re_flux' : 'F',
6969
'weno_avg' : 'F',
70-
'mapped_weno' : 'F',
71-
'null_weights' : 'F',
72-
'mp_weno' : 'F',
73-
'riemann_solver' : 1,
74-
'wave_speeds' : 1,
75-
'avg_state' : 2,
76-
'bc_x%beg' : -3,
70+
'mapped_weno' : 'F',
71+
'null_weights' : 'F',
72+
'mp_weno' : 'F',
73+
'riemann_solver' : 1,
74+
'wave_speeds' : 1,
75+
'avg_state' : 2,
76+
'bc_x%beg' : -3,
7777
'bc_x%end' : -3,
7878
'bc_y%beg' : -3,
7979
'bc_y%end' : -3,
8080
'bc_z%beg' : -3,
81-
'bc_z%end' : -3,
81+
'bc_z%end' : -3,
8282
# ==========================================================
8383

8484
# Turning on Hypoelasticity ================================
85-
'hypoelasticity' : 'T',
85+
'hypoelasticity' : 'T',
86+
'fd_order' : 4,
8687
# ==========================================================
87-
88+
8889
# Formatted Database Files Structure Parameters ============
89-
'format' : 1,
90-
'precision' : 2,
91-
'prim_vars_wrt' :'T',
92-
'parallel_io' :'T',
93-
# ==========================================================
94-
95-
# Patch 1 L ================================================
96-
'patch_icpp(1)%geometry' : 9,
97-
'patch_icpp(1)%x_centroid' : 0.25,
90+
'format' : 1,
91+
'precision' : 2,
92+
'prim_vars_wrt' :'T',
93+
'parallel_io' :'T',
94+
# ==========================================================
95+
96+
# Patch 1 L ================================================
97+
'patch_icpp(1)%geometry' : 9,
98+
'patch_icpp(1)%x_centroid' : 0.25,
9899
'patch_icpp(1)%y_centroid' : 0.25,
99-
'patch_icpp(1)%z_centroid' : 0.25,
100+
'patch_icpp(1)%z_centroid' : 0.25,
100101
'patch_icpp(1)%length_x' : 0.5,
101102
'patch_icpp(1)%length_y' : 0.5,
102-
'patch_icpp(1)%length_z' : 0.5,
103-
'patch_icpp(1)%vel(1)' : 0.0,
103+
'patch_icpp(1)%length_z' : 0.5,
104+
'patch_icpp(1)%vel(1)' : 0.0,
104105
'patch_icpp(1)%vel(2)' : 0,
105-
'patch_icpp(1)%vel(3)' : 0,
106-
'patch_icpp(1)%pres' : 1.E+8,
107-
'patch_icpp(1)%alpha_rho(1)' : 1000,
108-
'patch_icpp(1)%alpha(1)' : 1.,
109-
'patch_icpp(1)%tau_e(1)' : 0.0,
106+
'patch_icpp(1)%vel(3)' : 0,
107+
'patch_icpp(1)%pres' : 1.E+8,
108+
'patch_icpp(1)%alpha_rho(1)' : 1000,
109+
'patch_icpp(1)%alpha(1)' : 1.,
110+
'patch_icpp(1)%tau_e(1)' : 0.0,
110111
# ==========================================================
111112

112113
# Patch 2 R ================================================
113-
'patch_icpp(2)%geometry' : 9,
114+
'patch_icpp(2)%geometry' : 9,
114115
'patch_icpp(2)%x_centroid' : 0.75,
115116
'patch_icpp(2)%y_centroid' : 0.25,
116-
'patch_icpp(2)%z_centroid' : 0.25,
117-
'patch_icpp(2)%length_x' : 0.5,
117+
'patch_icpp(2)%z_centroid' : 0.25,
118+
'patch_icpp(2)%length_x' : 0.5,
118119
'patch_icpp(2)%length_y' : 0.5,
119-
'patch_icpp(2)%length_z' : 0.5,
120-
'patch_icpp(2)%vel(1)' : 0,
120+
'patch_icpp(2)%length_z' : 0.5,
121+
'patch_icpp(2)%vel(1)' : 0,
121122
'patch_icpp(2)%vel(2)' : 0,
122-
'patch_icpp(2)%vel(3)' : 0,
123-
'patch_icpp(2)%pres' : 1.E+05,
124-
'patch_icpp(2)%alpha_rho(1)' : 1000,
125-
'patch_icpp(2)%alpha(1)' : 1.,
126-
'patch_icpp(2)%tau_e(1)' : 0.0,
123+
'patch_icpp(2)%vel(3)' : 0,
124+
'patch_icpp(2)%pres' : 1.E+05,
125+
'patch_icpp(2)%alpha_rho(1)' : 1000,
126+
'patch_icpp(2)%alpha(1)' : 1.,
127+
'patch_icpp(2)%tau_e(1)' : 0.0,
127128
# ==========================================================
128129

129130
# Fluids Physical Parameters ===============================
130-
'fluid_pp(1)%gamma' : 1.E+00/(4.4E+00-1.E+00),
131-
'fluid_pp(1)%pi_inf' : 4.4E+00*6.E+08/(4.4E+00 - 1.E+00),
132-
'fluid_pp(1)%G' : 10E+09,
131+
'fluid_pp(1)%gamma' : 1.E+00/(4.4E+00-1.E+00),
132+
'fluid_pp(1)%pi_inf' : 4.4E+00*6.E+08/(4.4E+00 - 1.E+00),
133+
'fluid_pp(1)%G' : 10E+09,
133134
# ==========================================================
134135
}))
135136
# ==============================================================================

0 commit comments

Comments
 (0)