Skip to content

Commit 0080f2c

Browse files
pmoczpmocz
committed
fix conflicts in rebase
1 parent a96eaba commit 0080f2c

File tree

2 files changed

+93
-12
lines changed

2 files changed

+93
-12
lines changed

‎star/private/brunt.f90‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ subroutine do_brunt_B(s,nzlo,nzhi,ierr)
5656

5757
ierr = 0
5858
nz = s% nz
59-
60-
if (.not. s% calculate_Brunt_B) then
61-
call set_nan(s% brunt_B(1:nz))
62-
call set_nan(s% unsmoothed_brunt_B(1:nz))
63-
return
59+
60+
if (s% fill_arrays_with_nans) then
61+
call set_nan(s% brunt_B(nzlo:nzhi))
62+
call set_nan(s% unsmoothed_brunt_B(nzlo:nzhi))
6463
end if
6564

65+
if (.not. s% calculate_Brunt_B) return
66+
6667
if (s% use_other_brunt) then
6768
call s% other_brunt(s% id, ierr)
6869
if (ierr /= 0) then
@@ -88,6 +89,7 @@ subroutine do_brunt_B(s,nzlo,nzhi,ierr)
8889
end do
8990

9091
allocate(smoothing_array(nz))
92+
if(s% fill_arrays_with_nans) call fill_with_nans(smoothing_array)
9193
call smooth_brunt_B(smoothing_array)
9294
if (s% use_other_brunt_smoothing) then
9395
call s% other_brunt_smoothing(s% id, ierr)
@@ -132,15 +134,20 @@ subroutine do_brunt_N2(s,nzlo,nzhi,ierr)
132134
ierr = 0
133135
nz = s% nz
134136

135-
if (.not. (s% calculate_Brunt_B .and. s% calculate_Brunt_N2)) then
136-
call set_nan(s% brunt_N2(1:nz))
137-
call set_nan(s% brunt_N2_composition_term(1:nz))
138-
return
137+
if (s% fill_arrays_with_NaNs) then
138+
call set_nan(s% brunt_N2(nzlo:nzhi))
139+
call set_nan(s% brunt_N2_composition_term(nzlo:nzhi))
139140
end if
140141

142+
if (.not. (s% calculate_Brunt_B .and. s% calculate_Brunt_N2)) return
143+
141144
allocate(rho_P_chiT_chiRho(nz), rho_P_chiT_chiRho_face(nz))
145+
if(s% fill_arrays_with_NaNs) then
146+
call fill_with_nans(rho_P_chiT_chiRho)
147+
call fill_with_nans(rho_P_chiT_chiRho_face)
148+
end if
142149

143-
do k=1,nz
150+
do k=nzlo,nzhi
144151
rho_P_chiT_chiRho(k) = (s% rho(k)/s% Peos(k))*(s% chiT(k)/s% chiRho(k))
145152
! correct for difference between gravitational mass density and baryonic mass density (rho)
146153
if (s% use_mass_corrections) then
@@ -156,7 +163,7 @@ subroutine do_brunt_N2(s,nzlo,nzhi,ierr)
156163
return
157164
end if
158165

159-
do k=1,nz ! clip B and calculate N^2 from B
166+
do k=nzlo,nzhi ! clip B and calculate N^2 from B
160167
if (abs(s% brunt_B(k)) < s% min_magnitude_brunt_B .or. &
161168
s% gradT(k) == 0 .or. is_bad(s% gradT_sub_grada(k))) then
162169
s% brunt_B(k) = 0
@@ -178,7 +185,7 @@ subroutine do_brunt_N2(s,nzlo,nzhi,ierr)
178185
end do
179186

180187
if (s% brunt_N2_coefficient /= 1d0) then
181-
do k=1,nz
188+
do k=nzlo,nzhi
182189
s% brunt_N2(k) = s% brunt_N2_coefficient*s% brunt_N2(k)
183190
s% brunt_N2_composition_term(k) = &
184191
s% brunt_N2_coefficient*s% brunt_N2_composition_term(k)
@@ -210,6 +217,12 @@ subroutine do_brunt_B_MHM_form(s, nzlo, nzhi, ierr)
210217
species = s% species
211218

212219
allocate(T_face(nz), rho_face(nz), chiT_face(nz), chiRho_face(nz))
220+
if(s% fill_arrays_with_nans) then
221+
call fill_with_nans(T_face)
222+
call fill_with_nans(rho_face)
223+
call fill_with_nans(chiT_face)
224+
call fill_with_nans(chiRho_face)
225+
end if
213226

