Skip to content

Commit 78c608a

Browse files
zingalezingale
committed
Merge branch 'development'
2 parents eb2ada4 + 4c44a8e commit 78c608a

Some content is hidden

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

50 files changed

+28196
-1267
lines changed

‎.mailmap‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ Donald Willcox <[email protected]> Donald E. Willcox <[email protected]
66
Donald Willcox <[email protected]> Donald E. Willcox <[email protected]>
77
Donald Willcox <[email protected]> Donald E. Willcox <[email protected]>
88
Abigail Bishop <[email protected]> abigailbishop <[email protected]>
9-
Sydney Andrews <[email protected]> sandshrews <[email protected]>
9+
Sydney Andrews <[email protected]> sandshrews <[email protected]>
10+
Xinlong Li <[email protected]> Xinlong <[email protected]>
11+
Xinlong Li <[email protected]> sailoridy <[email protected]>
12+
Xinlong Li <[email protected]> sailor <[email protected]>

‎.zenodo.json‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"creators": [
3+
{
4+
"name": "the StarKiller Microphysics Development Team"
5+
},
6+
{ "affiliation": "Stony Brook University",
7+
"name": "Bishop, Abigail",
8+
"orcid": "0000-0002-0375-644X"
9+
},
10+
{ "affiliation": "Michigan State University",
11+
"name": "Fields, Carl E.",
12+
"orcid": "0000-0002-8925-057X"
13+
},
14+
{
15+
"affiliation": "Michigan State University",
16+
"name": "Jacobs, Adam M.",
17+
"orcid": "0000-0002-3580-2420"
18+
},
19+
{
20+
"affiliation": "NVIDIA Corporation",
21+
"name": "Katz, Maximilian",
22+
"orcid": "0000-0003-0439-4556"
23+
},
24+
{
25+
"affiliation": "Los Alamos National Laboratory",
26+
"name": "Malone, Chris",
27+
"orcid": "0000-0002-4045-7932"
28+
},
29+
{
30+
"affiliation": "Arizona State University",
31+
"name": "Timmes, Frank",
32+
"orcid": "0000-0002-0474-159X"
33+
},
34+
{
35+
"affiliation": "Center for Computational Sciences and Engineering, Lawrence Berkeley National Laboratory",
36+
"name": "Willcox, Donald",
37+
"orcid": "0000-0003-2300-5165"
38+
},
39+
{
40+
"affiliation": "Department of Physics and Astronomy, Stony Brook University",
41+
"name": "Zingale, Michael",
42+
"orcid": "0000-0001-8401-030X"
43+
}
44+
],
45+
"keywords": [
46+
"astrophysics"
47+
]
48+
}

‎Make.Microphysics‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ ifdef USE_CUDA
3434
ifeq ($(USE_CUDA),TRUE)
3535
MANAGED_PROBIN_FLAG := --managed
3636
USE_GPU_PRAGMA = TRUE
37+
DEFINES += -DCUDA
3738
endif
3839
endif
3940

‎integration/BS/_parameters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ scaling_method integer 2
66
# use the VODE algorithm's initial timestep estimator?
77
use_timestep_estimator logical .false.
88

9-
# Maximum number of steps to use in the ODE integration
10-
ode_max_steps integer 10000
11-
129
# Floor to use for the ODE scaling vector
1310
ode_scale_floor real 1.d-6
1411

‎integration/VODE/_parameters‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
# maximum number of timesteps
2-
ode_max_steps integer 150000
31

‎integration/VODE90/_parameters‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
# Whether to use Jacobian caching in VODE90
2-
use_jacobian_caching logical .true.

‎integration/VODE90/cuVODE/source/cuvode_dvnlsd.F90‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ subroutine dvnlsd(IWM, NFLAG, rwork, vstate)
8080
! -----------------------------------------------------------------------
8181
!
8282
use vode_rhs_module, only: f_rhs, jac
83+
#ifdef CLEAN_INTEGRATOR_CORRECTION
84+
use vode_type_module, only: clean_state
85+
#endif
8386
use cuvode_dvnorm_module, only: dvnorm ! function
8487

8588
implicit none
@@ -192,12 +195,31 @@ subroutine dvnlsd(IWM, NFLAG, rwork, vstate)
192195
CSCALE = TWO/(ONE + vstate % RC)
193196
CALL DSCALN (VODE_NEQS, CSCALE, vstate % Y, 1)
194197
ENDIF
198+
199+
#ifdef CLEAN_INTEGRATOR_CORRECTION
200+
! Clean the correction to Y. Use vstate % Y as scratch space.
201+
202+
! Find the corrected Y: Yc = Y_previous + Y_delta
203+
do I = 1,VODE_NEQS
204+
vstate % Y(I) = vstate % Y(I) + (rwork % YH(I,1) + rwork % ACOR(I))
205+
end do
206+
207+
! Clean the corrected Y: Yc' = clean(Yc)
208+
call clean_state(vstate % Y, vstate % RPAR)
209+
210+
! Find the cleaned correction: clean(Y_delta) = Yc' - Y_previous
211+
do I = 1,VODE_NEQS
212+
vstate % Y(I) = vstate % Y(I) - (rwork % YH(I,1) + rwork % ACOR(I))
213+
end do
214+
#endif
215+
195216
DEL = DVNORM (vstate % Y, rwork % EWT)
196217
call daxpyn(VODE_NEQS, ONE, vstate % Y, 1, rwork % acor, 1)
197218

198219
do I = 1,VODE_NEQS
199220
vstate % Y(I) = rwork % YH(I,1) + rwork % ACOR(I)
200221
end do
222+
201223
! -----------------------------------------------------------------------
202224
! Test for convergence. If M .gt. 0, an estimate of the convergence
203225
! rate constant is stored in CRATE, and this is used in the test.

‎integration/_parameters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,9 @@ react_boost real -1.d0
9999
reactions_density_scale real 1.d0
100100
reactions_temperature_scale real 1.d0
101101
reactions_energy_scale real 1.d0
102+
103+
# maximum number of timesteps for VODE
104+
ode_max_steps integer 150000
105+
106+
# Whether to use Jacobian caching in VODE90
107+
use_jacobian_caching logical .true.

0 commit comments

Comments
 (0)