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

Bring main up to ngeet-2024 #21

Merged
merged 64 commits into from
Oct 7, 2024
Merged

Bring main up to ngeet-2024 #21

merged 64 commits into from
Oct 7, 2024

Commits on Mar 1, 2024

  1. update gitignore and add documentation source images folder

    @glemieux
    glemieux committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    10f967a View commit details
    Browse the repository at this point in the history

  2. update build to look in NGEET org repo

    @glemieux
    glemieux committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    d295ebb View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. update download target to be tag located on NGEET fork of HLM

    @glemieux
    glemieux committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    039d043 View commit details
    Browse the repository at this point in the history

  2. update config wget commands to specify the branch 

    This also corrects a typo in the raw url
    @glemieux
    glemieux committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    5ac68ac View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. add download for fates 

    I forgot to add this since we are not using git to control the submodules
    @glemieux
    glemieux committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    ac909d7 View commit details
    Browse the repository at this point in the history

  2. adding build instruction readme

    @glemieux
    glemieux committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    369741c View commit details
    Browse the repository at this point in the history

  3. turn readme into markdown

    @glemieux
    glemieux committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    74b8384 View commit details
    Browse the repository at this point in the history

  4. minor formatting readme

    @glemieux
    glemieux committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    30714df View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. add new folder for elm_v3-for-ngee

    @glemieux
    glemieux committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    9d70dcc View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. initial commit of docker compose yaml

    @glemieux
    glemieux committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    820c396 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. start moving baseos to ngeetropics

    @glemieux
    glemieux committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    0bc765e View commit details
    Browse the repository at this point in the history

  2. update compose file with container names and volumes

    @glemieux
    glemieux committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    7975efb View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. volume is not a service; add tty and std_in to elm-fates container 

    I'm not sure the std_in is truly necessary here if docker compose is run
in detached mode and then the elm-container is attached interactively,
but I don't think it'll hurt anything so I'm adding it anyways
    @glemieux
    glemieux committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    7b00796 View commit details
    Browse the repository at this point in the history

  2. renaming compose file internally

    @glemieux
    glemieux committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    d7a78f1 View commit details
    Browse the repository at this point in the history

  3. fix typo and white space

    @glemieux
    glemieux committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    21ba9bd View commit details
    Browse the repository at this point in the history

  4. add ports to the jupyter container 

    This allows jupyter to launch with the last url option
    @glemieux
    glemieux committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    0015f5e View commit details
    Browse the repository at this point in the history

  5. add scripts volume mounted to local directory

    @glemieux
    glemieux committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    c6b1f5b View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. add hostname and user name override to the compose file

    @glemieux
    glemieux committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    0009d57 View commit details
    Browse the repository at this point in the history

  2. allow user to use .env file to set environment variables for convenience

    @glemieux
    glemieux committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    d82dd71 View commit details
    Browse the repository at this point in the history

  3. update volumes with env vars

    @glemieux
    glemieux committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    062bfac View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ngeet-2024-compose' into ngeet-2024

    @glemieux
    glemieux committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    c2e7ee4 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. update e3sm build to get all elm externals

    @glemieux
    glemieux committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    f474fca View commit details
    Browse the repository at this point in the history

  2. add gcc 11.2 baseos 

    This temporarily removes the python pip install from previous baseos versions
    @glemieux
    glemieux committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    6436677 View commit details
    Browse the repository at this point in the history

  3. update compose and elm-fates dockerfile

    @glemieux
    glemieux committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    88ec530 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. update docker container bind mounts 

    Add inventory and parameter file to mounts
    @glemieux
    glemieux committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    270fbcf View commit details
    Browse the repository at this point in the history

  2. starting to clean up directory structure 

    Remove older and unnecessary files from the ngeet-2024 branch
    @glemieux
    glemieux committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    acf5d83 View commit details
    Browse the repository at this point in the history

  3. fix sharing of volumes between containers

    @glemieux
    glemieux committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    34515a4 View commit details
    Browse the repository at this point in the history

  4. whitespace cleanup

    @glemieux
    glemieux committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    b3bc2c1 View commit details
    Browse the repository at this point in the history

  5. simplify what has to be defined in .env file

    @glemieux
    glemieux committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    5202801 View commit details
    Browse the repository at this point in the history

  6. update env template with simplified variables

    @glemieux
    glemieux committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    2e3087c View commit details
    Browse the repository at this point in the history

  7. fix inventory data location

    @glemieux
    glemieux committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    ae7af96 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. add initial cut of minimal data dockerfile 

    This uses multi-stage builds to minimize and simplify the data container
as much as possible.
    @glemieux
    glemieux committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    1c39eac View commit details
    Browse the repository at this point in the history

  2. remove the docker compose file 

    This has been moved to the fates tutorial repo given that we want to
