Conflicts resolved#10

Merged

ElizabethYankovsky merged 57 commits into

ElizabethYankovsky:grace_backscatterfrom

marshallward:grace_backscatter

Sep 27, 2024

Commits on Jul 29, 2024

Commits on Jul 31, 2024

(*)More parentheses in density_integrals for FMAs
Hallberg-NOAA
committed

Commits on Aug 2, 2024

(*)Add parentheses in end_value_h4 for FMAs
Hallberg-NOAA
committed

Commits on Aug 24, 2024

Merge pull request #1634 from Hallberg-NOAA/FMA_rotational_symmetry_main
Hallberg-NOAA
authored

Commits on Sep 3, 2024

Makedep output cleanup and PEP8 fixes
marshallward
committed

Commits on Sep 4, 2024

Merge branch 'main' into dev/gfdl
Hallberg-NOAA
committed

Commits on Sep 6, 2024

Inline harmonic analysis

c2xu
authored and
marshallward
committed

Commits on Sep 9, 2024

diffusivities from internal tides ray tracing algo (#677)
raphaeldussin
authored

Commits on Sep 10, 2024

Streaming filter (#675)
c2xu
authored

Commits on Sep 11, 2024

+Optionally use SSH in calculate density for PGF

Hallberg-NOAA
authored and
marshallward
committed
(*)Refactor p_ave calculation

Hallberg-NOAA
authored and
marshallward
committed

Commits on Sep 12, 2024

Rotate ice shelf forcing and initialization

Hallberg-NOAA
authored and
marshallward
committed

Commits on Sep 17, 2024

+Add MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP

claireyung
authored and
marshallward
committed
+Add top mass_weight_in_PGF option to 13 integrals

Hallberg-NOAA
authored and
marshallward
committed
+Add CORRECTION_INTXPA

claireyung
authored and
marshallward
committed
+Add CORRECTION_INTXPA_5PT

claireyung
authored and
marshallward
committed
+Add RESET_INTXPA_INTEGRAL

claireyung
authored and
marshallward
committed
Revisions of sub-ice pressure gradient fixes

Hallberg-NOAA
authored and
marshallward
committed
*Refactor CORRECTION_INTX_PA

Hallberg-NOAA
authored and
marshallward
committed
*Non-Boussinesq code for RESET_INTXPA_INTEGRAL

Hallberg-NOAA
authored and
marshallward
committed
+(*)Add 5-point quadrature in RESET_INTXPA_INTEGRAL

Hallberg-NOAA
authored and
marshallward
committed
+(*)Eliminate CORRECTION_INTXPA_5PT

Hallberg-NOAA
authored and
marshallward
committed
*Set MASS_WEIGHT_IN_PRESSURE_GRADIENT in .testing

Hallberg-NOAA
authored and
marshallward
committed
Dummy code to suppress errors in posix.F90
marshallward
committed
F2023: Fix argument orders and IO statements
marshallward
committed
Reorder arguments in FMS_cap functions
marshallward
committed
CI: Fortran 2018 testing
marshallward
committed

Commits on Sep 18, 2024

Commits on Sep 24, 2024

Merge branch 'dev/gfdl' into grace_merge
marshallward
committed