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

Feature/compilefix #17

Merged
merged 37 commits into from
Aug 31, 2020
Merged

Feature/compilefix #17

merged 37 commits into from
Aug 31, 2020

Commits on Jul 15, 2020

  1. Merge remote-tracking branch 'CICE-Consortium/master' into emc/develop

    @DeniseWorthen
    DeniseWorthen committed Jul 15, 2020
    Configuration menu
    Copy the full SHA
    9bdb9ad View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2020

  1. compile fixes 

    fix compile errors from fswthru addition in scale_fluxes
change case of "orion" in clean backend
    @DeniseWorthen
    DeniseWorthen committed Jul 16, 2020
    Configuration menu
    Copy the full SHA
    a5d4ade View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2020

  1. Merge remote-tracking branch 'upstream/emc/develop' into HEAD

    @DeniseWorthen
    DeniseWorthen committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    86b8dab View commit details
    Browse the repository at this point in the history

  2. Merge branch 'emc/develop' into feature/compilefix

    @DeniseWorthen
    DeniseWorthen committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    661e6bf View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into emc/develop

    @DeniseWorthen
    DeniseWorthen committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    c084de4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'emc/develop' into feature/compilefix

    @DeniseWorthen
    DeniseWorthen committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    93fb9a2 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2020

  1. calendar fix for non-cesm

    @DeniseWorthen
    DeniseWorthen committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    e2d42ea View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2020

  1. add some logging

    @DeniseWorthen
    DeniseWorthen committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    0379fe4 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2020

  1. switch to sea_freezing_temperature for non-cesm

    @DeniseWorthen
    DeniseWorthen committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    d77ffb5 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2020

  1. Merge remote-tracking branch 'upstream/master' into feature/compilefix

    @DeniseWorthen
    DeniseWorthen committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    c1f3612 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. changes to align w/ escomp/nuopc

    @DeniseWorthen
    DeniseWorthen committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    dd5ecc9 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. Merge remote-tracking branch 'upstream/master' into emc/develop

    @DeniseWorthen
    DeniseWorthen committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    88cc2fd View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2020

  1. add optional dbug_flag to the nems.configure

    @DeniseWorthen
    DeniseWorthen committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    6fffe75 View commit details
    Browse the repository at this point in the history

  2. two minor fixes for dbug setting

    @DeniseWorthen
    DeniseWorthen committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    713e4ff View commit details
    Browse the repository at this point in the history

  3. fix blank line

    @DeniseWorthen
    DeniseWorthen committed Aug 6, 2020
    Configuration menu
    Copy the full SHA
    ae0c2b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2020

  1. Merge remote-tracking branch 'upstream/master' into feature/compilefix

    @DeniseWorthen
    DeniseWorthen committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    4fed278 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2020

  1. fix location of restart_coszen in namelists

    @DeniseWorthen
    DeniseWorthen committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    69cd4a0 View commit details
    Browse the repository at this point in the history

  2. remove NEWCODE ifdefs

    @DeniseWorthen
    DeniseWorthen committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    732e86a View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

    @DeniseWorthen
    DeniseWorthen committed Aug 12, 2020
    Configuration menu
    Copy the full SHA
    5ecde75 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

    @DeniseWorthen
    DeniseWorthen committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    5dcfca8 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2020

  1. Merge branch 'emc/develop' into feature/compilefix

    @DeniseWorthen
    DeniseWorthen committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    0797287 View commit details
    Browse the repository at this point in the history

  2. add wcoss_dell_p3 compiler macro; remove whitespace

    @DeniseWorthen
    DeniseWorthen committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    2176808 View commit details
    Browse the repository at this point in the history

  3. update to icepack w/ debug fix

    @DeniseWorthen
    DeniseWorthen committed Aug 17, 2020
    Configuration menu
    Copy the full SHA
    165ba21 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. replace SITE with MACHINE_ID

    @DeniseWorthen
    DeniseWorthen committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    2db89e9 View commit details
    Browse the repository at this point in the history

  2. fix machine_id change

    @DeniseWorthen
    DeniseWorthen committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    10a3317 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2020

  1. update compile scripts

    @DeniseWorthen
    DeniseWorthen committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    1061161 View commit details
    Browse the repository at this point in the history

  2. update icepack w/ proposed debug fix

    @DeniseWorthen
    DeniseWorthen committed Aug 19, 2020
    Configuration menu
    Copy the full SHA
    6382c4c View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2020

  1. Change difference plot colorbar to scientific notation (CICE-Consorti… 

    …um#506)
    @mattdturner
    mattdturner committed Aug 21, 2020
    Configuration menu
    Copy the full SHA
    e5ff1f2 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2020

  1. Moved calculation of sicen and trcrn_bgc to the loop where they are u… 

    …sed. The current construction did not use the calculated values as they were defined private and overwritten at each i/j (CICE-Consortium#507)
    @TillRasmussen
    TillRasmussen committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    cfca1a8 View commit details
    Browse the repository at this point in the history

  2. deprecate upwind advection (CICE-Consortium#508) 

    * deprecate upwind advection

* fix diagnostic info

* remove single quotes

* error message if upwind is used
    @eclare108213
    eclare108213 committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    164fcfc View commit details
    Browse the repository at this point in the history

  3. doc: correct description of box2001 test (CICE-Consortium#510) 

    The documentation states that this test case sets 'coriolis' to zero,
but 'configuration/scripts/options/set_nml.box2001' sets 'coriolis' to 'constant'.
Fix the documentation to be in line with the code.

While at it, add the correct unit for the Coriolis parameter (in both places
where it appears in the documentation).

Closes CICE-Consortium#509

Reported-by: Jean-François Lemieux <jean-francois.lemieux@canada.ca>
    @phil-blain
    phil-blain committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    40533df View commit details
    Browse the repository at this point in the history

  4. update icepack and version number (CICE-Consortium#511)

    @apcraig
    apcraig committed Aug 26, 2020
    Configuration menu
    Copy the full SHA
    7888bc8 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2020

  1. update icepack

    @DeniseWorthen
    DeniseWorthen committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    fa24898 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into feature/compilefix

    @DeniseWorthen
    DeniseWorthen committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    0d8139d View commit details
    Browse the repository at this point in the history

  3. doc: fix ice strength description (CICE-Consortium#513) 

    Ice pressure is different from ice strength, so remove 'pressure' from
the description of 'ice strength'.
    @phil-blain
    phil-blain committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    c0a2e2d View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2020

  1. update icepack with debug fix in noaa-emc fork

    @DeniseWorthen
    DeniseWorthen committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    6acae5b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'consortium/master' into feature/compilefix

    @DeniseWorthen
    DeniseWorthen committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    d9b2838 View commit details
    Browse the repository at this point in the history