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

add BLOM specific settings #6

Merged
merged 75 commits into from
May 26, 2023
Merged

add BLOM specific settings #6

merged 75 commits into from
May 26, 2023

Commits on Apr 12, 2023

  1. Added Fwxx_taux and Fwxx_tauy, based on Foxx_taux and Foxx_tauy

    @phall-brown
    phall-brown committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    4cf3e05 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Trying simpler form of sharing Foxx to compwav

    @phall-brown
    phall-brown committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    e68d9bc View commit details
    Browse the repository at this point in the history

  2. Turning off Foxx export to waves for testing

    @phall-brown
    phall-brown committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    eb18694 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Adding Fwxx_taux to get wind stress to pass to wave model

    @phall-brown
    phall-brown committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    c791efc View commit details
    Browse the repository at this point in the history

  2. Adding Fwxx_taux, using Foxx_taux as a model

    @phall-brown
    phall-brown committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    8db2449 View commit details
    Browse the repository at this point in the history

  3. Comment out unnecessary line

    @phall-brown
    phall-brown committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    a599c2f View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. update the minimum esmf version requirement

    @jedwards4b
    jedwards4b committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    f126b9f View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. Adding custom field subroutine for waves with cesm, based on equivale… 

    …nt routine for ocn component
    @phall-brown
    phall-brown committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    17fa9d5 View commit details
    Browse the repository at this point in the history

  2. Passing So_ofrac to wav component

    @phall-brown
    phall-brown committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    5712122 View commit details
    Browse the repository at this point in the history

  3. Changing merge to Fwxx_taux to copy

    @phall-brown
    phall-brown committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    e6451a4 View commit details
    Browse the repository at this point in the history

  4. Fixed syntax of addmrg_to call for Fwxx_taux

    @phall-brown
    phall-brown committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    bdd726a View commit details
    Browse the repository at this point in the history

  5. Reverted earlier modifications

    @phall-brown
    phall-brown committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    dec4bfb View commit details
    Browse the repository at this point in the history

  6. Substituting Foxx_taux for Faox_taux

    @phall-brown
    phall-brown committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    d4b8441 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. Revert "Substituting Foxx_taux for Faox_taux" 

    This reverts commit d4b8441.
    @phall-brown
    phall-brown committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    d666f83 View commit details
    Browse the repository at this point in the history

  2. Removed export of So_ofrac to wav component (unnecessary), and other … 

    …miscellaneous cleanup
    @phall-brown
    phall-brown committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    3925710 View commit details
    Browse the repository at this point in the history

  3. Cleaning up earlier, temporary code

    @phall-brown
    phall-brown committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    e142b2d View commit details
    Browse the repository at this point in the history

  4. Removed unnecessary fldList variable

    @phall-brown
    phall-brown committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    14bd205 View commit details
    Browse the repository at this point in the history

  5. Adding stress from ice to Fwxx_taux

    @phall-brown
    phall-brown committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    abc5658 View commit details
    Browse the repository at this point in the history

  6. Removed mrg_fracname from Fwxx merges

    @phall-brown
    phall-brown committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    cb585c5 View commit details
    Browse the repository at this point in the history

  7. Added ifrac and ofrac to FBFrac for wave component

    @phall-brown
    phall-brown committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    95c5188 View commit details
    Browse the repository at this point in the history

  8. Using ifrac and ofrac weights for Fbww merge

    @phall-brown
    phall-brown committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    5633ff2 View commit details
    Browse the repository at this point in the history

  9. Updated comments to include wave component

    @phall-brown
    phall-brown committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    a3c13d2 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. improves the readability of salt budget

    @jedwards4b
    jedwards4b committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    962646a View commit details
    Browse the repository at this point in the history

  2. undo accidental commit

    @jedwards4b
    jedwards4b committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    f80e7d7 View commit details
    Browse the repository at this point in the history

  3. Added new fractions (ifrac, ofrac) for wave component

    @phall-brown
    phall-brown committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    68baf9f View commit details
    Browse the repository at this point in the history

  4. Added compwav declaration to med_fraction_set subroutine

    @phall-brown
    phall-brown committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    04296bd View commit details
    Browse the repository at this point in the history

  5. Corrected two typos where compice was being passed instead of compwav

    @phall-brown
    phall-brown committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    5bc4403 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2023

  1. Removing previous additions for wavcomp

    @phall-brown
    phall-brown committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    69317cb View commit details
    Browse the repository at this point in the history

  2. Removing stress from compice from Fwxx_taux

    @phall-brown
    phall-brown committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    baaf12c View commit details
    Browse the repository at this point in the history

  3. turn off HierarchyProtocol, not used in cesm this is a memory and ini… 

    …tialization time saver
    @jedwards4b
    jedwards4b committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    24f419c View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. correct comment delimiter

    @jedwards4b
    jedwards4b committed May 1, 2023
    Configuration menu
    Copy the full SHA
    9c43424 View commit details
    Browse the repository at this point in the history

  2. Merge pull request ESCOMP#369 from jedwards4b/Turn_OFF_HierarchyProtocol 

    turn off HierarchyProtocol
    @jedwards4b
    jedwards4b authored May 1, 2023
    Configuration menu
    Copy the full SHA
    fcc45ff View commit details
    Browse the repository at this point in the history

  3. Merge pull request ESCOMP#368 from jedwards4b/improve_diag_salt_format 

    Improve diag salt format
    @jedwards4b
    jedwards4b authored May 1, 2023
    Configuration menu
    Copy the full SHA
    cf7ec4f View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. check for nans

    @mvertens
    mvertens committed May 5, 2023
    Configuration menu
    Copy the full SHA
    7bb5053 View commit details
    Browse the repository at this point in the history

  2. Merge pull request ESCOMP#376 from NorESMhub/noresm 

    changes to bring cmeps up to date with changes in noresm
    @jedwards4b
    jedwards4b authored May 5, 2023
    Configuration menu
    Copy the full SHA
    284137f View commit details
    Browse the repository at this point in the history

  3. refactored logic

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

  4. updated med_diag_mod with recent changes from escomp

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

