Skip to content

Commit

Permalink
Jeff's PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
jtgasparik committed Jul 12, 2024
1 parent a60f3f9 commit cde4d86
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/aero_rep_factory.F90
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ module camp_aero_rep_factory

!> Identifiers for aerosol representations - used by binary
!! packing/unpacking functions
integer(kind=i_kind), parameter :: AERO_REP_SINGLE_PARTICLE = 1
integer(kind=i_kind), parameter :: AERO_REP_MODAL_BINNED_MASS = 2
integer(kind=i_kind), parameter :: AERO_REP_SINGLE_PARTICLE = 1
integer(kind=i_kind), parameter :: AERO_REP_MODAL_BINNED_MASS = 2

!> Factory type for aerosol representations
!!
Expand Down
4 changes: 2 additions & 2 deletions src/rxns/rxn_HL_phase_transfer.F90
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ subroutine initialize(this, chem_spec_data, aero_rep, n_cells)

! Get the number of Jacobian elements for calculations of mass, volume,
! number, etc. for this partitioning into this phase
phase_ids = aero_rep(i_aero_rep)%val%phase_ids(phase_name,is_at_surface=.true.)
phase_ids = aero_rep(i_aero_rep)%val%phase_ids(phase_name, is_at_surface=.true.)
do i_phase = 1, size(phase_ids)
n_aero_jac_elem = n_aero_jac_elem + &
aero_rep(i_aero_rep)%val%num_jac_elem(phase_ids(i_phase))
Expand Down Expand Up @@ -316,7 +316,7 @@ subroutine initialize(this, chem_spec_data, aero_rep, n_cells)
phase_name = phase_name, spec_name = water_name)

! Get the phase ids for this aerosol phase
phase_ids = aero_rep(i_aero_rep)%val%phase_ids(phase_name,is_at_surface=.true.)
phase_ids = aero_rep(i_aero_rep)%val%phase_ids(phase_name, is_at_surface=.true.)

! Add the species concentration and activity coefficient ids to
! the condensed data, and set the number of jacobian elements for
Expand Down
4 changes: 2 additions & 2 deletions src/rxns/rxn_SIMPOL_phase_transfer.F90
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ subroutine initialize(this, chem_spec_data, aero_rep, n_cells)

! Get the number of Jacobian elements for calculations of mass, volume,
! number, etc. for this partitioning into this phase
phase_ids = aero_rep(i_aero_rep)%val%phase_ids(phase_name,is_at_surface=.true.)
phase_ids = aero_rep(i_aero_rep)%val%phase_ids(phase_name, is_at_surface=.true.)
do i_phase = 1, size(phase_ids)
n_aero_jac_elem = n_aero_jac_elem + &
aero_rep(i_aero_rep)%val%num_jac_elem(phase_ids(i_phase))
Expand Down Expand Up @@ -319,7 +319,7 @@ subroutine initialize(this, chem_spec_data, aero_rep, n_cells)
end if

! Get the phase ids for this aerosol phase
phase_ids = aero_rep(i_aero_rep)%val%phase_ids(phase_name,is_at_surface=.true.)
phase_ids = aero_rep(i_aero_rep)%val%phase_ids(phase_name, is_at_surface=.true.)
! Add the species concentration and activity coefficient ids to
! the condensed data, and set the number of Jacobian elements for
! the aerosol representations and the locations of the real data
Expand Down
2 changes: 1 addition & 1 deletion test/unit_aero_rep_data/test_aero_rep_single_particle.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define AERO_PHASE_IDX ((TEST_PARTICLE-1)*NUM_AERO_PHASE+1)

// number of Jacobian elements used for the test phase
#define N_JAC_ELEM 12
#define N_JAC_ELEM 12

// Test concentrations (kg/m3)
#define CONC_wheat 1.0
Expand Down
2 changes: 1 addition & 1 deletion test/unit_rxn_data/test_HL_phase_transfer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"phase" : "AEROSOL",
"density [kg m-3]" : 1000.0,
"molecular weight [kg mol-1]" : 0.01801
},
},
{
"name" : "aqueous aerosol",
"type" : "AERO_PHASE",
Expand Down
1 change: 0 additions & 1 deletion test/unit_rxn_data/test_aqueous_equilibrium_config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"camp-files" : [
"test_aqueous_equilibrium.json"

]
}

0 comments on commit cde4d86

Please sign in to comment.