Skip to content

Replace a single loop, and a few changes are needed for the small kernel PR #473

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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Replace a single loop, and a few changes are needed for the small kernel PR #473

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab0e899
Replace arrays of ColumnView with a 2D view. Use template parameters …
odiazib Aug 1, 2025
3bd41e1
Fixing compilation errors in validation tests and applying clang-format.
odiazib Oct 29, 2025
a14c823
MAM4xx: Adding the size of the view.
odiazib Oct 30, 2025
998eb20
MAM4xx: Adding for loop.
odiazib Oct 30, 2025
7013325
MAM4xx: Fixing bug.
odiazib Nov 6, 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
43 changes: 20 additions & 23 deletions src/mam4xx/gas_chem.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,18 @@ void imp_slv_inti(Real epsilon[clscnt4]) {
epsilon[i] = rel_err;
}
}

KOKKOS_INLINE_FUNCTION
void newton_raphson_iter(const Real dti, const Real lin_jac[nzcnt],
const Real lrxt[rxntot],
const Real lhet[gas_pcnst], // in
const Real iter_invariant[clscnt4], // in
const bool factor[itermax],
const int permute_4[gas_pcnst],
const int clsmap_4[gas_pcnst], Real lsol[gas_pcnst],
Real solution[clscnt4], // inout
bool converged[clscnt4], bool &convergence, // out
Real prod[clscnt4], Real loss[clscnt4],
Real max_delta[clscnt4],
// work array
Real epsilon[clscnt4]) {
template <typename VectorType>
KOKKOS_INLINE_FUNCTION void newton_raphson_iter(
const Real dti, const Real lin_jac[nzcnt], const Real lrxt[rxntot],
const Real lhet[gas_pcnst], // in
const Real iter_invariant[clscnt4], // in
const bool factor[itermax], const int permute_4[gas_pcnst],
const int clsmap_4[gas_pcnst], VectorType &lsol,
Real solution[clscnt4], // inout
bool converged[clscnt4], bool &convergence, // out
Real prod[clscnt4], Real loss[clscnt4], Real max_delta[clscnt4],
// work array
Real epsilon[clscnt4]) {

// dti := 1 / dt
// lrxt := reaction rates in 1D array [1/cm^3/s]
Expand Down Expand Up @@ -239,14 +236,14 @@ void newton_raphson_iter(const Real dti, const Real lin_jac[nzcnt],
} // end if (nr_iter > 0)
} // end nr_iter loop
} // newton_raphson_iter() function