214227
call get_face_values(s, s% chiT, chiT_face, ierr)
215228
if (ierr /= 0) return

‎star/private/rotation_mix_info.f90‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,18 @@ subroutine mix_D_omega
354354

355355
allocate(sig(nz), rhs(nz), d(nz), du(nz), dl(nz), bp(nz), vp(nz), xp(nz), x(nz))
356356

357+
if(s% fill_arrays_with_NaNs) then
358+
call fill_with_NaNs(sig)
359+
call fill_with_NaNs(rhs)
360+
call fill_with_NaNs(d)
361+
call fill_with_NaNs(du)
362+
call fill_with_NaNs(dl)
363+
call fill_with_NaNs(bp)
364+
call fill_with_NaNs(vp)
365+
call fill_with_NaNs(xp)
366+
call fill_with_NaNs(x)
367+
end if
368+
357369
rate = min(s% D_omega_mixing_rate, 1d0/dt)
358370
do k=2,nz-1
359371
if (s% D_omega(k) == 0 .or. s% D_omega(k+1) == 0) then
@@ -479,6 +491,62 @@ subroutine setup(ierr)
479491
smooth_work(nz,num_instabilities), saved(nz,num_instabilities), &
480492
unstable(num_instabilities,nz))
481493

494+
if(s% fill_arrays_with_NaNs) then
495+
call fill_with_NaNs(csound)
496+
call fill_with_NaNs(rho)
497+
call fill_with_NaNs(T)
498+
call fill_with_NaNs(P)
499+
call fill_with_NaNs(cp)
500+
call fill_with_NaNs(cv)
501+
call fill_with_NaNs(chiRho)
502+
call fill_with_NaNs(abar)
503+
call fill_with_NaNs(zbar)
504+
call fill_with_NaNs(opacity)
505+
call fill_with_NaNs(kap_cond)
506+
call fill_with_NaNs(gamma1)
507+
call fill_with_NaNs(mu_alt)
508+
call fill_with_NaNs(omega)
509+
call fill_with_NaNs(cell_dr)
510+
call fill_with_NaNs(eps_nuc)
511+
call fill_with_NaNs(enu)
512+
call fill_with_NaNs(L_neu)
513+
call fill_with_NaNs(gradT_sub_grada)
514+
call fill_with_NaNs(delta)
515+
call fill_with_NaNs(scale_height)
516+
call fill_with_NaNs(dRho)
517+
call fill_with_NaNs(dr)
518+
call fill_with_NaNs(dPressure)
519+
call fill_with_NaNs(domega)
520+
call fill_with_NaNs(d_mu)
521+
call fill_with_NaNs(d_j_rot)
522+
call fill_with_NaNs(dRho_dr)
523+
call fill_with_NaNs(dRho_dr_ad)
524+
call fill_with_NaNs(dr2omega)
525+
call fill_with_NaNs(H_T)
526+
call fill_with_NaNs(domega_dlnR)
527+
call fill_with_NaNs(Hj)
528+
call fill_with_NaNs(dlnR_domega)
529+
call fill_with_NaNs(t_dyn)
530+
call fill_with_NaNs(t_kh)
531+
call fill_with_NaNs(Ri_mu)
532+
call fill_with_NaNs(Ri_T)
533+
call fill_with_NaNs(ve0)
534+
call fill_with_NaNs(ve_mu)
535+
call fill_with_NaNs(v_ssi)
536+
call fill_with_NaNs(h_ssi)
537+
call fill_with_NaNs(Ris_1)
538+
call fill_with_NaNs(Ris_2)
539+
call fill_with_NaNs(v_es)
540+
call fill_with_NaNs(H_es)
541+
call fill_with_NaNs(v_gsf)
542+
call fill_with_NaNs(H_gsf)
543+
call fill_with_NaNs(N2)
544+
call fill_with_NaNs(N2_mu)
545+
call fill_with_NaNs_2d(smooth_work)
546+
call fill_with_NaNs_2d(saved)
547+
end if
548+
549+
482550
! interpolate by mass to get values at cell boundaries
483551
enu00 = s% eps_nuc_neu_total(1) + s% non_nuc_neu(1)
484552
enu(1) = enu00

0 commit comments

Comments
 (0)