Commits on May 6, 2023

  1. This fails to enable writing of 'daily' files from forecasts shorter … 

    …than 24 hours
    @kdraeder
    kdraeder committed May 6, 2023
    Configuration menu
    Copy the full SHA
    311582c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'aux_cpl_hist_daily' of github.com:kdraeder/CMEPS into a… 

    …ux_cpl_hist_daily

Because git told me to do it.
I'm trying to set up a remote to my new fork of CMEPS
in order to push changes on the aux_cpl_hist_daily branch.
    @kdraeder
    kdraeder committed May 6, 2023
    Configuration menu
    Copy the full SHA
    0d2a0c8 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. updated counters for nans

    @mvertens
    mvertens committed May 8, 2023
    Configuration menu
    Copy the full SHA
    83bba42 View commit details
    Browse the repository at this point in the history

  2. consistent alias of use statements for check_for_nans

    @mvertens
    mvertens committed May 8, 2023
    Configuration menu
    Copy the full SHA
    0b59db6 View commit details
    Browse the repository at this point in the history

  3. fixed compilation bug

    @mvertens
    mvertens committed May 8, 2023
    Configuration menu
    Copy the full SHA
    64439f7 View commit details
    Browse the repository at this point in the history

  4. add ability to compile without needed shr_infnan - as is the case for… 

    … UFS
    @mvertens
    mvertens committed May 8, 2023
    Configuration menu
    Copy the full SHA
    5e02def View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Changed Fwxx_taux merge to use 'wfrac'

    @phall-brown
    phall-brown committed May 9, 2023
    Configuration menu
    Copy the full SHA
    f1dedf5 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. Merge pull request ESCOMP#377 from mvertens/feature/check_for_nans 

    checking of nans in export field bundles
    @jedwards4b
    jedwards4b authored May 10, 2023
    Configuration menu
    Copy the full SHA
    22b6278 View commit details
    Browse the repository at this point in the history

  2. Adding merge to wave component Fwxx_taux based on Foxx_taux

    @phall-brown
    phall-brown committed May 10, 2023
    Configuration menu
    Copy the full SHA
    2685626 View commit details
    Browse the repository at this point in the history

  3. Fixed a compocn that should have been compwav

    @phall-brown
    phall-brown committed May 10, 2023
    Configuration menu
    Copy the full SHA
    9d4e81c View commit details
    Browse the repository at this point in the history

  4. Adding ifrac and ofrac to fraclist_w

    @phall-brown
    phall-brown committed May 10, 2023
    Configuration menu
    Copy the full SHA
    3ca2795 View commit details
    Browse the repository at this point in the history

  5. make history_n integer variables

    @jedwards4b
    jedwards4b committed May 10, 2023
    Configuration menu
    Copy the full SHA
    7ac3ca9 View commit details
    Browse the repository at this point in the history

  6. sames should be samples

    @jedwards4b
    jedwards4b committed May 10, 2023
    Configuration menu
    Copy the full SHA
    b22ae22 View commit details
    Browse the repository at this point in the history

  7. wopen should return rc

    @jedwards4b
    jedwards4b committed May 10, 2023
    Configuration menu
    Copy the full SHA
    cca94e4 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Merge pull request ESCOMP#365 from jedwards4b/update_esmf_min_version 

    update the minimum esmf version requirement
    @jedwards4b
    jedwards4b authored May 11, 2023
    Configuration menu
    Copy the full SHA
    a936f7e View commit details
    Browse the repository at this point in the history

  2. major refactor of med_io_mod to handle multiple files

    @jedwards4b
    jedwards4b committed May 11, 2023
    Configuration menu
    Copy the full SHA
    a316646 View commit details
    Browse the repository at this point in the history

  3. ntperfile should be type integer

    @jedwards4b
    jedwards4b committed May 11, 2023
    Configuration menu
    Copy the full SHA
    4490cff View commit details
    Browse the repository at this point in the history

  4. remove unused variable

    @jedwards4b
    jedwards4b committed May 11, 2023
    Configuration menu
    Copy the full SHA
    57e1970 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1 from jedwards4b/history_n 

    make history_n integer variables
    @kdraeder
    kdraeder authored May 11, 2023
    Configuration menu
    Copy the full SHA
    1aab35a View commit details
    Browse the repository at this point in the history

  6. CESM_COUPLED should be CESMCOUPLED

    @jedwards4b
    jedwards4b committed May 11, 2023
    Configuration menu
    Copy the full SHA
    5d7470d View commit details
    Browse the repository at this point in the history

  7. Candidate fixes of descriptions and comments

    @kdraeder
    kdraeder committed May 11, 2023
    Configuration menu
    Copy the full SHA
    b60c9d7 View commit details
    Browse the repository at this point in the history

  8. Merge pull request ESCOMP#380 from jedwards4b/cesmcoupledfix 

    CESM_COUPLED should be CESMCOUPLED
    @jedwards4b
    jedwards4b authored May 11, 2023
    Configuration menu
    Copy the full SHA
    106a99d View commit details
    Browse the repository at this point in the history

  9. remove dead code

    @jedwards4b
    jedwards4b committed May 11, 2023
    Configuration menu
    Copy the full SHA
    42a5fd5 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. adjust indentation

    @jedwards4b
    jedwards4b committed May 12, 2023
    Configuration menu
    Copy the full SHA
    96206b6 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Merge pull request ESCOMP#378 from kdraeder/aux_cpl_hist_daily 

    Aux cpl hist daily
    @jedwards4b
    jedwards4b authored May 15, 2023
    Configuration menu
    Copy the full SHA
    f2cbf27 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. updates for new stresses sent to wave

    Mariana Vertenstein committed May 16, 2023
    Configuration menu
    Copy the full SHA
    a587023 View commit details
    Browse the repository at this point in the history

  2. merged to head of escomp/main

    Mariana Vertenstein committed May 16, 2023
    Configuration menu
    Copy the full SHA
    3dbbda3 View commit details
    Browse the repository at this point in the history

  3. udpates needed to pass taux and tauxy to wave

    Mariana Vertenstein committed May 16, 2023
    Configuration menu
    Copy the full SHA
    ca8ca8b View commit details
    Browse the repository at this point in the history

  4. fixed compile bugs

    Mariana Vertenstein committed May 16, 2023
    Configuration menu
    Copy the full SHA
    d64ffe9 View commit details
    Browse the repository at this point in the history

  5. fixed compile bugs

    Mariana Vertenstein committed May 16, 2023
    Configuration menu
    Copy the full SHA
    488b8d9 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Merge pull request ESCOMP#382 from mvertens/feature/theorywaves 

    add new optional mapping of taux and tauy from ocean to wave
    @jedwards4b
    jedwards4b authored May 17, 2023
    Configuration menu
    Copy the full SHA
    09d1e08 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. make xgrid default (should have been in alpha12c) and fix sw flux to … 

    …mom ocn
    @jedwards4b
    jedwards4b committed May 23, 2023
    Configuration menu
    Copy the full SHA
    dabe6d3 View commit details
    Browse the repository at this point in the history

  2. slight change in logic

    @jedwards4b
    jedwards4b committed May 23, 2023
    Configuration menu
    Copy the full SHA
    e94015a View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Merge pull request ESCOMP#387 from jedwards4b/fix_aoflux_and_swtoocn 

    make xgrid default and fix sw flux to mom ocn
    @jedwards4b
    jedwards4b authored May 24, 2023
    Configuration menu
    Copy the full SHA
    b7bc64e View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. addition of BLOM logic to key XML settings like CPL_SEQ_OPTION

    @mvertens
    mvertens committed May 25, 2023
    Configuration menu
    Copy the full SHA
    97ed1fe View commit details
    Browse the repository at this point in the history

  2. Merge commit '97ed1fe' into feature/add_blom_settings

    @mvertens
    mvertens committed May 25, 2023
    Configuration menu
    Copy the full SHA
    1912caf View commit details
    Browse the repository at this point in the history

  3. Merge tag 'cmeps0.14.32' into feature/add_blom_settings 

    cmeps0.14.32
    @mvertens
    mvertens committed May 25, 2023
    Configuration menu
    Copy the full SHA
    6563613 View commit details
    Browse the repository at this point in the history

  4. made ogrid default for aoflux calculation - since xgrid crashes for f… 

    …19_tnx1v4
    @mvertens
    mvertens committed May 25, 2023
    Configuration menu
    Copy the full SHA
    48c247f View commit details
    Browse the repository at this point in the history