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.

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

Jump to bottom

Layer development #24

Merged
merged 94 commits into from
Jul 12, 2024
Merged

Layer development #24

merged 94 commits into from
Jul 12, 2024

Commits on May 5, 2023

  1. aero rep single particle layer .c and .F90 files

    @jtgasparik
    jtgasparik committed May 5, 2023
    Configuration menu
    Copy the full SHA
    9c9a201 View commit details
    Browse the repository at this point in the history

  2. comments to .F90 code

    @jtgasparik
    jtgasparik committed May 5, 2023
    Configuration menu
    Copy the full SHA
    3f33c31 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. adding layers to aero_rep_single_particle_layers.F90

    @jtgasparik
    jtgasparik committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    8380f0d View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. aero_rep_single_particle_layers.F90 without comments

    @jtgasparik
    jtgasparik committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    b59b0c9 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2023

  1. fix to indexing

    @jtgasparik
    jtgasparik committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    c1efe46 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. C preprocessor variables modified

    @jtgasparik
    jtgasparik committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    6715224 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. init aero rep data for layers function

    @jtgasparik
    jtgasparik committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    b7508e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. unique names - need to check if aero_phases is correct

    @jtgasparik
    jtgasparik committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    1fe61ff View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. added LAYER_STATE_ID_ variable

    @jtgasparik
    jtgasparik committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    0abd1e4 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2023

  1. add and allocate aero_phase array

    @jtgasparik
    jtgasparik committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    ec9b541 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. creating aero_layer_phase_set array

    @jtgasparik
    jtgasparik committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    b1dee82 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. ordered layers subroutine

    @jtgasparik
    jtgasparik committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    4b2d1a0 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. edits to ordered layers subroutine

    @jtgasparik
    jtgasparik committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    c8f2c4f View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. added LAYER_STATE_ID_UNORDERED_ loop to main code

    @jtgasparik
    jtgasparik committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    8e3547b View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. add second loop with phase names unordered

    @jtgasparik
    jtgasparik committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    1fb921a View commit details
    Browse the repository at this point in the history

  2. add ordered phase function

    @jtgasparik
    jtgasparik committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    aeabb29 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. aero_phase array constructed

    @jtgasparik
    jtgasparik committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    f4f18ad View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. added layer state id subroutine

    @jtgasparik
    jtgasparik committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    de2d432 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. modified ordered functions based on independednt test and edits to no… 

    …tation
    @jtgasparik
    jtgasparik committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    5b27253 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. modified functions: removed any variables associated with this

    @jtgasparik
    jtgasparik committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    06e4e35 View commit details
    Browse the repository at this point in the history

  2. initialized missing variables and added functions to procedure list

    @jtgasparik
    jtgasparik committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    d1f2aa3 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. edited loop to setup aero_phase array to reflect changed made to aero… 

    …_layer_phase_set
    @jtgasparik
    jtgasparik committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    82668fb View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. fixed layer_state_id function and independently tested

    @jtgasparik
    jtgasparik committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    1cb93a5 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2023

  1. error message to .F90 code, layer and phase tests added to test.F90

    @jtgasparik
    jtgasparik committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    bc921ff View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2023

  1. minor .F90 code fixes, tests added and model sucessfully compiled loc… 

    …ally!
    @jtgasparik
    jtgasparik committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    79c6375 View commit details
    Browse the repository at this point in the history

  2. some changes to pre-processor definitions

    @jtgasparik
    jtgasparik committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    00c5ed2 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. added variables to aero_rep_data_t

    @jtgasparik
    jtgasparik committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    101f312 View commit details
    Browse the repository at this point in the history

  2. added sandwich test to check layer and phase ordering

    @jtgasparik
    jtgasparik committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    fa1e0fc View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. modified unique_names funtion to reflect layers

    @jtgasparik
    jtgasparik committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    b61d97d View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. modified unique names function

    @jtgasparik
    jtgasparik committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    f1e521d View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. fix to unique names function

    @jtgasparik
    jtgasparik committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    45dd16c View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. .json file and layers test .F90 to repo

    @jtgasparik
    jtgasparik committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    a8976d1 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. add single particle layered to build and tests

    @mattldawson
    mattldawson committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    8704d37 View commit details
    Browse the repository at this point in the history

  2. rough in first test of layer functions

    @mattldawson
    mattldawson committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    52b3274 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Merge pull request #1 from mattldawson/develop-update-cpp 

    Add new aero rep code to build and tests
    @jtgasparik
    jtgasparik committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    c50ac98 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. failed unit testing and json file updates for layers

    @jtgasparik
    jtgasparik committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    481a71c View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. passed ordered layer test. reminder - ordered layer function should b… 

    …e modified when initialize function uncommented
    @jtgasparik
    jtgasparik committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    5753089 View commit details
    Browse the repository at this point in the history

  2. ordered layers test with unit test done

    @jtgasparik
    jtgasparik committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    65a28e0 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. ordered layer tests with manual input (not from json)

    @jtgasparik
    jtgasparik committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    20814fe View commit details
    Browse the repository at this point in the history

  2. small change to layer state id test

    @jtgasparik
    jtgasparik committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    278c0ee View commit details
    Browse the repository at this point in the history

  3. attempting to compile initialize function

    @jtgasparik
    jtgasparik committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    f52a4c0 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. trying to resolve errors in initialize function

    @jtgasparik
    jtgasparik committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    7f501f0 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. fixed string in ordered phase test

    @jtgasparik
    jtgasparik committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    8c5a709 View commit details
    Browse the repository at this point in the history

  2. fixing some compiling errors

    @jtgasparik
    jtgasparik committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    6ac6a00 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. fix to initialize

    @jtgasparik
    jtgasparik committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    1931f9c View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. draft layer data macros

    @mattldawson
    mattldawson committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    aea821b View commit details
    Browse the repository at this point in the history

  2. clean up aero rep layers

    @mattldawson
    mattldawson committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    37c7f8f View commit details
    Browse the repository at this point in the history

  3. draft unique names function

    @mattldawson
    mattldawson committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    4c1034f View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. add unique names test for layers

    @mattldawson
    mattldawson committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    475b93b View commit details
    Browse the repository at this point in the history

  2. finish cpp macro tests

    @mattldawson
    mattldawson committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    5091e51 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Merge pull request #2 from mattldawson/develop-fix-cpp 

    Set CPP macros
    @jtgasparik
    jtgasparik committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    155ccd5 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. modified and in process of testing num_phase_instances function

    @jtgasparik
    jtgasparik committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    db9007a View commit details
    Browse the repository at this point in the history

  2. trying to fix num_phase_instances test

    @jtgasparik
    jtgasparik committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    36b9c50 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2023

  1. passed num_phase_instances test

    @jtgasparik
    jtgasparik committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    04dc97e View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. resolved matt's comments

    @jtgasparik
    jtgasparik committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    203ff90 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Update src/aero_reps/aero_rep_single_particle_layers.F90 

    Co-authored-by: Matt Dawson <mattldawson@gmail.com>
    @jtgasparik @mattldawson
    jtgasparik and mattldawson committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    960922c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from jtgasparik/layers_num_phase_function 

    Layers num phase function
    @jtgasparik
    jtgasparik committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    1f0df27 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. attempting to merge aero rep single particle with layers

    @jtgasparik
    jtgasparik committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    37db40d View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2024

  1. renamed aero_rep_single_particle_layers to aero_rep_single_particle a… 

    …nd added layers to tests. all tests pass except rxns for HL and SIMPOL because they rely on the c functions. next step is to edit c functions
    @jtgasparik
    jtgasparik committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    157f3f2 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2024

  1. in the likely event things break

    @jtgasparik
    jtgasparik committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    09a705e View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. edited test files to run single particle test with one layer

    @jtgasparik
    jtgasparik committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    b2bbab1 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. aero_rep_single_paricle F90 tests pass, c still fail - bad jacobian e… 

    …lement
    @jtgasparik
    jtgasparik committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    244534c View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. modified remaining tests for layers. need to check aero_phase_idx var… 

    …iable
    @jtgasparik
    jtgasparik committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    17903ae View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. troubleshooting bad jacobian element error for radius, molecular weig… 

    …ht and aero phase mass functions
    @jtgasparik
    jtgasparik committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    db302ec View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. printing variables to figure out int_data and float_data stuff

    @jtgasparik
    jtgasparik committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    005851e View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. update to c pre-processor variables LAYER_PHASE_START_ and LAYER_PHAS… 

    …E_END_, corrects output for num_jac_elem c function
    @jtgasparik
    jtgasparik committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    d599f9a View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. fixed jacobian errors, one layer model working

    @jtgasparik
    jtgasparik committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    a1866b9 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. testing with 3 layers, still working on c tests

    @jtgasparik
    jtgasparik committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    a69edb4 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. tests with multiple layers working? seemed too easy so im suspicious

    @jtgasparik
    jtgasparik committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    754c436 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. testing with multiple layers continued

    @jtgasparik
    jtgasparik committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    d4ae978 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. cleaning up files

    @jtgasparik
    jtgasparik committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    8b50602 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2024

  1. single particle tests still not passing

    @jtgasparik
    jtgasparik committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    7cdf3b4 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. radius test passes, need to finish editing other tests

    @jtgasparik
    jtgasparik committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    04b162e View commit details
    Browse the repository at this point in the history

  2. num conc c test passes, mass and MW failing

    @jtgasparik
    jtgasparik committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    41d0774 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. all tests pass for layers

    @jtgasparik
    jtgasparik committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    b399ae3 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Update test/unit_aero_rep_data/test_aero_rep_single_particle.F90 

    Co-authored-by: Jeffrey Curtis <jcurtis2@illinois.edu>
    @jtgasparik @jcurtis2
    jtgasparik and jcurtis2 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    ba3a85a View commit details
    Browse the repository at this point in the history

  2. Update src/aero_reps/aero_rep_single_particle.F90 

    Co-authored-by: Jeffrey Curtis <jcurtis2@illinois.edu>
    @jtgasparik @jcurtis2
    jtgasparik and jcurtis2 committed May 7, 2024
    Configuration menu
    Copy the full SHA
    2175063 View commit details
    Browse the repository at this point in the history

  3. remove print statements

    @jtgasparik
    jtgasparik committed May 7, 2024
    Configuration menu
    Copy the full SHA
    62ac5b1 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #6 from jtgasparik/multiple_layer_tests 

    Single particle with multiple layers
    @jtgasparik
    jtgasparik committed May 7, 2024
    Configuration menu
    Copy the full SHA
    66783eb View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. branch for adding layers to SIMPOL and HL rxns

    @jtgasparik
    jtgasparik committed May 22, 2024
    Configuration menu
    Copy the full SHA
    796ab24 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. fix to print statements and some rxn development

    @jtgasparik
    jtgasparik committed May 29, 2024
    Configuration menu
    Copy the full SHA
    9751168 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. surface layer boolean array

    @jtgasparik
    jtgasparik committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    9a0287c View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. make boolean array and tested

    @jtgasparik
    jtgasparik committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    603f286 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. trying to get modal distribution to compile - it wont

    @jtgasparik
    jtgasparik committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    d4454c2 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. compiles but does not pass tests

    @jtgasparik
    jtgasparik committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    cc76489 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. added at surface flag, all tests pass

    @jtgasparik
    jtgasparik committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    eb1cca7 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. coding structure fix

    @jtgasparik
    jtgasparik committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    cf7169a View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. some comments resolved on PR

    @jtgasparik
    jtgasparik committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    e546dd1 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. review comments

    @jtgasparik
    jtgasparik committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    bfaf87e View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Merge pull request #7 from jtgasparik/rxns_with_layers 

    Rxns with layers
    @jtgasparik
    jtgasparik committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    b429895 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. PR requested changes

    @jtgasparik
    jtgasparik committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    8213a98 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'main' into layer_development

    @jtgasparik
    jtgasparik committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    18225bf View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. PR conflicts resolved + new reactions with layers

    @jtgasparik
    jtgasparik committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    a60f3f9 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Jeff's PR comments

    @jtgasparik
    jtgasparik committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    cde4d86 View commit details
    Browse the repository at this point in the history