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

Updates in Langmuir turbulence parameterization #74

Merged
merged 28 commits into from
Apr 4, 2019
Merged

Updates in Langmuir turbulence parameterization #74

merged 28 commits into from
Apr 4, 2019

Commits on Jul 25, 2016

  1. Added a public function cvmix_kpp_efactor_read()

    @qingli411
    qingli411 committed Jul 25, 2016
    Configuration menu
    Copy the full SHA
    4578852 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2018

  1. Merge remote-tracking branch 'upstream/master'

    @qingli411
    qingli411 committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    b3df4cb View commit details
    Browse the repository at this point in the history

  2. Test for Langmuir turbulence parameterization

    @qingli411
    qingli411 committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    8812212 View commit details
    Browse the repository at this point in the history

  3. Langmuir enhanced entrainment in cvmix_kpp.F90

    @qingli411
    qingli411 committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    dc96320 View commit details
    Browse the repository at this point in the history

  4. Clean up function cvmix_kpp_efactor_model() and add new function cvmi… 

    …x_kpp_ustokes_SL_model() to have easier access to the predicted surface layer averaged Stokes drift.
    @qingli411
    qingli411 committed Jan 30, 2018
    Configuration menu
    Copy the full SHA
    bc7e36e View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2018

  1. Add kpp-langmuir test

    @qingli411
    qingli411 committed Jan 31, 2018
    Configuration menu
    Copy the full SHA
    d6e3974 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2018

  1. Langmuir enhanced entrainment

    @qingli411
    qingli411 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    c09d16e View commit details
    Browse the repository at this point in the history

  2. Working on cvmix_kpp_langmuir_drv.F90

    @qingli411
    qingli411 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    96f4fbb View commit details
    Browse the repository at this point in the history

  3. Add c_CT, c_ST, c_LT, p_LT in cvmix_get_kpp()

    @qingli411
    qingli411 committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    66b8919 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2018

  1. Update README

    @qingli411
    qingli411 committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    68c8315 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2018

  1. Changes for including RWHGK16 KPP-LT

    @breichl
    breichl committed May 10, 2018
    Configuration menu
    Copy the full SHA
    5332720 View commit details
    Browse the repository at this point in the history

  2. Fix issues with casing in kpp_put and kpp_get

    @breichl
    breichl committed May 10, 2018
    Configuration menu
    Copy the full SHA
    d628726 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2018

  1. Fix the sign error in the power of LaSL in the enhanced entrainment s… 

    …caling
    @qingli411
    qingli411 committed May 15, 2018
    Configuration menu
    Copy the full SHA
    21e69b4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'langmuir' into develop

    @qingli411
    qingli411 committed May 15, 2018
    Configuration menu
    Copy the full SHA
    cd9e523 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2018

  1. Updates to CVMix KPP for RWHGK16 method for Langmuir turbulence.

    @breichl
    breichl committed May 17, 2018
    Configuration menu
    Copy the full SHA
    3c7e13a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into WORK_BGR 

     Conflicts:
	src/shared/cvmix_kpp.F90
    @breichl
    breichl committed May 17, 2018
    Configuration menu
    Copy the full SHA
    e778ad3 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. Update cvmix_kpp_compute_unresolved_shear()

    @qingli411
    qingli411 committed May 31, 2018
    Configuration menu
    Copy the full SHA
    c277f4a View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. Clean up subroutines in cvmix_kpp.F90 

    1. Langmuir mixing and entrainment option 'L16' -> 'LWF16'
2. Enhancement factor is no longer an input for
cvmix_kpp_compute_turbulent_scales(), applied after
the turbulent scales are calculated.
3. Enhancement factor as an optional input for
cvmix_kpp_compute_bulk_Richardson(), required when
Langmuir_entrainment_str = 'LWF16'.
    @qingli411
    qingli411 committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    7909478 View commit details
    Browse the repository at this point in the history

  2. Fix a bug introduced by the last commit 

    The enhancement factor was applied twice to the diffusivity when
Langmuir_Mixing_Opt = 'LWF16'.
    @qingli411
    qingli411 committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    727bd10 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2019

  1. Remove the public function cvmix_kpp_efactor_read()

    @qingli411
    qingli411 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    0724407 View commit details
    Browse the repository at this point in the history

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

    @qingli411
    qingli411 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    0f34f73 View commit details
    Browse the repository at this point in the history

  3. Clean up langmuir driver

    @qingli411
    qingli411 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    13866b8 View commit details
    Browse the repository at this point in the history

  4. Clean up README.md

    @qingli411
    qingli411 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    1ff0731 View commit details
    Browse the repository at this point in the history

  5. Clean up

    @qingli411
    qingli411 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    4b15f69 View commit details
    Browse the repository at this point in the history

  6. Suppress warning -Werror=unused-dummy-argument for gfortran

    @qingli411
    qingli411 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    7c2116d View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2019

  1. Fix issues with checking the Langmuir options; Clean up

    @qingli411
    qingli411 committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    9d400e4 View commit details
    Browse the repository at this point in the history

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

    @qingli411
    qingli411 committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    6f28b3a View commit details
    Browse the repository at this point in the history

  3. Remove flag -Wno-unused-dummy-argument for gfortran

    @qingli411
    qingli411 committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    b774d0f View commit details
    Browse the repository at this point in the history