Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

factor out shared logic from cool1d_multi_g and calc_tdust_3d_g #21

Open
wants to merge 21 commits into
base: gen2024
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
778175c
fwd `iH2shieldcustom` & `f_shield_custom` args
mabruzzo Dec 17, 2024
e983ad0
address uninitialized memory bug
mabruzzo Dec 19, 2024
42d9bd0
increase max_iterations within cooling_rates.py
mabruzzo Dec 19, 2024
cbf42ac
initialize itmask_tmp for pc=0
mabruzzo Dec 19, 2024
c4638be
calc_tdust_3d_g: remove misc unused variables 1/4
mabruzzo Jan 5, 2025
e55c2f9
calc_tdust_3d_g: remove misc unused variables 2/4
mabruzzo Jan 5, 2025
1f3511f
calc_tdust_3d_g: remove misc unused variables 3/4
mabruzzo Jan 5, 2025
24b313c
calc_tdust_3d_g: remove misc unused variables 4/4
mabruzzo Jan 5, 2025
864c817
calc_tdust_3d_g: cleanup 1st parallel clause
mabruzzo Jan 5, 2025
31c0dac
calc_tdust_3d_g: cleanup 3rd parallel clause
mabruzzo Jan 5, 2025
0add413
calc_tdust_3d_g: remove dust-chem metal species
mabruzzo Jan 5, 2025
0911133
calc_tdust_3d_g: remove metal-chem metal species
mabruzzo Jan 5, 2025
4069d89
calc_tdust_3d_g: adopt more consistent type declarations with other p…
mabruzzo Jan 5, 2025
69dfa73
cool1d_multi_g: tweak dust-related calcs
mabruzzo Jan 5, 2025
8096834
factor out calc_all_tdust_gasgr_1d_g
mabruzzo Jan 5, 2025
047c5a4
calc_all_tdust_gasgr_1d_g: remove some arguments
mabruzzo Jan 5, 2025
34d51bb
remove slightly more arguments.
mabruzzo Jan 5, 2025
9f7ff4c
remove even more args.
mabruzzo Jan 5, 2025
181f5e0
even more tweaks.
mabruzzo Jan 5, 2025
b3fcb99
calc_all_tdust_gasgr_1d_g: rename mynh -> nh
mabruzzo Jan 5, 2025
60dd598
calc_tdust_3d_g: start using calc_grain_size_increment_1d
mabruzzo Jan 5, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove slightly more arguments.
  • Loading branch information
mabruzzo committed Jan 5, 2025
commit 34d51bba8bc0ff8b10a921d50c62d71be893d38e
6 changes: 1 addition & 5 deletions src/clib/calc_all_tdust_gasgr_1d_g.F
Original file line number Diff line number Diff line change
@@ -23,11 +23,7 @@ subroutine calc_all_tdust_gasgr_1d_g(in, jn, kn, nratec,
& kpH2Oice, kptot, gasSiM, gasFeM, gasMg2SiO4,
& gasMgSiO3, gasFe3O4, gasAC, gasSiO2D, gasMgO,
& gasFeS, gasAl2O3, gasreforg, gasvolorg,
& gasH2Oice, gasgr_tSiM, gasgr_tFeM,
& gasgr_tMg2SiO4, gasgr_tMgSiO3, gasgr_tFe3O4,
& gasgr_tAC, gasgr_tSiO2D, gasgr_tMgO, gasgr_tFeS,
& gasgr_tAl2O3, gasgr_treforg, gasgr_tvolorg,
& gasgr_tH2Oice
& gasH2Oice
& )

! PURPOSE:
11 changes: 1 addition & 10 deletions src/clib/cool1d_multi_g.F
Original file line number Diff line number Diff line change
@@ -345,11 +345,6 @@ subroutine cool1d_multi_g(
& , gasSiO2D(in), gasMgO(in), gasFeS(in)
& , gasAl2O3(in)
& , gasreforg(in), gasvolorg(in), gasH2Oice(in)
real*8 gasgr_tSiM(in), gasgr_tFeM(in), gasgr_tMg2SiO4(in)
& , gasgr_tMgSiO3(in), gasgr_tFe3O4(in), gasgr_tAC(in)
& , gasgr_tSiO2D(in), gasgr_tMgO(in), gasgr_tFeS(in)
& , gasgr_tAl2O3(in)
& , gasgr_treforg(in), gasgr_tvolorg(in), gasgr_tH2Oice(in)
! Iteration mask

MASK_TYPE itmask(in), anydust, interp
@@ -1177,11 +1172,7 @@ subroutine cool1d_multi_g(
& kpH2Oice, kptot, gasSiM, gasFeM, gasMg2SiO4,
& gasMgSiO3, gasFe3O4, gasAC, gasSiO2D, gasMgO,
& gasFeS, gasAl2O3, gasreforg, gasvolorg,
& gasH2Oice, gasgr_tSiM, gasgr_tFeM,
& gasgr_tMg2SiO4, gasgr_tMgSiO3, gasgr_tFe3O4,
& gasgr_tAC, gasgr_tSiO2D, gasgr_tMgO, gasgr_tFeS,
& gasgr_tAl2O3, gasgr_treforg, gasgr_tvolorg,
& gasgr_tH2Oice
& gasH2Oice
& )

endif