Merge branch 'overfelt/eamxx/fix-non-determinism-in-mam' (PR #7289)

EAMxx: Fix non-determinism for mam on Chrysalis

The fluxes were updated in a simple for statement, which updated the same
values for every thread. Instead, use a TeamVectorRange parallel_for to update
the flux entries, one entry per thread.

[BFB]

* overfelt/eamxx/fix-non-determinism-in-mam:
  Fix after rebase from master failed.

Author: singhbalwinder

components/eamxx/src/physics/mam/eamxx_mam_microphysics_process_interface.cpp

@@ -777,6 +777,7 @@ void MAMMicrophysics::run_impl(const double dt) {
   const int month              = start_of_step_ts().get_month();  // 1-based
   const int surface_lev        = nlev - 1;                 // Surface level
   const auto &index_season_lai = index_season_lai_;
+  const int pcnst              = mam4::pcnst;
 
   //NOTE: we need to initialize photo_rates_
   Kokkos::deep_copy(photo_rates_,0.0);
@@ -894,8 +895,9 @@ void MAMMicrophysics::run_impl(const double dt) {
         // These output values need to be put somewhere:
         Real dflx_col[gas_pcnst] = {};  // deposition velocity [1/cm/s]
         Real dvel_col[gas_pcnst] = {};  // deposition flux [1/cm^2/s]
-        // Output: values are dvel, dvlx
+        // Output: values are dvel, dflx
         // Input/Output: progs::stateq, progs::qqcw
+        team.team_barrier();
         mam4::microphysics::perform_atmospheric_chemistry_and_microphysics(
             team, dt, rlats, sfc_temperature(icol), sfc_pressure(icol),
             wind_speed, rain, solar_flux, cnst_offline_icol, forcings_in, atm,
@@ -917,9 +919,9 @@ void MAMMicrophysics::run_impl(const double dt) {
         // FIXME: Possible units mismatch (dflx is in kg/cm2/s but
         // constituent_fluxes is kg/m2/s) (Following mimics Fortran code
         // behavior but we should look into it)
-        for(int ispc = offset_aerosol; ispc < mam4::pcnst; ++ispc) {
+        Kokkos::parallel_for(Kokkos::TeamVectorRange(team, offset_aerosol, pcnst), [&](int ispc) {
           constituent_fluxes(icol, ispc) -= dflx_col[ispc - offset_aerosol];
-        }
+        });
 
       });  // parallel_for for the column loop
   Kokkos::fence();