Skip to content

Commit

Permalink
make camp happy by passing aero_state
Browse files Browse the repository at this point in the history
  • Loading branch information
jcurtis2 committed Aug 8, 2023
1 parent 0c4529f commit 3e1f407
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/partmc.F90
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ subroutine partmc_part(file)
aero_state_init, gas_data, gas_state_init, env_state_init, &
aero_dist_init, scenario, &
#ifdef PMC_USE_CAMP
camp_core, photolysis, &
camp_core, photolysis, aero_state, &
#endif
n_part, rand_init, do_init_equilibrate, do_restart)

Expand Down
6 changes: 4 additions & 2 deletions src/run_part.F90
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ subroutine spec_file_read_run_part(file, run_part_opt, aero_data, &
aero_state_init, gas_data, gas_state_init, env_state_init, &
aero_dist_init, scenario, &
#ifdef PMC_USE_CAMP
camp_core, photolysis, &
camp_core, photolysis, aero_state, &
#endif
n_part, rand_init, do_init_equilibrate, do_restart)

Expand All @@ -470,6 +470,8 @@ subroutine spec_file_read_run_part(file, run_part_opt, aero_data, &
type(camp_core_t), pointer :: camp_core
!> Photolysis calculator.
type(photolysis_t), pointer :: photolysis
!> Aerosol state.
type(aero_state_t), intent(inout) :: aero_state
#endif
!> Ideal number of computational particles.
real(kind=dp), intent(inout) :: n_part
Expand Down Expand Up @@ -550,7 +552,7 @@ subroutine spec_file_read_run_part(file, run_part_opt, aero_data, &
else
#ifdef PMC_USE_CAMP
call aero_data_initialize(aero_data, camp_core)
call aero_state_initialize(aero_state_init, aero_data, camp_core)
call aero_state_initialize(aero_state, aero_data, camp_core)
#endif
end if
call spec_file_read_fractal(file, aero_data%fractal)
Expand Down

0 comments on commit 3e1f407

Please sign in to comment.