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

coupled: updates for merging checkout, build and link with develop branch #206

Merged
merged 20 commits into from
Dec 11, 2020
Merged

coupled: updates for merging checkout, build and link with develop branch #206

merged 20 commits into from
Dec 11, 2020

Commits on Dec 3, 2020

  1. update to waves scripts for merging with develop 

    - synced with develop where necessary and left changes in
prep and gridded post for coupled-crow updates that should remain
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    092566d View commit details
    Browse the repository at this point in the history

  2. removing ecflow scripts that are not in develop branch

    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    ecc348d View commit details
    Browse the repository at this point in the history

  3. removing files from branch that do not appear in develop branch 

    and were not added for coupling in the coupled-crow branch
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    d42805e View commit details
    Browse the repository at this point in the history

  4. updating sorc and ush files to match dev when these are not files 

    changes intentionally in coupled-crow branch and therefore should
match develop branch
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    c2f2cc6 View commit details
    Browse the repository at this point in the history

  5. updating files to match develop that were not matching through 

    merge but should match develop branch
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    17c1822 View commit details
    Browse the repository at this point in the history

  6. cleaning up evn files after merge with develop

    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    39868c6 View commit details
    Browse the repository at this point in the history

  7. cleaning up differences in jobs/rocoto folder from develop branch 

    as it does not seem that the changes here were made intentionally
in feature/coupled-crow so this brings us insync with the develop branch
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    6d216f5 View commit details
    Browse the repository at this point in the history

  8. resolving differences between develop and this branch in terms 

    of wave variables for jobs/JGLOBAL_FORECAST
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    f951736 View commit details
    Browse the repository at this point in the history

  9. updating module file to match develop

    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    5c9f78c View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2020

  1. updates for wave model so that the forecast runs 

    -- atm post still does not work
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 4, 2020
    Configuration menu
    Copy the full SHA
    b6e01ea View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2020

  1. Merge remote-tracking branch 'EMC/feature/gfsv16intocoupled' into cou… 

    …pled/devmerge
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    b297109 View commit details
    Browse the repository at this point in the history

  2. fix typo

    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    f2f0449 View commit details
    Browse the repository at this point in the history

  3. updating .gitignore to match develop a little better

    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    467d9b2 View commit details
    Browse the repository at this point in the history

  4. cleaning up differences between checkout and link with merging to dev… 

    …elop
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    5c8ad44 View commit details
    Browse the repository at this point in the history

  5. updates for build and checkout scripts to unify with develop 

    and simplify build_all to add an option for coupling
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    1cd599a View commit details
    Browse the repository at this point in the history

  6. fix typo in build all script

    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    e379e1d View commit details
    Browse the repository at this point in the history

  7. updating .gitignore for linked files missing from list

    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 7, 2020
    Configuration menu
    Copy the full SHA
    c079593 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2020

  1. add fix files for ocean post

    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    9320337 View commit details
    Browse the repository at this point in the history

  2. changing -p to -c option and adding coupled to the ccpp -c

    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    329739f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'EMC/feature/gfsv16intocoupled' into cou… 

    …pled/devmerge
    @JessicaMeixner-NOAA
    JessicaMeixner-NOAA committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    b585b0c View commit details
    Browse the repository at this point in the history