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

Aerosol Water Calculation #37

Draft
wants to merge 39 commits into
base: main
Choose a base branch
from
Draft

Aerosol Water Calculation #37

wants to merge 39 commits into from

Commits on Jun 24, 2024

  1. Add test yaml file for aerosol water calculation

    Frederick committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    ed77d98 View commit details
    Browse the repository at this point in the history
  2. Add yaml files for initial gas and aerosol state

    Frederick committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    b24fa6b View commit details
    Browse the repository at this point in the history
  3. Add shell script for executing ZSR test

    Frederick committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    16f28d2 View commit details
    Browse the repository at this point in the history
  4. Add main wrapper script for testing aerosol water calculation. Curren…

    …tly IonPair attributes are hard-coded, future updates will move IonPair attribute assignment to AerosolModelData parsing.
    Frederick committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    d1274f2 View commit details
    Browse the repository at this point in the history
  5. Include example script for aerosol water calc.

    Frederick committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    6f5e55f View commit details
    Browse the repository at this point in the history
  6. Add IonPair struct for ZSR calculations (either EQSAM or Jacobson bas…

    …ed calculation)
    Frederick committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    ccaa3d9 View commit details
    Browse the repository at this point in the history
  7. Add method for calculating aerosol water content. NOTE: molecular wei…

    …ghts are assigned via hard-coded map in TChem_ZSR.cpp wrapper, future behavior will access molecular weights from AerosolModelData instance attributes
    Frederick committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    b96ad10 View commit details
    Browse the repository at this point in the history
  8. Add parsing of aerosol water sub model attributes. NOTE: current impl…

    …ementation does not allow accessing sub model attributes outside the scope of the initChem parser yet.
    Frederick committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    e486cb7 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Add vector container for ion pairs, aerosol_water data structure for …

    …encapsulating ion pair vector
    Frederick committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    cb6e9a9 View commit details
    Browse the repository at this point in the history
  2. Add AerosolWater data structure declaration

    Frederick committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    8375e95 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Remove hard-coded ionpair instances, use aerosol_sp_name_idx map to a…

    …ssign state vector quantities to relevant indices, revise arguments to aerosol water team invoke method.
    Frederick committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    632b38e View commit details
    Browse the repository at this point in the history
  2. Change ion_quantities to a map and add an additional map for holding …

    …molecular weights. Revise the name of the aerosol water type and add a 1-d dual view (tentative).
    Frederick committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    62f9cfb View commit details
    Browse the repository at this point in the history
  3. Add aerowater_model to public attributes and template some commented …

    …out code for adding attributes to the aerosol model constant data subclass
    Frederick committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    91bddba View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    63a848d View commit details
    Browse the repository at this point in the history
  5. Revise team_invoke arguments (major change is passing the aerosol mod…

    …el data instead of ion_pair objects), compute aerosol water for all ionpair objects that are attributes of the aerowater_model class, remove code using a lookup dictionary for computing molecular weights with values assigned in the parser module.
    Frederick committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    aa758e4 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. Add variables for index location of RH and aqueous phase water, updat…

    …e arguments to aerosol_water_single_particle team invoke
    Frederick committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    af22bd4 View commit details
    Browse the repository at this point in the history
  2. Update IonPair definition to use primitive types

    Frederick committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    7e4324c View commit details
    Browse the repository at this point in the history
  3. Remove references to aerowater_model data structure, restucture code …

    …to assign various IonPair attributes with corresponding updated primitive types, add code for assigning a dual 1d view of the aerowater_params
    Frederick committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    1a97fa9 View commit details
    Browse the repository at this point in the history
  4. Add public vars to AMD: number of aerosol water ion pairs, 1d dual vi…

    …ew of ionpair objects. Add corresponding attributes under aerosolmodel_constdata
    Frederick committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    1217064 View commit details
    Browse the repository at this point in the history
  5. Utilize aerosolmodel_constdata instead of aerosolmodel_data, update c…

    …ode for acessing data with primitive type attributes, use a switch for calculation type (jacobson or eqsam)
    Frederick committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    bed04b0 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merge branch 'main' into zsr

    Frederick committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    da66003 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Merge branch 'main' into zsr

    Frederick committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    2802205 View commit details
    Browse the repository at this point in the history
  2. Remove deprecated use of std::string variables

    Frederick committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    9e5cef5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9c5be0c View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Fix compile error (reference to nonexistent function), replace with c…

    …onditional statement to determine effective RH
    Frederick committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    c38d194 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Add basic schematic for aerosol water unit test based on the SIMPOL t…

    …est case
    Frederick committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    685a12d View commit details
    Browse the repository at this point in the history
  2. Merge branch 'main' into zsr

    Frederick committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    fb1e406 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Change references to state to utilize 1d view based on TChem conventi…

    …on (gases + aerosol species per particle), set arguments to team_invoke() to type const beside the state view
    Frederick committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    1e2689f View commit details
    Browse the repository at this point in the history
  2. Swap out use of conventional state array with 1D view consistent with…

    … other references to TChem's state variable.
    Frederick committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    ef162c9 View commit details
    Browse the repository at this point in the history
  3. Clarify that the aerosol water model uses ZSR method

    Frederick committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    9c87655 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b59ec86 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2753580 View commit details
    Browse the repository at this point in the history
  6. Add loop over batch members and inner loop over RH for calculating wa…

    …ter content [CURRENTLY FAILING]
    Frederick committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    6394b8b View commit details
    Browse the repository at this point in the history
  7. Remove deprecated code

    Frederick committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    83a2430 View commit details
    Browse the repository at this point in the history
  8. Change type of state variable to const

    Frederick committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    0b0b5a4 View commit details
    Browse the repository at this point in the history
  9. Use 1d view value and real types via the aerosol_water_single_particl…

    …e_type, change state variable to value type (real type was incorrect)
    Frederick committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    efca258 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Removed unused ion index variable

    Frederick committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    e8fb939 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3ee5ef4 View commit details
    Browse the repository at this point in the history
  3. Fix bug with loop over RH (ensure it starts at zero), assign aerosol …

    …water values for each RH to aerowater view, copy from device to host and write values to file for comparison against host output
    Frederick committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    dd5c5da View commit details
    Browse the repository at this point in the history