-
Notifications
You must be signed in to change notification settings - Fork 0
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
updating #5
updating #5
Commits on Jul 29, 2024
-
(*)Parenthesize squares of wind stresses for FMAs
Added parentheses to expressions taking the squares of the wind stress components in 70 lines in 7 files so that these expressions will be rotationally invariant when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs.
Configuration menu - View commit details
-
Copy full SHA for 6628dbf - Browse repository at this point
Copy the full SHA 6628dbfView commit details -
(*)Parenthesize continuity_PPM curv_3 expressions
Added parentheses to 9 expressions like `curv_3 = h_W(i) + h_E(i) - 2.0*h(i)` in PPM_limit_pos, zonal_flux_layer, zonal_flux_thickness, merid_flux_layer and merid_flux_thickness, changing them to `curv_3 = (h_W(i) + h_E(i)) - 2.0*h(i)`. This change enforces the order of arithmetic that is required to give rotational symmetry, but it also is the order that the Intel, GNU, and Nvidia compliers were all already using in these expressions. Moreover, had the order of arithmetic ever been anything else, this would have led to failures in our rotational consistency and redundant point consistency testing, and almost certainly would have been detected before. However, by adding these parentheses, there is a remote chance that the addition of these parentheses could change answers for some compiler or compiler settings we have never tested before. This change should not impact any FMA-enabled calculations. All answers are bitwise identical in the MOM6-examples regression suite as run on Gaea.
Configuration menu - View commit details
-
Copy full SHA for f0e61f3 - Browse repository at this point
Copy the full SHA f0e61f3View commit details -
(*)Add parentheses for oblique OBCs with FMAs
Added parentheses to 16 expressions setting the grad_gradient arrays with oblique_grad open boundary conditions and setting cff_new with all kinds of oblique boundary conditions so that they will be rotationally invariant when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers with certain types of open boundary conditions could change with FMAs.
Configuration menu - View commit details
-
Copy full SHA for 4f710ef - Browse repository at this point
Copy the full SHA 4f710efView commit details -
(*)Add parentheses for density_integrals with FMAs
Added parentheses to 150 lines in the 5 generic density integral routines (int_density_dz_generic_pcm, int_density_dz_generic_plm, int_density_dz_generic_ppm, int_spec_vol_dp_generic_pcm and int_spec_vol_dp_generic_plm) in the MOM_density_integrals module so that they will be rotationally invariant when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs.
Configuration menu - View commit details
-
Copy full SHA for 9172cd5 - Browse repository at this point
Copy the full SHA 9172cd5View commit details -
(*)Add parentheses to 4 EOS int_density routines
Added parentheses to 140 lines in 8 int_density_dz and int_spec_vol_dp routines for the linear, Wright, Wright_full and Wright_red equations of state so that they will be rotationally invariant when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs.
Configuration menu - View commit details
-
Copy full SHA for 24091cc - Browse repository at this point
Copy the full SHA 24091ccView commit details -
(*)Simplify density integral parentheses
Removed recently added parentheses around expressions like '+ (hL*hR)' in 110 lines in MOM_density_integrals and 4 equation of state module to reflect that these parentheses are not necessary for rotational symmetry in FMAs. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs.
Configuration menu - View commit details
-
Copy full SHA for 8066a3d - Browse repository at this point
Copy the full SHA 8066a3dView commit details -
(*)Parenthesize PressureForce_Montgomery for FMAs
Added parentheses to 4 lines in PressureForce_Mont_nonBouss and PressureForce_Mont_Bouss so that they will be rotationally invariant when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs in cases that use the Montgomery potential form of the pressure gradient accelerations.
Configuration menu - View commit details
-
Copy full SHA for 99fd957 - Browse repository at this point
Copy the full SHA 99fd957View commit details -
(*)Parenthesize calc_isoneutral_slopes for FMAs
Added parentheses to 4 lines in calc_isoneutral_slopes so that they will be rotationally invariant when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs.
Configuration menu - View commit details
-
Copy full SHA for 307a4e2 - Browse repository at this point
Copy the full SHA 307a4e2View commit details -
(*)Parenthesize MOM_calc_varT for FMAs
Added parentheses to 2 lines in MOM_calc_varT so that they will be rotationally invariant when fused-multiply-adds are enabled. In this case, FMAs can still be applied to the impacted lines, exploiting that the masks are always 0 or 1. Also added parentheses to 2 other lines used to generate the stochastic pattern for rotational symmetry with FMAs. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs.
Configuration menu - View commit details
-
Copy full SHA for ce559ce - Browse repository at this point
Copy the full SHA ce559ceView commit details -
(*)Parenthesize tracer_hordiff for FMAs
Added parentheses to the calculation of the diffusive temperature changes in tracer_hordiff so that it will be rotationally invariant when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs.
Configuration menu - View commit details
-
Copy full SHA for c344a11 - Browse repository at this point
Copy the full SHA c344a11View commit details -
(*)Parenthesize iceberg_forces for FMAs
Added parentheses to the calculation of the iceberg contribution to the fractional area of ice shelves in iceberg_forces so that it will be rotationally invariant when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs enabled in cases with tabular icebergs.
Configuration menu - View commit details
-
Copy full SHA for b2beab2 - Browse repository at this point
Copy the full SHA b2beab2View commit details -
(*)Parenthesize CoriolisStokes and LA_Stk for FMAs
Added parentheses to the calculation of the Stokes-drift Coriolis velocity increments in CoriolisStokes so that it will be rotationally invariant when fused-multiply-adds are enabled. All answers are bitwise identical because CoriolisStokes is still under development and is never called, with a fatal error occurring if anyone tries to use it. Also added parentheses to two expressions calculating the magnitude of the Stokes velocity in get_Langmuir_Number. Answers could change for some cases that use Langmuir turbulence parameterizations with FMAs enabled.
Configuration menu - View commit details
-
Copy full SHA for 5398e6f - Browse repository at this point
Copy the full SHA 5398e6fView commit details -
Added the new element Coriolis2Bu to the ocean_grid_type and the dyn_horgrid_type to hold the square of the Coriolis parameter, and use this array in 10 routines (including btstep, set_dtbt, calculate_diagnostic_fields, VarMix_init, propagate_int_tide, Calculate_kappa_shear, Calc_kappa_shear_vertex and add_MLrad_diffusivity) that had been calculating and averaging the square of the Coriolis parameter. This could change some answers with FMAs enabled because the compilers were previously free to split up some of the squares when averaging the squared Coriolis parameter, but without FMAs all answers are bitwise identical. This commit does add a new element to two transparent types.
Configuration menu - View commit details
-
Copy full SHA for 56d053a - Browse repository at this point
Copy the full SHA 56d053aView commit details -
(*)Parenthesize thickness_diffuse for FMAs
Added parentheses to 17 expressions in thickness_diffuse_full, thickness_diffuse and thickness_diffuse_init to give rotationally consistent solutions when fused-multiply-adds are enabled. One comment was also added to note that the calculation of PE_release_h is does not exhibit rotational symmetry when MEKE_GM_SRC_ALT is set to true. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for 49419f7 - Browse repository at this point
Copy the full SHA 49419f7View commit details -
(*)Parenthesize Zanna_Bolton for FMAs
Added parentheses to 2 expressions in the Zanna_Bolton code and rearranged another line so that the u- and v-discretizations introduce terms in the same order so that the Zanna_Bolton code will exhibit rotationally consistent solutions when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs enabled in cases that use the Zanna-Bolton parameterization.
Configuration menu - View commit details
-
Copy full SHA for 03dc6f9 - Browse repository at this point
Copy the full SHA 03dc6f9View commit details -
(*)Parenthesize MOM_internal_tides for FMAs
Added parentheses to 19 expressions in the MOM_internal_tides propagation code to exhibit rotationally consistent solutions when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled in models that use the ray-tracing based internal tides code.
Configuration menu - View commit details
-
Copy full SHA for 654cd4a - Browse repository at this point
Copy the full SHA 654cd4aView commit details -
(*)Parenthesize find_uv_at_h for FMAs
Added parentheses to 10 expressions in find_uv_at_h to exhibit rotationally consistent solutions and treat the velocities at both edges of a tracer cell equivalently when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for ebf02a9 - Browse repository at this point
Copy the full SHA ebf02a9View commit details -
(*)Parenthesize set_viscous_ML for FMAs
Added parentheses to 19 expressions in set_viscous_ML, set_u_at_v and set_v_at_u to treat the velocities at both edges of a tracer cell equivalently when fused-multiply-adds are enabled, and thereby to exhibit exhibit rotationally consistent solutions. Also swapped the order of the u- and v-components in the u-point calculation of Uh2 to mirror the order of the corresponging v-point calculation for the same purpose. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for c0bef18 - Browse repository at this point
Copy the full SHA c0bef18View commit details -
(*)Rearrange calc_kappa_shear_vertex for FMAs
Added mathematically equivalent rearrangements of the code in calc_kappa_shear_vertex that interpolates velocities, temperatures and salinities to the vertices to expose the mask variables while ensuring that the other multiplications occur within parentheses so that they will exhibit rotational symmetry when fused-multiply-adds are enabled. FMAs can still occur, but it will be multiplication by the 0-or-1 masks that are fused with an addition. Also added parentheses to 3 expressions calculating the squared shear in calculate_projected_state for rotational symmetry with FMAs. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for 0b50a15 - Browse repository at this point
Copy the full SHA 0b50a15View commit details -
(*)Parenthesize MOM_set_diffusivity for FMAs
Added parentheses to 4 expressions in add_drag_diffusivity, set_BBL_TKE and add_LOTW_BBL_diffusivity setting the bottom-drag contributions to TKE and friction velocity so that they will exhibit rotationally consistent solutions when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for f0c52dd - Browse repository at this point
Copy the full SHA f0c52ddView commit details -
(*)Parenthesize CorAdCalc for FMAs
Added parentheses to 20 expressions in CorAdCalc and one in gradKE to exhibit rotationally consistent solutions when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for 64b851c - Browse repository at this point
Copy the full SHA 64b851cView commit details -
(*)Parenthesize MOM_barotropic for FMAs
Added parentheses to 18 expressions in btstep, and one more each in set_dtbt and barotropic_init to exhibit rotationally consistent solutions when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for 46e8b66 - Browse repository at this point
Copy the full SHA 46e8b66View commit details -
(*)Parenthesize MOM_lateral_mixing_coeffs for FMAs
Added parentheses to 19 expressions in 5 routines (calc_Visbeck_coeffs_old, calc_Eady_growth_rate_2D, calc_slope_functions_using_just_e, calc_QG_Leith_viscosity VarMix_init) in MOM_lateral_mixing_coeffs.F90 to give rotationally consistent solutions when fused-multiply-adds are enabled. Also reordered terms in a sum in the calculation of beta_dx2_u to mirror that of beta_dx2_v, also for rotational symmetry with FMAs. All answers are bitwise identical in cases without FMAs, but answers could change for some parameter settings when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for 6216fa1 - Browse repository at this point
Copy the full SHA 6216fa1View commit details -
(*)Parenthesize MOM_hor_visc for FMAs
Added parentheses to 40 expressions horizontal_viscosity and another 14 expressions in in hor_visc_init and 3 more in align_aniso_tensor_to_grid to give rotationally consistent solutions when fused-multiply-adds are enabled. Also swapped the order of two terms in the expression for Del2u to mirror the order of the corresponding terms in Del2v for rotational symmetry with FMAs. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for ffef92f - Browse repository at this point
Copy the full SHA ffef92fView commit details -
(*)Parenthesize initialization squares for FMAs
Added parentheses to 20 sums of squares of x- and y- distances or velocity components used for initialization in 8 modules to give rotationally consistent solutions when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for fc2af28 - Browse repository at this point
Copy the full SHA fc2af28View commit details -
(*)Parenthesize parameterization squares for FMAs
Added parentheses to 29 sums of squares of velocity or other vector components used in parameterizations in 9 modules to give rotationally consistent solutions when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for 44f1130 - Browse repository at this point
Copy the full SHA 44f1130View commit details -
(*)Parenthesize diagnostics for FMAs
Added parentheses to 9 diagnostics of Coriolis accelerations or expressions used in the kinetic energy budgets to give rotationally consistent solutions when fused-multiply-adds are enabled. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for 182223c - Browse repository at this point
Copy the full SHA 182223cView commit details -
(*)Parenthesize tracer_advect PPM edge values
Added parentheses to 4 tracer edge value calculations used with PPM tracer advection to give rotationally consistent solutions when fused-multiply-adds are enabled. Although these lines may not appear to need parentheses, some compliers appear to be putting these expressions directly into others, where the direction of the flow seems to determine which multiplications are incorporated into FMAs. All answers are bitwise identical in cases without FMAs, but answers could change when FMAs are enabled.
Configuration menu - View commit details
-
Copy full SHA for e810ac5 - Browse repository at this point
Copy the full SHA e810ac5View commit details
Commits on Jul 31, 2024
-
(*)More parentheses in density_integrals for FMAs
Added parentheses around the full expressions for intz and intp in 10 more lines in 4 generic density integral routines (int_density_dz_generic_pcm, int_density_dz_generic_ppm, int_spec_vol_dp_generic_pcm and int_spec_vol_dp_generic_plm) in the MOM_density_integrals module so that non-Boussinesq cases will be rotationally invariant when fused-multiply-adds are enabled. Although this might not seem to do anything, these parentheses do matter if these expressions are in-lined in the sums where they are used a few lines later. The analogous parentheses had previously been added to int_density_dz_generic_plm. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs.
Configuration menu - View commit details
-
Copy full SHA for ffa766b - Browse repository at this point
Copy the full SHA ffa766bView commit details
Commits on Aug 2, 2024
-
(*)Add parentheses in end_value_h4 for FMAs
Added parentheses to prevent FMAs in 4 expressions in end_value_h4 that rely on exact vertical symmetry in order to get the cancellations that are necessary to pass the vertical remapping unit testing. Before this change, the MOM6 unit-testing was failing when FMAs are enabled, but with it the unit-testing is passing even when FMAs are enabled. All answers are bitwise identical in cases without FMAs, but answers could change with FMAs.
Configuration menu - View commit details
-
Copy full SHA for fd82861 - Browse repository at this point
Copy the full SHA fd82861View commit details
Commits on Aug 24, 2024
-
Merge pull request mom-ocean#1634 from Hallberg-NOAA/FMA_rotational_s…
…ymmetry_main (*)Add parentheses for FMA rotational symmetry
Configuration menu - View commit details
-
Copy full SHA for ce58a32 - Browse repository at this point
Copy the full SHA ce58a32View commit details
Commits on Sep 3, 2024
-
Makedep output cleanup and PEP8 fixes
This patch makes some changes to makedep output: * Compile commands now end with the source code, rather than the include files. This makes it easier to see which file is being compiled. * Blank lines were added inbetween object file rules. * Redundant spaces from absent include flags is now removed. Also some minor PEP8-like cleanups: * Some (but not all) 79+ character lines were reduced or split. * Some (but not all) single-letter variables were renamed. * A bad error handler for missing macros was fixed. Nothing particularly major here, but build output should be more readable.
Configuration menu - View commit details
-
Copy full SHA for a6dd0fd - Browse repository at this point
Copy the full SHA a6dd0fdView commit details
Commits on Sep 4, 2024
-
Merge branch 'main' into dev/gfdl
This merge updates dev/gfdl following PR mom-ocean#1634 to main that added parentheses to give rotational symmetry when fused-multiply-adds are enabled.
Configuration menu - View commit details
-
Copy full SHA for 1eccd28 - Browse repository at this point
Copy the full SHA 1eccd28View commit details
Commits on Sep 6, 2024
-
Set default HAready = False Also made additional adjustment to ensure harmonic analysis is not activated if tide is not used in the model.
Configuration menu - View commit details
-
Copy full SHA for 91eee52 - Browse repository at this point
Copy the full SHA 91eee52View commit details
Commits on Sep 9, 2024
-
diffusivities from internal tides ray tracing algo (NOAA-GFDL#677)
* (*)bugfixes for internal tides - TKE_itidal_input values are set to zero where it is not applied to the model so that diagnostics are consistent - removed useless halo updates - diagnose energy loss terms as dE/dt instead of equivalent loss rate to properly close energy budget - tot_vel_btTide2 was already a velocity squared, no need to square again - Froude loss term was not properly initialized - add missing halo updates for internal tide speed - compute residual/critical slopes loss only where it has a meaning, allows to clean up noise in field - uh/vh in energy flux routines do not need to be inout * Refactor debugging internal tides - put test for negative energt behind debug flag - do energy budget in debug mode - add flags to skip refraction, propagation for debugging - add option to input TKE only at first step for debugging - add checksums for unit scaling testing - rewrite terms in refraction to avoid substractions of velocities - rewrite gradient of coriolis in rotationally invariant form * Add internal tides diffusivities - MOM_internal_tides gets new routine that converts TKE losses into diffusivities using the TKE_to_Kd array - MOM_set_diffusivities handles the diagnostics * extend find_rho_bottom to get bbl thickness/index * new calculation of BBL, profiles in H units
Configuration menu - View commit details
-
Copy full SHA for 2316ae5 - Browse repository at this point
Copy the full SHA 2316ae5View commit details
Commits on Sep 10, 2024
-
Streaming filter (NOAA-GFDL#675)
In the MOM_streaming_filter module, a system of two coupled ODEs is configured as a streaming band-pass filter that takes the broadband model output as the input and returns the filtered signal at a user specified tidal frequency as the output. It is capable of detecting the instantaneous tidal signals while the model is running, and can be used to impose frequency-dependent wave drag or to de-tide model output. An example of filtering the M2 and K1 barotropic velocities is provided in the MOM_barotropic module. Added runtime flags for the M2 and K1 filters. Simplified the code by removing the control structure of the linked list, and now each filter has its own control structure. Using hor_index_type argument to avoid calculation in halo regions.
Configuration menu - View commit details
-
Copy full SHA for 95744a7 - Browse repository at this point
Copy the full SHA 95744a7View commit details
Commits on Sep 11, 2024
-
+Optionally use SSH in calculate density for PGF
Added the option of including the atmospheric or ice pressure and sea surface height displacements from the global reference height in the pressures used in the density calculations for Boussinesq pressure gradient calculations. Note that the full pressures were already being used everywhere apart from the calculation of the equation of state. This capability is controlled by the new runtime parameter SSH_IN_EOS_PRESSURE_FOR_PGF. This commit changes the Z_0p argument to int_density_dz and 8 other routines (int_density_dz_generic_pcm, int_density_dz_generic_plm, int_density_dz_generic_ppm, analytic_int_density_dz, int_density_dz_wright, int_density_dz_wright_full, int_density_dz_wright_red and int_density_dz_linear) from scalars into 2-d arrays, as were the internal z0pres arrays in most of these routines. By default, all answers are bitwise identical, but there is a new runtime parameter in the MOM_parameter_doc files for Boussinesq cases.
Configuration menu - View commit details
-
Copy full SHA for ffff6f3 - Browse repository at this point
Copy the full SHA ffff6f3View commit details -
Rearranged the calculation of the layer average pressure used in the density integrals to have one less multiply and be clearer to read. This could change answers at roundoff if REFERENCE_HEIGHT is nonzero (it is 0 by default and in all known cases) or if SSH_IN_EOS_PRESSURE_FOR_PGF is set to true. Because the former is mostly used for approximate self-consistency testing and the latter option has just been added, it is unlikely that answers will change for any production runs.
Configuration menu - View commit details
-
Copy full SHA for 9b9c165 - Browse repository at this point
Copy the full SHA 9b9c165View commit details
Commits on Sep 12, 2024
-
Rotate ice shelf forcing and initialization
Added the ability to rotate the ice shelf forcing and initialization. The specific changes include correcting the grid passed to a call to initialize_ice_shelf in initialize_MOM, using a temporary mech_forcing type in add_shelf_forces when the grid is rotated, uncommenting and correcting the draft rotate_index code in initialize_ice_shelf, and correcting some error-checking and the grid passed to add_shelf_fluxes in initialize_ice_shelf_forces. In addition, unused hor_index_type elements were removed from the ice_shelf_CS, and some callTree calls were added to save_MOM_restart and initialize_ice_shelf. Without rotation, all answers are bitwise identical, but some cases that would have failed previously will now work.
Configuration menu - View commit details
-
Copy full SHA for 5fc90eb - Browse repository at this point
Copy the full SHA 5fc90ebView commit details
Commits on Sep 17, 2024
-
+Add MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP
Add MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP option for the top boundary, using top interface height, analogously to what is done near the bathymetry when MASS_WEIGHT_IN_PRESSURE_GRADIENT. The information from the is parameter is encoded in the MassWghtInterp value passed to the various int_density_... and int_spec_vol_... routines, so the routine interfaces do not change. For now this new bit of information about whether to do mass weighting near the surface under ice shelves is only used in int_density_dz_generic_plm. By default this new option is set to false and no answers are changed.
Configuration menu - View commit details
-
Copy full SHA for 70a48e3 - Browse repository at this point
Copy the full SHA 70a48e3View commit details -
+Add top mass_weight_in_PGF option to 13 integrals
Implemented the MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP related capabilities to the 13 density or specific volume integral routines that did not have them yet, mirroring what was already done in int_density_dz_generic_plm. This includes both the density integral routines that are used primarily for Boussinesq cases and the specific volume integral routines that are primarily used with non-Boussinesq simulations. This change includes the addition of an optional SSH argument to int_density_dz and 6 other related routines (int_density_dz_generic_pcm, analytic_int_density_dz, int_density_dz_wright, int_density_dz_wright_full, int_density_dz_wright_red and int_density_dz_linear). It also includes the addition of an optional P_surf argument to int_specific_vol_dp and 7 other related routines (int_spec_vol_dp_generic_pcm, int_spec_vol_dp_generic_plm, analytic_int_specific_vol_dp int_spec_vol_dp_wright, int_spec_vol_dp_wright_full, int_spec_vol_dp_wright_red and int_spec_vol_dp_linear). Both of these new optional arguments are required when the new near-surface mass weighting is activated, and there are test that would issue a fatal error if they are not provided in such cases. (Note that these routines can be called from other places than the pressure gradient force calculation, in which case the calculations that need these fields are not done.) The diagnose_mass_weight_Z and diagnose_mass_weight_p diagnostic routines were similarly revised to mirror the expanded range of capabilities in the integral routines. This commit can change answers when MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP is true, but all answers are bitwise identical otherwise. There are new arguments to 15 publicly visible routines.
Configuration menu - View commit details
-
Copy full SHA for 8520c9f - Browse repository at this point
Copy the full SHA 8520c9fView commit details -
Add CORRECTION_INTXPA which makes a quadratic correction to surface pressure integrals (intx_pa and inty_pa) under ice based on the horizontal gradients of the in-situ density anomaly along the surface. The non-Boussinesq version corrects the topmost value of intx_za and inty_za and uses in-situ specific volume gradients along the ocean surface. By default new the runtime parameter CORRECTION_INTXPA is false, and answers are unchanged.
Configuration menu - View commit details
-
Copy full SHA for e172fe8 - Browse repository at this point
Copy the full SHA e172fe8View commit details -
Add CORRECTION_INTXPA_5PT which uses 5 point quadrature to calculate surface pressure integral and therefore could work with a nonlinear EOS, or (if added) different subgrid distributions. This option requires CORRECTION_INTXPA = True. By default CORRECTION_INTXPA_5PT is false and no answers are changed.
Configuration menu - View commit details
-
Copy full SHA for 15ea628 - Browse repository at this point
Copy the full SHA 15ea628View commit details -
Add RESET_INTXPA_INTEGRAL which resets intxpa and intypa at a trusted cell in the interior (non-vanished and non-MWIPG-affected), and then integrates both up and down to update intxpa and intypa for the interfaces above and below. This also adds the new runtime parameter RESET_INTXPA_H_NONVANISHED and to determine when a cell is trusted. This option is recommended with MASS_WEIGHT_IN_PRESSURE_GRADIENT_IS for a quiet zstar ice shelf. By default, this option is not on and no answers change, but there are new parameters in some MOM_parameter_doc files.
Configuration menu - View commit details
-
Copy full SHA for 1b9bf67 - Browse repository at this point
Copy the full SHA 1b9bf67View commit details -
Revisions of sub-ice pressure gradient fixes
Refactored and revised the recently added code in MOM_PressureForce_FV.F90 to reduce the number of calls to the equation of state routines, and corrected a number of minor bugs in the original implementation. Answers are bitwise identical unless the new options to reset the pressure gradient calculations are actively selected.
Configuration menu - View commit details
-
Copy full SHA for 7a9545a - Browse repository at this point
Copy the full SHA 7a9545aView commit details -
Refactored the CORRECTION_INTX_PA calculations to avoid multiple intermediate steps, while also adding comments documenting the derivation of the final expression. Also calculate the pressures used in the equation of state calls with the Boussinesq CORRECTION_INTX_PA and RESET_INTXPA_INTEGRAL options consistently with the other terms. These changes will change the answers when either of those options are in use, but are bitwise identical when they are not.
Configuration menu - View commit details
-
Copy full SHA for 4cf1590 - Browse repository at this point
Copy the full SHA 4cf1590View commit details -
*Non-Boussinesq code for RESET_INTXPA_INTEGRAL
Added non-Boussinesq versions of the code that is exercised when CORRECTION_INTXPA_5PT and RESET_INTXPA_INTEGRAL are set to true. These options use the same names as in their Boussinesq forms, even though the arrays that are being adjusted are actually intx_za and inty_za. As a part of the testing of this commit, several checksums were added to the PressureForce_FV routines; these are enabled when DEBUG = True. The changes in this commit will change the answers in non-Boussinesq cases when either of those options are in use, but are bitwise identical when they are not, and all Boussinesq answers are bitwise identical.
Configuration menu - View commit details
-
Copy full SHA for 15fd31c - Browse repository at this point
Copy the full SHA 15fd31cView commit details -
+(*)Add 5-point quadrature in RESET_INTXPA_INTEGRAL
Added code to do 5-point quadrature integrals when RESET_INTXPA_INTEGRAL and CORRECTION_INTXPA_5PT are true. Also extended the ranged of interfaces that can be used for the corrections to include the bottom interface and use the surface interface for the nonlinear pressure gradient force corrections either when the ocean surface interface is within the pressure or height range of the top cell, or when no appropriate interior interface has been found (for lack of a better idea). This latter case should probably be reconsidered later. This commit will change answers if RESET_INTXPA_INTEGRAL is true and one description of a runtime parameter in the MOM_parameter_doc files has been revised.
Configuration menu - View commit details
-
Copy full SHA for 5fceecf - Browse repository at this point
Copy the full SHA 5fceecfView commit details -
+(*)Eliminate CORRECTION_INTXPA_5PT
Eliminated the runtime parameter CORRECTION_INTXPA_5PT by always selecting the code that would have been used if it were true. This decision was based on the relative performance of the options with this set to true or false, and on the desire to maintain consistency with the 5-point Boole's rule quadrature used elsewhere in the pressure gradient force calculations. CORRECTION_INTXPA_5PT was only added in the same PR as this commit, so it can been simply removed and there is no need to obsolete it. This will change answers if CORRECTION_INTXPA or RESET_INTXPA_INTEGRAL are true and CORRECTION_INTXPA_5PT was set to false, but otherwise answers are bitwise identical. There are fewer entries in the MOM_parameter_doc files as a result of this commit.
Configuration menu - View commit details
-
Copy full SHA for bdf4b9e - Browse repository at this point
Copy the full SHA bdf4b9eView commit details -
*Set MASS_WEIGHT_IN_PRESSURE_GRADIENT in .testing
Set MASS_WEIGHT_IN_PRESSURE_GRADIENT = True in the MOM_input files for the tc1, tc2 and tc4 test cases in .testing, to permit the code to pass this testing while dealing with inconsistent settings for two diagnostics related to the mass-weighting in the pressure gradient forces. This commit redefines these 3 test cases.
Configuration menu - View commit details
-
Copy full SHA for 0363d2b - Browse repository at this point
Copy the full SHA 0363d2bView commit details -
Dummy code to suppress errors in posix.F90
Adding null read operations so that compilers will not warn about unused input variables in dummy functions.
Configuration menu - View commit details
-
Copy full SHA for 1830b8e - Browse repository at this point
Copy the full SHA 1830b8eView commit details -
F2023: Fix argument orders and IO statements
This is a minor patch which allows the code to be compiled under F2023 standardization. * Arguments are declared in the order that they are used. In this case, it means that array lengths are declared before the arrays using them. * The syntax of various IO statements has been cleaned up.
Configuration menu - View commit details
-
Copy full SHA for e05cc01 - Browse repository at this point
Copy the full SHA e05cc01View commit details -
Reorder arguments in FMS_cap functions
Some functions in the FMS cap used arguments which depended on other arguments, which were declared out of order. * ocean_model_data2D_get * ocean_model_get_UV_surf This patch moves the array index size definitions before the array definitions. This is required for language standard compliance.
Configuration menu - View commit details
-
Copy full SHA for b67e93a - Browse repository at this point
Copy the full SHA b67e93aView commit details -
This patch enables Fortran 2018 standard compliance testing. We could do 2023, but our current CI of choice doesn't yet have a compiler which can do this. The actual content of this PR is a decoupling of FCFLAGS_DEBUG and FCFLAGS_FMS. There is now a default FCFLAGS macro which is used by the other two macros. One can now optionally configure FCFLAGS_DEBUG without worrying about the impact on FCFLAGS_FMS. The motivation here is that we don't want to test for F2018/2023 compliance in FMS.
Configuration menu - View commit details
-
Copy full SHA for b2db6bf - Browse repository at this point
Copy the full SHA b2db6bfView commit details
Commits on Sep 18, 2024
-
Change the default of VISC_REM_CONT_HVEL_FIX
Temporarily cut off the control of VISC_REM_CONT_HVEL_FIX from VISC_REM_BUG and change the default of VISC_REM_CONT_HVEL_FIX to False.
Configuration menu - View commit details
-
Copy full SHA for b3d7348 - Browse repository at this point
Copy the full SHA b3d7348View commit details -
Separate scalar diagnostics for each ice sheet + parameters to contro…
…l ice-sheet velocities (NOAA-GFDL#714) * Updated with dev/gfdl. Then, added parameters for min ice thickness, min basal traction, max surf slope, and min ice viscosity to use for ice dynamics * noted how the MIN_BASAL_TRACTION parameter input is in units [Pa m-1 yr], but converts automatically to [Pa m-1 s] in the code * Added separate scalar ice-shelf diagnostics for Antarctica and Greenland * Added sx_shelf and sy_shelf as ice shelf diagnostics to save the surface slope fields used in the shallow shelf approximation (SSA). This is particularly helpful for determining whether unrealistic velocities are caused by unrealistically steep surface slopes, which can sometimes arise for example, on coarse grid cells that cover both a steep mountainous region and a realively flat ice shelf. Then, the MAX_SURFACE_SLOPE parameter can be tuned to set an upper bound on the SSA surface slope to avoid these steep-slope-induced problematic velocities. * Fix doxygen errors for ice-sheet process_and_post_scalar_data routine * FMA fix associated with enforcement of max allowed ice-shelf surface slope
Configuration menu - View commit details
-
Copy full SHA for ba59078 - Browse repository at this point
Copy the full SHA ba59078View commit details