reduce the number of repos that the attendees need to interact with.
This also will avoid unnecessarily introducting them to docker build
files.
    @glemieux
    glemieux committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    582d832 View commit details
    Browse the repository at this point in the history

  3. update default data dockerfile 

    This is just for the atm data currently
    @glemieux
    glemieux committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    1c5d326 View commit details
    Browse the repository at this point in the history

  4. add sitedata folder to elm-fates v3 image 

    This allows us to split up the domain+met data from the inventory data
    @glemieux
    glemieux committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    4ef2b7d View commit details
    Browse the repository at this point in the history

  5. add land to default data file 

    This temporarily separates the atm and lnd build steps to take advantage
of build cache while debugging file
    @glemieux
    glemieux committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    40453d8 View commit details
    Browse the repository at this point in the history

  6. update data container to use alpine 

    This makes bringing in the contained data easier via docker compose
    @glemieux
    glemieux committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    8702202 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. Add BCI container dockerfile 

    This adds the data from the local build context for the time being.  As
such, I've updated the gitignore to avoid the netcdf files.
    @glemieux
    glemieux committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    607b2e3 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. update basic data container

    @glemieux
    glemieux committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    5dec86e View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. update data container for bci and domain/met drivers

    @glemieux
    glemieux committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    fc01c7b View commit details
    Browse the repository at this point in the history

  2. change uid for modeluser

    @glemieux
    glemieux committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0c73683 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ngeet-2024-dataimage-default' into ngeet-2024

    @glemieux
    glemieux committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    d43817a View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. remove manaus from the gitignore

    @glemieux
    glemieux committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    ad70c0b View commit details
    Browse the repository at this point in the history

  2. add sed commands to modify the datm namelist definitions 

    This is necessary to allow elm to run a single site with subset GSWP3
data instead of with the tower data that is being used.
    @glemieux
    glemieux committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    2da79f9 View commit details
    Browse the repository at this point in the history

  3. fix QBOT typo variable in sed command

    @glemieux
    glemieux committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    41501e1 View commit details
    Browse the repository at this point in the history

  4. remove the datm namelist modification 

    This has been moved to the case script in fates-tutorial repo
    @glemieux
    glemieux committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    2556658 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. update bci inventory location and generalize site name

    @glemieux
    glemieux committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    f64fb88 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. update site data dockerfile

    @glemieux
    glemieux committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    b3c8406 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #10 from NGEET/data-container-update-sites 

    Data container update sites
    @glemieux
    glemieux authored Aug 26, 2024
    Configuration menu
    Copy the full SHA
    0b3ce14 View commit details
    Browse the repository at this point in the history

  3. update baseos to reinstate python symlink and pip install

    @glemieux
    glemieux committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    4ac364e View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Merge remote-tracking branch 'origin/main' into ngeet-2024

    @glemieux
    glemieux committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    18f32ce View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. minor update to driver data container

    @glemieux
    glemieux committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    1f6d63d View commit details
    Browse the repository at this point in the history

  2. update baseos with pinned version of scipy 

    This avoids NGEET/fates#1242
    @glemieux
    glemieux committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    a04c645 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. updating initial build action with matrix strategy

    @glemieux
    glemieux committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    e487274 View commit details
    Browse the repository at this point in the history

  2. update site dockerfile description

    @glemieux
    glemieux committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    6c06184 View commit details
    Browse the repository at this point in the history

  3. add subdirectories in the elm-fates image dockerfile 

    This simplifies the handling of docker compose volume mounting
    @glemieux
    glemieux committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    0dad100 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. update elm-fates container permissions for inventory data

    @glemieux
    glemieux committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    369746f View commit details
    Browse the repository at this point in the history

  2. make sure to recursively provide read/execute access

    @glemieux
    glemieux committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    bf358a8 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2024

  1. update build context and tag

    @glemieux
    glemieux committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    2d5600e View commit details
    Browse the repository at this point in the history

  2. enable matrix os and update tag to be dynamic 

    This introspects on the runner's architecture to tag the results.
    @glemieux
    glemieux committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    ace6c6a View commit details
    Browse the repository at this point in the history

  3. change image build to use docker architecture emulation 

    Until docker/actions-toolkit#317 is fixed use docker emulation to get
arm support.
    @glemieux
    glemieux committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    cbe026d View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2024

  1. add temp workaround for cd going to home

    @glemieux
    glemieux committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    7248095 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. correct temp bashcd append

    @glemieux
    glemieux committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    570d619 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Add CO2 timeseries to the default dataset

    @glemieux
    glemieux committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    fdac494 View commit details
    Browse the repository at this point in the history