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

Merge feature/capgen into main as of 2024-03-08 #546

Merged

Commits on Jan 21, 2022

  1. Add var_action_test directory to test variable actions. Currently lim…

    …ited to unit conversions
    climbfuji committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    ed34891 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2022

  1. Added several unit tests for checking compatibility/unit conversions …

    …to metavar.py and var_props.py
    climbfuji committed Jan 22, 2022
    Configuration menu
    Copy the full SHA
    2e2d5da View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2022

  1. Address reviewer comments

    climbfuji committed Feb 24, 2022
    Configuration menu
    Copy the full SHA
    a4f2883 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2022

  1. Merge pull request NCAR#434 from climbfuji/feature/unit_conversions_i…

    …n_capgen
    
    feature/capgen: add new tests for unit conversions
    climbfuji committed Feb 28, 2022
    Configuration menu
    Copy the full SHA
    195ee07 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. Fix error message for unit conversions involving unit "1"

    Steve Goldhaber committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    c1c6811 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. Merge pull request NCAR#460 from gold2718/fix_unit_convert_one

    Fix unit converter problem with units = 1
    mkavulich committed Jan 24, 2023
    Configuration menu
    Copy the full SHA
    dc6458e View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. initial stab at constituents-only PR

    Courtney Peverley committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    69e2bf9 View commit details
    Browse the repository at this point in the history
  2. initial stab at cleanup-only PR

    Courtney Peverley committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    6a6cc0d View commit details
    Browse the repository at this point in the history
  3. initial stab at testing-only PR

    Courtney Peverley committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    43031fe View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. cleanup and fixes

    Courtney Peverley committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    52e5985 View commit details
    Browse the repository at this point in the history
  2. cleanup and fixes

    Courtney Peverley committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    3d75c77 View commit details
    Browse the repository at this point in the history
  3. add latest changes

    Courtney Peverley committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    1683be3 View commit details
    Browse the repository at this point in the history
  4. bugfixes

    Courtney Peverley committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    52626d0 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. add is_scheme_constituent interface

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    a5aa37b View commit details
    Browse the repository at this point in the history
  2. fix tests and add is_thermo_active property

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    9897870 View commit details
    Browse the repository at this point in the history
  3. add code owners

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    3c6a9e2 View commit details
    Browse the repository at this point in the history
  4. fix grammar

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    b085139 View commit details
    Browse the repository at this point in the history
  5. add ddt testing and update constituent standard names

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    73ef0a3 View commit details
    Browse the repository at this point in the history
  6. code cleanup

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    1be9b3d View commit details
    Browse the repository at this point in the history
  7. remove tests that should be in constituents branch

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    a308887 View commit details
    Browse the repository at this point in the history
  8. remove testing files

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    a1aaf9e View commit details
    Browse the repository at this point in the history
  9. add testing files

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    071687e View commit details
    Browse the repository at this point in the history
  10. update regexes in state_machine

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    4247019 View commit details
    Browse the repository at this point in the history
  11. fix doctest

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    104e18f View commit details
    Browse the repository at this point in the history
  12. add state_machine updates

    Courtney Peverley committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    bbdf0d0 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Merge pull request NCAR#499 from NCAR/main

    Merge main into feature/capgen (merge after NCAR#493)
    climbfuji committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    5f355cc View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. merge up to head of feature/capgen

    Courtney Peverley committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    c2ffb05 View commit details
    Browse the repository at this point in the history
  2. simplify workflow

    Courtney Peverley committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    e75e14a View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. merge up to head of feature/capgen

    Courtney Peverley committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    55e4c59 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. generalize host

    Courtney Peverley committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    c8ad82d View commit details
    Browse the repository at this point in the history
  2. change to fstrings

    Courtney Peverley committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    44ea46f View commit details
    Browse the repository at this point in the history
  3. Cleaning up units regex.

    mwaxmonsky committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    3f5c06f View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. remove unnecessary logic from workflow

    Courtney Peverley committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    d58face View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. Merge pull request NCAR#493 from peverwhee/capgen_cleanup

    Capgen cleanup
    peverwhee committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    c2c2aa0 View commit details
    Browse the repository at this point in the history
  2. merge up

    Courtney Peverley committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    b006850 View commit details
    Browse the repository at this point in the history
  3. update metadata parser test with cleanup

    Courtney Peverley committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    07828e6 View commit details
    Browse the repository at this point in the history
  4. fix merge

    Courtney Peverley committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    1bacf44 View commit details
    Browse the repository at this point in the history
  5. Merge pull request NCAR#494 from peverwhee/testing_updates

    Testing updates
    peverwhee committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    eac8bb8 View commit details
    Browse the repository at this point in the history
  6. merge up

    Courtney Peverley committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    d8b7b04 View commit details
    Browse the repository at this point in the history
  7. fix merge

    Courtney Peverley committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    5560875 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Bug fix in metavar.py: optional var props with a default value need t…

    …o return the default value when variable doesn't have a value
    climbfuji committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    1ead685 View commit details
    Browse the repository at this point in the history
  2. Trigger CI

    climbfuji committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    163c397 View commit details
    Browse the repository at this point in the history
  3. Bug fix in scripts/metavar.py: use correct boolean default value 'Fal…

    …se' for optional var prop 'polymorphic'
    climbfuji committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    294eecf View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Merge pull request NCAR#508 from climbfuji/feature/capgen_bugfix_defa…

    …ult_val_optional_varprop
    
    Bug fix in metavar.py: optional var props with a default value need t…
    climbfuji committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    0d9b33a View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. address reviewer comments

    Courtney Peverley committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    370e78d View commit details
    Browse the repository at this point in the history
  2. merge feature/capgen

    Courtney Peverley committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    e9e70b7 View commit details
    Browse the repository at this point in the history
  3. fix tests

    Courtney Peverley committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    ac18c44 View commit details
    Browse the repository at this point in the history
  4. address reviewer comments

    Courtney Peverley committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    9db9477 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. change debug_on subroutine in framework_env to verbose property

    Courtney Peverley committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    4c1807c View commit details
    Browse the repository at this point in the history
  2. Merge pull request NCAR#495 from peverwhee/constituents

    Constituents
    peverwhee committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    e86d0a7 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Add capability to do unit conversations to capgen (NCAR#504)

    This PR adds automatic conversions for supported unit and type transforms.
    Also, included is a new ccpp variable property to indicate a scheme variables vertical orientation vertical, top_at_one.
    As default, top_at_one is set to .false.(GFS ordering convention).
    Adding top_at_one = .true. to a variable in a schemes metadata file will trigger automatic array flipping:
    
    Addresses NCAR#329 and NCAR#403
    
    Conversions supported:
    https://github.com/NCAR/ccpp-framework/blob/main/scripts/conversion_tools/unit_conversion.py
    
    ---------
    
    Co-authored-by: dustinswales <dswales@ucar.edu>
    Co-authored-by: Grant Firl <grantf@ucar.edu>
    Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com>
    4 people committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    800ea07 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Add debug switch to capgen (perform variable allocation checks etc) +…

    … fix spelling: var_compatability --> var_compatibility (NCAR#512)
    
    * Add capability to parse Fortran pointer variables to fortran_tools/parse_fortran.py
    * Add --debug option to capgen (framework_env.py)
    * For advection tests, add --debug flag to capgen and update test reports
    * Add active attribute to variable water_vapor_specific_humidity in capgen_test, add --debug flag to capgen and update test reports
    * For var_action tests, add --debug flag to capgen and update test reports
    * Add docstring documentation for add_var_debug_check and write_var_debug_check in scripts/suite_objects.py
    * Bug fix in scripts/suite_objects.py: also check variable allocations for variables local to the group and assign correct dimensions for local (group) and module (suite) variables
    * Fix spelling: compatability --> compatibility
    
    ---------
    
    Co-authored-by: mwaxmonsky <137746677+mwaxmonsky@users.noreply.github.com>
    climbfuji and mwaxmonsky committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    a4e174f View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. Configuration menu
    Copy the full SHA
    73b6138 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b145485 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Configuration menu
    Copy the full SHA
    c771940 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Configuration menu
    Copy the full SHA
    0ff7939 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ec817d2 View commit details
    Browse the repository at this point in the history
  3. Merge pull request NCAR#525 from dustinswales/test_active_attribute

    Expand var compatibility test for active attribute
    dustinswales committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    6459ff6 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Vertical transform bugfix for variables with only a vertical dimension (

    NCAR#531)
    
    Enable 1D variables with only a vertical dimension by removing code that always adds a dimension transform.
    
    var_props.py: adjust logic that always adds vertical transform and is prohibiting 1D variables with a vertical coordinate
    
    ---------
    
    Co-authored-by: Courtney Peverley <courtneyp@derecho5.hsn.de.hpc.ucar.edu>
    peverwhee and Courtney Peverley committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    a7b9255 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. bugfixes for multiple groups and scalar variable transforms (NCAR#542)

    Updates to enable more than one scheme group, and also enable unit transforms for scalar (non-dimensioned) variables.
    
    Updated Files
    
    Groups:
    ccpp_suite.py - don't promote loop variables to suite level
    host_cap.py - fix for iterating over suite part list
    suite_objects.py - check if variable is at suite level before giving up hope and throwing an error
    
    Scalar transforms:
    suite_objects.py - don't try to do vertical dimension transform for scalar variable; conditionally write comments for var transform calls
    var_props.py - don't include parenthesis (e.g. variable1() = 2 * variable2()) for scalar variable transforms
    
    Misc:
    metavar.py - fix for bug surely introduced by me converting to fstrings at some point
    peverwhee committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    ff28d15 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Add optional attribute to Capgen (NCAR#529)

    This PR adds support to use the fortran optional attribute at the scheme level in Capgen. This functionality does not replace the active attribute, but rather builds on it.
    
    Previously, conditionally allocated fields needed by a scheme were required to be accompanied with the allocation logic defined by the host (e.g the "active" condition). With this change, the scheme can internally query the "presence" instead of carrying the host model logic "down into the scheme".
    
    The following modifications were made:
    
    Metadata parsing: Check for compatibility between scheme and host metadata. If host has inactive variable, ensure that scheme has variable declared as optional.
    Fortran parsing: Check for consistency between metadata and fortran file. If fortran file does not contain the optional attribute in its declaration, report error.
    For any optional scheme variable, add optional attribute to cap level declarations.
    Declare null pointer at cap level when host does not use optional scheme variable
    dustinswales committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    c546cca View commit details
    Browse the repository at this point in the history
  2. Merge branch 'feature/capgen' of https://github.com/ncar/ccpp-framework

    … into feature/merge_feature_capgen_into_main_20240308
    climbfuji committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    4d8a4d9 View commit details
    Browse the repository at this point in the history
  3. Update scripts/parse_tools/parse_checkers.py to allow for underscores…

    … in unit metadata attribues
    climbfuji committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    6cdd38a View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Merge branch 'main' of https://github.com/NCAR/ccpp-framework into fe…

    …ature/merge_feature_capgen_into_main_20240308
    climbfuji committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    87e6d92 View commit details
    Browse the repository at this point in the history