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.

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

more Momentum options, mostly related to hFac #809

Open
wants to merge 18 commits into
base: master
Choose a base branch
from

Commits on Nov 7, 2023

  1. New Coriolis option "selectCoriScheme = 4"

    This switch allows to compute Coriolis terms, both horizontal (in 2.Omega.sin(Phi))
    and NH (in 2.Omega.cos(Phi)), using the averaged transport (with face edge length
    and hFac factor), as done previously in V.I. for horizontal Coriolis.
    jm-c committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    8aa64f4 View commit details
    Browse the repository at this point in the history
  2. Change vertical advection for deepAtmosphere=T

    For deep-model, absorb the NH-metric terms w.(u,v)/r into vertical advection
    by advecting the product "deepFac x (u,v)" (instead of just u,v).
    jm-c committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    41c5588 View commit details
    Browse the repository at this point in the history
  3. improve new comments

    jm-c committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    e865e99 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Adjust NH coriolis (new, selectCoriScheme=4) expression

    - Add recip_hFacW/S (previously commented out) in new expression
      (selectCoriScheme=4) of NH coriolis f'*W term
    - remove hFacW/S from gW-Cori in selectCoriScheme=4 code and keep previous
      selectCoriScheme=4 code (with hFacW/S) under selectCoriScheme=6 block
    jm-c committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    2954ba7 View commit details
    Browse the repository at this point in the history
  2. New Spherical Metric term expression

    - New Spherical-Metric term form using grid-spacing finite differences (instead
      of analytical tan(Phi)/rSphere), supposed to improve both AM and KE conservation.
      Used (turned on) when selectVortScheme=1,2.
    - Add option to absorb the spherical-metric terms uMetricTerms = u.v.tanPhi/r
      into meridional advection by advecting the product "dxC x u" (instead of just u).
      Used (turned on) when selectVortScheme=2.
    Note: for now, re-cycle Flux-Form unused param "selectVortScheme" for this.
    jm-c committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    3ce0348 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. Adjust again gW-Cori just for the case selectCoriScheme=6

    This option (selectCoriScheme=6, in mom_w_coriolis_nh.F) was left from early
    test, with hFacW/S multiplying uVel,vVel, but without scaling by any recip_hFac.
    The changes here fix this issue as the gW-Cori term is now divided by the
    grid-cell thickness at the wVel location (new argument recip_rThickC).
    jm-c committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    f8641c5 View commit details
    Browse the repository at this point in the history
  2. Refine changes to vertical advection for deepAtmosphere=T

    Two improvements:
    - single CPP option "MOM_USE_OLD_DEEP_VERT_ADV" in MOM_COMMON_OPTIONS.h to
      disable changes to vertical advection for deepAtmosphere=T
    - fix for the case useNHTerms=F with deepAtmosphere=T.
    Done by keeping a local copy of deepFacC in MOM_VISC.h, and adding 1 new
    argument to S/R mom_u_adv_wu.F, mom_v_adv_wv.F, mom_vi_{u,v}_vertshear.F
    jm-c committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    658f29a View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Add new choice for vorticity advection, without r_hFacZ

    This new option (with selectCortScheme=4) skip the division of vorticity
    by hFacZ and replace it with tendency scaling by recip_hFacW/S
    Also:
     - remove code related to "upwindVort3" (was hard-coded to FALSE)
     - add some missing "_d 0" ; + minor indentation changes
    jm-c committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    1a91c9f View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Configuration menu
    Copy the full SHA
    d0b3dad View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2024

  1. Configuration menu
    Copy the full SHA
    e242cac View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. use new parameter "select3dCoriScheme"

    no need to hack selectCoriScheme params and leave mom_vi_coriolis.F unchanged
    jm-c committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    ab357ce View commit details
    Browse the repository at this point in the history
  2. use new parameter "selectMetricTerms"

    - no need to hack selectVortScheme param
    - compute advection tendency in separated block if selectMetricTerms
      This makes sure results will not be affected (at trucation level)
      with current default metric-terms.
    - minor cleaning in mom_u/v_coriolis.F and mom_u/v_adv_wu/v.F
    jm-c committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    d7c5e1d View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Configuration menu
    Copy the full SHA
    3577ffb View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Configuration menu
    Copy the full SHA
    30961ae View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Configuration menu
    Copy the full SHA
    de5088e View commit details
    Browse the repository at this point in the history
  2. add diagnostics for Metric-Terms tendency

    also rename 2 local variables (vF & v4F) more inline with other S/R
    and improve description
    jm-c committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    bd6a62e View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Configuration menu
    Copy the full SHA
    439d116 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Configuration menu
    Copy the full SHA
    501d198 View commit details
    Browse the repository at this point in the history