KOKKOS_INLINE_FUNCTION
void imp_sol(Real base_sol[gas_pcnst], // inout - species mixing ratios [vmr]
const Real reaction_rates[rxntot], const Real het_rates[gas_pcnst],
const Real extfrc[extcnt], const Real &delt,
const int permute_4[gas_pcnst], const int clsmap_4[gas_pcnst],
const bool factor[itermax], Real epsilon[clscnt4],
Real prod_out[clscnt4], Real loss_out[clscnt4]) {
template <typename VectorType>
KOKKOS_INLINE_FUNCTION void
imp_sol(VectorType &base_sol, // inout - species mixing ratios [vmr]
const Real reaction_rates[rxntot], const Real het_rates[gas_pcnst],
const Real extfrc[extcnt], const Real &delt,
const int permute_4[gas_pcnst], const int clsmap_4[gas_pcnst],
const bool factor[itermax], Real epsilon[clscnt4],
Real prod_out[clscnt4], Real loss_out[clscnt4]) {

// ---------------------------------------------------------------------------
// ... imp_sol advances the volumetric mixing ratio
Expand Down
75 changes: 14 additions & 61 deletions src/mam4xx/gas_chem_mechanism.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,70 +84,23 @@ void adjrxt(Real rate[rxntot], const Real inv[nfs], const Real m) {
// TODO: the lines of concern *kind of* bear resemblance to the similarly
// concerning lines in linmat(), though it's difficult to tell if that results
// in consistent units
KOKKOS_INLINE_FUNCTION
void imp_prod_loss(Real prod[clscnt4], Real loss[clscnt4], Real y[gas_pcnst],
const Real rxt[rxntot], const Real het_rates[gas_pcnst]) {
template <typename VectorType>
KOKKOS_INLINE_FUNCTION void
imp_prod_loss(Real prod[clscnt4], Real loss[clscnt4], VectorType &y,
const Real rxt[rxntot], const Real het_rates[gas_pcnst]) {
const Real zero = 0;
loss[0] = (+het_rates[1] + rxt[0] + rxt[2]) * (+y[1]);
loss[0] = (het_rates[1] + rxt[0] + rxt[2]) * y[1];
prod[0] = zero;
loss[1] = (+het_rates[2]) * (+y[2]);
prod[1] = (+rxt[3]) * (+y[3]);
loss[2] = (+het_rates[3] + rxt[3]) * (+y[3]);
prod[2] = (+rxt[4] + 0.500000 * rxt[5] + rxt[6]) * (+y[4]);
loss[3] = (+het_rates[4] + rxt[4] + rxt[5] + rxt[6]) * (+y[4]);
loss[1] = het_rates[2] * y[2];
prod[1] = rxt[3] * y[3];
loss[2] = (het_rates[3] + rxt[3]) * y[3];
prod[2] = (rxt[4] + 0.500000 * rxt[5] + rxt[6]) * y[4];
loss[3] = (het_rates[4] + rxt[4] + rxt[5] + rxt[6]) * y[4];
prod[3] = zero;
loss[4] = (+het_rates[5]) * (+y[5]);
prod[4] = zero;
loss[5] = (+het_rates[6]) * (+y[6]);
prod[5] = zero;
loss[6] = (+het_rates[7]) * (+y[7]);
prod[6] = zero;
loss[7] = (+het_rates[8]) * (+y[8]);
prod[7] = zero;
loss[8] = (+het_rates[9]) * (+y[9]);
prod[8] = zero;
loss[9] = (+het_rates[10]) * (+y[10]);
prod[9] = zero;
loss[10] = (+het_rates[11]) * (+y[11]);
prod[10] = zero;
loss[11] = (+het_rates[12]) * (+y[12]);
prod[11] = zero;
loss[12] = (+het_rates[13]) * (+y[13]);
prod[12] = zero;
loss[13] = (+het_rates[14]) * (+y[14]);
prod[13] = zero;
loss[14] = (+het_rates[15]) * (+y[15]);
prod[14] = zero;
loss[15] = (+het_rates[16]) * (+y[16]);
prod[15] = zero;
loss[16] = (+het_rates[17]) * (+y[17]);
prod[16] = zero;
loss[17] = (+het_rates[18]) * (+y[18]);
prod[17] = zero;
loss[18] = (+het_rates[19]) * (+y[19]);
prod[18] = zero;
loss[19] = (+het_rates[20]) * (+y[20]);
prod[19] = zero;
loss[20] = (+het_rates[21]) * (+y[21]);
prod[20] = zero;
loss[21] = (+het_rates[22]) * (+y[22]);
prod[21] = zero;
loss[22] = (+het_rates[23]) * (+y[23]);
prod[22] = zero;
loss[23] = (+het_rates[24]) * (+y[24]);
prod[23] = zero;
loss[24] = (+het_rates[25]) * (+y[25]);
prod[24] = zero;
loss[25] = (+het_rates[26]) * (+y[26]);
prod[25] = zero;
loss[26] = (+het_rates[27]) * (+y[27]);
prod[26] = zero;
loss[27] = (+het_rates[28]) * (+y[28]);
prod[27] = zero;
loss[28] = (+het_rates[29]) * (+y[29]);
prod[28] = zero;
loss[29] = (+het_rates[30]) * (+y[30]);
prod[29] = zero;
for (int i = 4; i < 31; ++i) {
loss[i] = het_rates[i + 1] * y[i + 1];
prod[i] = zero;
}
Copy link
Contributor

@singhbalwinder singhbalwinder Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for removing the redundant + signs. Could you clarify why the loop runs up to 31? The extent of prod and loss arrays is clscnt4, where constexpr int clscnt4 = 30; // number of species in implicit class? It will be better to replace 31 (or any other extent) using variables like clscnt4.

Copy link
Contributor Author

@odiazib odiazib Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be clscnt4. Thanks for finding this bug.

} // imp_prod_loss

KOKKOS_INLINE_FUNCTION
Expand Down
6 changes: 3 additions & 3 deletions src/mam4xx/gas_phase_chemistry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ using mam4::gas_chemistry::indexm;

// performs gas phase chemistry calculations on a single level of a single
// atmospheric column
KOKKOS_INLINE_FUNCTION
void gas_phase_chemistry(
template <typename VectorType>
KOKKOS_INLINE_FUNCTION void gas_phase_chemistry(
// in
const Real temp, const Real dt,
const Real photo_rates[mam4::mo_photo::phtcnt], const Real extfrc[extcnt],
const Real invariants[nfs], const int (&clsmap_4)[gas_pcnst],
const int (&permute_4)[gas_pcnst], const Real het_rates[gas_pcnst],
// out
Real (&qq)[gas_pcnst]) {
VectorType &qq) {
//=====================================================================
// ... set rates for "tabular" and user specified reactions
//=====================================================================
Expand Down
15 changes: 6 additions & 9 deletions src/mam4xx/mam4_amicphys.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2113,15 +2113,14 @@ void get_gcm_tend_diags_from_subareas(

//--------------------------------------------------------------------------------
//--------------------------------------------------------------------------------

KOKKOS_INLINE_FUNCTION
void modal_aero_amicphys_intr(
template <typename VectorType, typename VectorTypeModes>
KOKKOS_INLINE_FUNCTION void modal_aero_amicphys_intr(
// in
const AmicPhysConfig &config, const Real deltat, const Real temp,
const Real pmid, const Real pdel, const Real zm, const Real pblh,
const Real qv, const Real cld,
// in/out
Real (&qq)[gas_pcnst], Real (&qqcw)[gas_pcnst],
VectorType &qq, VectorType &qqcw,
// Diagnostics (out)
const int kk, // level info needed for diagnistics output
const View2D &gas_aero_exchange_condensation,
Expand All @@ -2130,11 +2129,9 @@ void modal_aero_amicphys_intr(
const View2D &gas_aero_exchange_coagulation,
const View2D &gas_aero_exchange_renaming_cloud_borne,
// in
const Real (&q_pregaschem)[gas_pcnst],
const Real (&q_precldchem)[gas_pcnst],
const Real (&qqcw_precldchem)[gas_pcnst], const Real (&dgncur_a)[num_modes],
const Real (&dgncur_awet)[num_modes],
const Real (&wetdens_host)[num_modes]) {
const VectorType &q_pregaschem, const VectorType &q_precldchem,
const VectorType &qqcw_precldchem, const VectorTypeModes &dgncur_a,
const VectorTypeModes &dgncur_awet, const VectorTypeModes &wetdens_host) {
// deltat: time step
// qq(ncol,pver,pcnst): current tracer mixing ratios (TMRs)
// these values are updated (so out /= in)
Expand Down
12 changes: 4 additions & 8 deletions src/mam4xx/mo_gas_phase_chemdr.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ KOKKOS_INLINE_FUNCTION
void mmr2vmr_col(const ThreadTeam &team, const haero::Atmosphere &atm,
const mam4::Prognostics &progs,
const Real adv_mass_kg_per_moles[gas_pcnst],
const int offset_aerosol,
const ColumnView vmr_col[gas_pcnst]) {
const int offset_aerosol, const View2D vmr_col) {
// Make a local copy of nlev to avoid the identifier "mam4::nlev" being
// undefined in device code.
constexpr int nlev_local = nlev;
Expand All @@ -50,7 +49,7 @@ void mmr2vmr_col(const ThreadTeam &team, const haero::Atmosphere &atm,
// output (vmr)
mam4::microphysics::mmr2vmr(qq, adv_mass_kg_per_moles, vmr);
for (int i = 0; i < gas_pcnst; ++i) {
vmr_col[i](kk) = vmr[i];
vmr_col(kk, i) = vmr[i];
}
});
}
Expand Down Expand Up @@ -204,11 +203,8 @@ void perform_atmospheric_chemistry_and_microphysics(
work_set_het_ptr += nlev * gas_pcnst;

// vmr0 stores mixing ratios before chemistry changes the mixing
ColumnView vmr_col[gas_pcnst];
for (int i = 0; i < gas_pcnst; ++i) {
vmr_col[i] = ColumnView(work_set_het_ptr, nlev);
work_set_het_ptr += nlev;
}
const auto vmr_col = View2D(work_set_het_ptr, nlev, gas_pcnst);
work_set_het_ptr += nlev * gas_pcnst;
const int sethet_work_len = mam4::mo_sethet::get_work_len_sethet();
const auto work_sethet_call = View1D(work_set_het_ptr, sethet_work_len);
work_set_het_ptr += sethet_work_len;
Expand Down
15 changes: 7 additions & 8 deletions src/mam4xx/mo_photo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,14 @@ void set_ub_col(Real &o3_col_delta,
KOKKOS_INLINE_FUNCTION
void setcol(const ThreadTeam &team, const Real o3_col_deltas[mam4::nlev + 1],
ColumnView &o3_col_dens) {
// we can probably accelerate this with a parallel_scan, but let's just do
// a simple loop for now
constexpr int nlev = mam4::nlev;
Kokkos::single(Kokkos::PerTeam(team), [=]() {
o3_col_dens(0) = 0.5 * (o3_col_deltas[0] + o3_col_deltas[1]);
for (int k = 1; k < nlev; ++k) {
o3_col_dens(k) =
o3_col_dens(k - 1) + 0.5 * (o3_col_deltas[k] + o3_col_deltas[k + 1]);
}
Kokkos::parallel_for(Kokkos::TeamThreadRange(team, nlev), [&](int kk) {
Kokkos::parallel_reduce(
Kokkos::ThreadVectorRange(team, kk + 1),
[&](int i, Real &lsum) {
lsum += 0.5 * (o3_col_deltas[i] + o3_col_deltas[i + 1]);
},
o3_col_dens(kk));
Copy link
Collaborator

@overfelt overfelt Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it not possible to replace these two nested Kokkos loops with a single Kokkos::parallel_scan?

Copy link
Contributor Author

@odiazib odiazib Oct 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is possible. Does Kokkos::parallel_scan perform two nested loops internally? I prefer to keep it in the current form because it is easier to understand how the operation is performed.

Copy link
Collaborator

@overfelt overfelt Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not know the internal implementation of Kokkos::parallel_scan but I assume it is a slight modification of Kokkos::parallel_sum that assigns the intermediate values to the output array.

Is this code based on chemistry/mozart/mo_photo.F90? If so it seems the setcol function is incorrect anyway. The initial case for the 0th entry has the factor of 1/2 incorrect. When I write out what the result of o3_col_dens is after simplifying the arithmetic, I think this might be a trivial scan followed by a trivial element-by-element sum. Seems to me the Fortran implementation obscures what the result is and could have been simplified.

Copy link
Contributor Author

@odiazib odiazib Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not 100% sure if this routine is from chemistry/mozart/mo_photo.F90. @singhbalwinder or @jeff-cohere, do you recall if we directly ported this routine from the Fortran code? If not, I believe we should update it.

Copy link
Collaborator

@jeff-cohere jeff-cohere Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's the commit for the original code, annotated by git blame:

9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 286) KOKKOS_INLINE_FUNCTION
9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 287) void setcol(const Real o3_col_deltas[mam4::nlev + 1], ColumnView &o3_col_dens) {
9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 288)   // we can probably accelerate this with a parallel_scan, but let's just do
9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 289)   // a simple loop for now
9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 290)   constexpr int nlev = mam4::nlev;
9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 291)   o3_col_dens(0) = 0.5 * (o3_col_deltas[0] + o3_col_deltas[1]);
9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 292)   for (int k = 1; k < nlev; ++k) {
9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 293)     o3_col_dens(k) =
9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 294)         o3_col_dens(k - 1) + 0.5 * (o3_col_deltas[k] + o3_col_deltas[k + 1]);
9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 295)   }
9797b647a (Jeffrey N. Johnson 2023-11-28 16:32:20 -0800 296) }

And here's the log message for that commit:

commit 9797b647a848da2ce0eb3d3f73409f0ab1253f03 (HEAD)
Author: Jeffrey N. Johnson <[email protected]>
Date:   Tue Nov 28 16:32:20 2023 -0800

    Ported set_ub_col and setcol, and added validation tests (still in progress).

It would be good to check this against the original Fortran code, of course!

Copy link
Collaborator

@jeff-cohere jeff-cohere Oct 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here's the original code. As @overfelt has pointed out, there's an incorrect factor of 1/2 in there, so it should definitely be updated:

  subroutine setcol( col_delta, & ! in
                     col_dens ) ! out
    !---------------------------------------------------------------
    !           ... set the column densities
    !---------------------------------------------------------------
  
    use chem_mods, only : nabscol
  
    implicit none
  
    !---------------------------------------------------------------
    !           ... dummy arguments
    !---------------------------------------------------------------
    real(r8), intent(in)    :: col_delta(:,0:,:)                 ! layer column densities [molecules/cm^2]
    real(r8), intent(out)   :: col_dens(:,:,:)                   ! column densities [ 1/cm**2 ]

    !---------------------------------------------------------------
    !        the local variables
    !---------------------------------------------------------------
    integer  ::   kk, km1, mm      ! indicies
  
    !---------------------------------------------------------------
    !           ... compute column densities down to the
    !           current eta index in the calling routine.
    !           the first column is o3 and the second is o2.
    !---------------------------------------------------------------
    do mm = 1,nabscol
       col_dens(:,1,mm) = col_delta(:,0,mm) + .5_r8 * col_delta(:,1,mm)  ! kk=1
       do kk = 2,pver  
          km1 = kk - 1 
          col_dens(:,kk,mm) = col_dens(:,km1,mm) + .5_r8 * (col_delta(:,km1,mm) + col_delta(:,kk,mm))
       enddo
    enddo
    
  end subroutine setcol

Sorry for the bug!

Copy link
Contributor Author

@odiazib odiazib Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @jeff-cohere, and no worries. @singhbalwinder, I will fix this bug in a follow-up PR because this fix will be NBFB.

Copy link
Contributor Author

@odiazib odiazib Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue: #482

Copy link
Contributor

@singhbalwinder singhbalwinder Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, all! Yes, we should fix this in a follow-up PR. I also think we should use parallel_scan here instead of the nested loops, if possible.

});
}

Expand Down
36 changes: 18 additions & 18 deletions src/mam4xx/mo_sethet.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,18 +204,18 @@ int get_total_work_len_sethet() {
KOKKOS_INLINE_FUNCTION
void sethet_detail(
const ThreadTeam &team,
const View2D &het_rates, // rainout rates [1/s] //out
const Real rlat, // latitude in radians for columns
const ConstColumnView &press, // pressure [pascals] //in
const ConstColumnView &zmid, // midpoint geopot [km] //in
const Real phis, // surf geopotential //in
const ConstColumnView &tfld, // temperature [K] //in
const ColumnView &cmfdqr, // dq/dt for convection [kg/kg/s] //in
const ConstColumnView &nrain, // stratoform precip [kg/kg/s] //in
const ConstColumnView &nevapr, // evaporation [kg/kg/s] //in
const Real delt, // time step [s] //in
const View2D &invariants, // total atms density [cm^-3] //in
const ColumnView qin[gas_pcnst], // xported species [vmr] //in
const View2D &het_rates, // rainout rates [1/s] //out
const Real rlat, // latitude in radians for columns
const ConstColumnView &press, // pressure [pascals] //in
const ConstColumnView &zmid, // midpoint geopot [km] //in
const Real phis, // surf geopotential //in
const ConstColumnView &tfld, // temperature [K] //in
const ColumnView &cmfdqr, // dq/dt for convection [kg/kg/s] //in
const ConstColumnView &nrain, // stratoform precip [kg/kg/s] //in
const ConstColumnView &nevapr, // evaporation [kg/kg/s] //in
const Real delt, // time step [s] //in
const View2D &invariants, // total atms density [cm^-3] //in
const View2D qin, // xported species [vmr] //in
// working variables
const ColumnView
&t_factor, // temperature factor to calculate henry's law parameters
Expand Down Expand Up @@ -330,8 +330,8 @@ void sethet_detail(
rain(kk) = mass_air * precip(kk) * invariants(kk, indexm) / mass_h2o;
xliq(kk) =
precip(kk) * delt * invariants(kk, indexm) / avo * mass_air * m3_2_cm3;
xh2o2(kk) = qin[spc_h2o2_ndx](kk) * invariants(kk, indexm);
xso2(kk) = qin[spc_so2_ndx](kk) * invariants(kk, indexm);
xh2o2(kk) = qin(kk, spc_h2o2_ndx) * invariants(kk, indexm);
xso2(kk) = qin(kk, spc_so2_ndx) * invariants(kk, indexm);
});
zsurf = m2km * phis * rga;

Expand Down Expand Up @@ -498,10 +498,10 @@ void sethet(
const Real phis, // surf geopotential //in
const ColumnView &cmfdqr, // dq/dt for convection [kg/kg/s] //in
const ConstColumnView &prain, // stratoform precip [kg/kg/s] //in
const ConstColumnView &nevapr, // evaporation [kg/kg/s] //in
const Real dt, // time step [s] //in
const View2D &invariants, //
const ColumnView vmr[gas_pcnst], // xported species [vmr] //in
const ConstColumnView &nevapr, // evaporation [kg/kg/s] //in
const Real dt, // time step [s] //in
const View2D &invariants, //
const View2D &vmr, // xported species [vmr] //in
// working variables
const View1D &work) {

Expand Down
3 changes: 1 addition & 2 deletions src/validation/gas_chem/imp_prod_loss.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ void imp_prod_loss(Ensemble *ensemble) {
const auto het_rates = input.get_array("het_rates");
auto y = input.get_array("y");

imp_prod_loss(prod.data(), loss.data(), y.data(), rxt.data(),
het_rates.data());
imp_prod_loss(prod.data(), loss.data(), y, rxt.data(), het_rates.data());
output.set("prod", prod);
output.set("loss", loss);
});
Expand Down
2 changes: 1 addition & 1 deletion src/validation/gas_chem/imp_sol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void imp_sol(Ensemble *ensemble) {
factor[i] = true;
}

imp_sol(base_sol.data(), // ! species mixing ratios [vmr] & !
imp_sol(base_sol, // ! species mixing ratios [vmr] & !
reaction_rates.data(), het_rates.data(), extfrc.data(), delt,
permute_4, clsmap_4, factor, epsilon, prod_out.data(),
loss_out.data());
Expand Down
2 changes: 1 addition & 1 deletion src/validation/gas_chem/newton_raphson_iter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void newton_raphson_iter(Ensemble *ensemble) {
newton_raphson_iter(dti, lin_jac.data(), lrxt.data(),
lhet.data(), // & ! in
iter_invariant.data(), // & ! in
factor, permute_4, clsmap_4, lsol.data(),
factor, permute_4, clsmap_4, lsol,
solution.data(), // & ! inout
converged, convergence, // & ! out
prod.data(), loss.data(), max_delta.data(),
Expand Down
11 changes: 5 additions & 6 deletions src/validation/mo_sethet/sethet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ using namespace mo_sethet;
void sethet(Ensemble *ensemble) {
ensemble->process([=](const Input &input, Output &output) {
using View1DHost = typename HostType::view_1d<Real>;
using View2DHost = typename HostType::view_2d<Real>;
using ColumnView = haero::ColumnView;
constexpr int pver = mam4::nlev;
constexpr int gas_pcnst = mam4::gas_chemistry::gas_pcnst;
Expand Down Expand Up @@ -101,34 +102,32 @@ void sethet(Ensemble *ensemble) {
so2_diss = haero::testing::create_column_view(pver);

ColumnView tmp_hetrates[gas_pcnst];
ColumnView qin[gas_pcnst];
View1DHost tmp_hetrates_host[gas_pcnst];
View1DHost qin_host[gas_pcnst];
View2DHost qin_host("qin_host", pver, gas_pcnst);

View2D het_rates("het_rates", pver, gas_pcnst);
View2D qin("qin", pver, gas_pcnst);
auto het_rates_host = Kokkos::create_mirror_view(het_rates);

for (int mm = 0; mm < gas_pcnst; ++mm) {

tmp_hetrates[mm] = haero::testing::create_column_view(pver);
qin[mm] = haero::testing::create_column_view(pver);
tmp_hetrates_host[mm] = View1DHost("tmp_hetrates_host", pver);
qin_host[mm] = View1DHost("qin_host", pver);
}

int count = 0;
for (int mm = 0; mm < gas_pcnst; ++mm) {
for (int kk = 0; kk < pver; ++kk) {
qin_host[mm](kk) = qin_in[count];
qin_host(kk, mm) = qin_in[count];
Copy link
Contributor

@singhbalwinder singhbalwinder Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whenever we are switching between arrays and views, we should test it on Frontier so that the model doesn't break on it.

count++;
}
}

// transfer data to GPU.
for (int mm = 0; mm < gas_pcnst; ++mm) {
Kokkos::deep_copy(tmp_hetrates[mm], 0.0);
Kokkos::deep_copy(qin[mm], qin_host[mm]);
}
Kokkos::deep_copy(qin, qin_host);

auto team_policy = ThreadTeamPolicy(1u, Kokkos::AUTO);
Kokkos::parallel_for(
Expand Down