-
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
WIP: First attempt to add a generic tracer to OBC scheme #4
base: dev/gfdl
Are you sure you want to change the base?
Commits on Jun 4, 2020
-
First attempt to add a generic tracer to OBC scheme
- This commit is the first attempt to add a (generic) tracer to the OBC. - The tracer "gtr1" is added from the ocean_bgc module generic_CFC.F90 - It is to imitate "salt" as if it was a passive tracer.
Configuration menu - View commit details
-
Copy full SHA for 79e5797 - Browse repository at this point
Copy the full SHA 79e5797View commit details
Commits on Jun 17, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 91a1b7c - Browse repository at this point
Copy the full SHA 91a1b7cView commit details
Commits on Jun 19, 2020
-
Replaced copies of GSW files with links
- We always intended to use links so that we were not maintaining code that did not belong to us. `listpaths` used to not work as expected so Niki had placed copies here when adding TEOS10. Using links also avoids any license conflicts.
Configuration menu - View commit details
-
Copy full SHA for 7c6041a - Browse repository at this point
Copy the full SHA 7c6041aView commit details -
Moved pkg/MOM6_DA_hook to config_src/external
- Removed two git submodules and added bare interfaces to config_src/exernal/ODA_hooks/ - Added some missing documentation
Configuration menu - View commit details
-
Copy full SHA for b31da6a - Browse repository at this point
Copy the full SHA b31da6aView commit details -
Corrected documentation errors
- Updated Doxygen configuration to find files in config_src/external
Configuration menu - View commit details
-
Copy full SHA for 6818402 - Browse repository at this point
Copy the full SHA 6818402View commit details -
Use FMS tag 2019.01.02 in .testing
- This version of FMS is a prerequisite to updating calls to FMS ready to try FMS2 I/O behind NOAA-GFDL/SIS2#117 and mom-ocean#1033
Configuration menu - View commit details
-
Copy full SHA for 9f62a8f - Browse repository at this point
Copy the full SHA 9f62a8fView commit details
Commits on Jun 20, 2020
-
Configuration menu - View commit details
-
Copy full SHA for d8b8688 - Browse repository at this point
Copy the full SHA d8b8688View commit details
Commits on Jun 22, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 146e5c4 - Browse repository at this point
Copy the full SHA 146e5c4View commit details
Commits on Jun 23, 2020
-
added diagnostics for partial derivative of density wrt temperature a…
…nd salinity
Graeme MacGilchrist authored and Graeme MacGilchrist committedJun 23, 2020 Configuration menu - View commit details
-
Copy full SHA for 804bf1f - Browse repository at this point
Copy the full SHA 804bf1fView commit details -
Configuration menu - View commit details
-
Copy full SHA for c85cea9 - Browse repository at this point
Copy the full SHA c85cea9View commit details
Commits on Jun 24, 2020
-
Remove "-B" flag from pipeline "make test"
- The -B option forced make to make all targets. This was to ensure that everything was remade when work in a shared work space which is no longer the case. We always have a clean work space in these tests and in order to invoke make twice to handle srun errors we can't use the -B option anymore.
Configuration menu - View commit details
-
Copy full SHA for 3f0f038 - Browse repository at this point
Copy the full SHA 3f0f038View commit details -
Configuration menu - View commit details
-
Copy full SHA for ac231db - Browse repository at this point
Copy the full SHA ac231dbView commit details -
Configuration menu - View commit details
-
Copy full SHA for f35e51d - Browse repository at this point
Copy the full SHA f35e51dView commit details -
Configuration menu - View commit details
-
Copy full SHA for f573874 - Browse repository at this point
Copy the full SHA f573874View commit details -
Configuration menu - View commit details
-
Copy full SHA for e0071f1 - Browse repository at this point
Copy the full SHA e0071f1View commit details -
This is the minimum required update to use 2020.01 FMS & FMScoupler
- Adding domain position arguments to diag_axis_init calls
Configuration menu - View commit details
-
Copy full SHA for a7ab529 - Browse repository at this point
Copy the full SHA a7ab529View commit details
Commits on Jun 25, 2020
-
Merge pull request mom-ocean#1139 from adcroft/fix-pkg
Moved hooks from pkg to external
Configuration menu - View commit details
-
Copy full SHA for 841dfa0 - Browse repository at this point
Copy the full SHA 841dfa0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7c0ad61 - Browse repository at this point
Copy the full SHA 7c0ad61View commit details -
fixes import of dens deriv function
Graeme MacGilchrist authored and Graeme MacGilchrist committedJun 25, 2020 Configuration menu - View commit details
-
Copy full SHA for 2719400 - Browse repository at this point
Copy the full SHA 2719400View commit details -
Merge pull request mom-ocean#1140 from adcroft/use-fms-2019-01-02-in-…
…testing Use FMS tag 2019.01.02 in .testing
Configuration menu - View commit details
-
Copy full SHA for 190d9f5 - Browse repository at this point
Copy the full SHA 190d9f5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 57934c9 - Browse repository at this point
Copy the full SHA 57934c9View commit details -
Testing: Removed environment flag checks
Due to unpredictable conflicts with flags, the realization that flag testing would launch jobs on Slurm environment, and the fact that Slurm launchers, OpenMPI, and MPICH all appear to pass environment variables on default, we now just assume that "env=val $(MPIRUN)" will pass an environment variable to the MPI job in all cases. This may not be true on all systems, but for now we will assume this works.
Configuration menu - View commit details
-
Copy full SHA for 424d30d - Browse repository at this point
Copy the full SHA 424d30dView commit details -
Merge pull request mom-ocean#1143 from nikizadehgfdl/diag_axis_init_F…
…MS2019.01.02 This is the minimum required update to use 2020.01 FMS & FMScoupler
Configuration menu - View commit details
-
Copy full SHA for ee619d1 - Browse repository at this point
Copy the full SHA ee619d1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 80e9a23 - Browse repository at this point
Copy the full SHA 80e9a23View commit details
Commits on Jun 26, 2020
-
Merge pull request mom-ocean#1144 from marshallward/test_mpi_flag_remove
Testing: Removed environment flag checks
Configuration menu - View commit details
-
Copy full SHA for 7e47575 - Browse repository at this point
Copy the full SHA 7e47575View commit details -
Configuration menu - View commit details
-
Copy full SHA for 487a33e - Browse repository at this point
Copy the full SHA 487a33eView commit details -
(*)Corrected halo size in EOS call if VERTEX_SHEAR=T
Corrected halo size in density derivative calculations in smoothed_dRdT_dRdS This fixes an i-parallelization problem that was recently introduced (as a part of MOM6 PR#1089) when VERTEX_SHEAR is True, and closes MOM6 issue mom-ocean#1146. All answers in the existing MOM6-examples test suite are bitwise identical, but this does change (correct) answers when VERTEX_SHEAR is true.
Configuration menu - View commit details
-
Copy full SHA for c95421f - Browse repository at this point
Copy the full SHA c95421fView commit details
Commits on Jun 28, 2020
-
Fixing openmp issues with FMS2020 cpu affinity
- FMS2020 has newer cpu affinity work. These are mostly to fix the issues with thread placing and hyperthreadng under slurm on gaea. But it also works on Orion. - The new affinity module simplifies the thread-placing calls in the component models. - The name of some functions has changed, that's the reason for crashes like: FATAL: input domain does not have an io_domain. - This update fixes those issues. - openmp runs with 1 and 2 threads gives the same answers as non-openmp - NOTE: I don't rememer why we put the thread placing calls in MOM_domains.F90 They look as unnecessary and the whole #ifndef NOT_SET_AFFINITY block can probably be removed. ocean_nthreads is either set in coupler or solo_driver.
Configuration menu - View commit details
-
Copy full SHA for 7bf4a30 - Browse repository at this point
Copy the full SHA 7bf4a30View commit details
Commits on Jun 29, 2020
-
Merge pull request mom-ocean#1147 from Hallberg-NOAA/fix_vertex_shear…
…_halo (*)Corrected halo size in EOS call if VERTEX_SHEAR=T
Configuration menu - View commit details
-
Copy full SHA for d44e79b - Browse repository at this point
Copy the full SHA d44e79bView commit details -
Configuration menu - View commit details
-
Copy full SHA for bd57b78 - Browse repository at this point
Copy the full SHA bd57b78View commit details
Commits on Jul 1, 2020
-
Testing: Explicit OpenMP CPU affinity
FMS affinity operations, often used in OpenMP directives, require explicit CPU affinities such that the number of available CPUs matches the number of requested PEs. To accommodate this, we explicit configure OpenMP to use cpu=0 for our ARM tests.
Configuration menu - View commit details
-
Copy full SHA for ccd4cbf - Browse repository at this point
Copy the full SHA ccd4cbfView commit details -
Removed #ifdef debugging blocks
Removed old debugging code in blocks of code surrounded by #ifdef statements and removed unnecessary #ifdef around other blocks of debugging code. MOM6 standards discourage the use of CPP macros except for a limited set of uses related to memory where this is unavoidable, so this commit is bringing MOM6 closer to its stated standards. All answers and output are identical.
Configuration menu - View commit details
-
Copy full SHA for d64be20 - Browse repository at this point
Copy the full SHA d64be20View commit details -
Configuration menu - View commit details
-
Copy full SHA for af55cce - Browse repository at this point
Copy the full SHA af55cceView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8f21d4c - Browse repository at this point
Copy the full SHA 8f21d4cView commit details
Commits on Jul 2, 2020
-
+Aligned newlines with module documentation
Modified doc_module so that new lines are added only when modules are documented, and are added in all parameter_doc files in which modules are documented. All answers and output are identical, but there are white space changes in MOM_parameter_doc and SIS_parameter_doc files.
Configuration menu - View commit details
-
Copy full SHA for 650683c - Browse repository at this point
Copy the full SHA 650683cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 515f329 - Browse repository at this point
Copy the full SHA 515f329View commit details
Commits on Jul 3, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 2c18649 - Browse repository at this point
Copy the full SHA 2c18649View commit details -
Configuration menu - View commit details
-
Copy full SHA for 209389a - Browse repository at this point
Copy the full SHA 209389aView commit details -
+Add like_default optional argument to log_param
Added the new optional argument like_default to the log_param and doc_param routines to help control where the documentation appears. This new argument is used for logging EPBL_USTAR_MIN, the diagnosed output value of MAXIMUM_DEPTH when the input value is negative, and the diagnosed number of columns where sponges occur with MOM_ALE_sponge. An '!' was also added to the logging of EPBL_USTAR_MIN. All answers are bitwise identical but there are minor changes in the contents of some MOM_parameter_doc.short files.
Configuration menu - View commit details
-
Copy full SHA for d1cd696 - Browse repository at this point
Copy the full SHA d1cd696View commit details -
altered OpenMP directive for diagnostic
Graeme MacGilchrist authored and Graeme MacGilchrist committedJul 3, 2020 Configuration menu - View commit details
-
Copy full SHA for e9c1f6c - Browse repository at this point
Copy the full SHA e9c1f6cView commit details -
Merge branch 'add_dens_deriv_diag' of github.com:gmacgilchrist/MOM6 i…
…nto add_dens_deriv_diag
Graeme MacGilchrist authored and Graeme MacGilchrist committedJul 3, 2020 Configuration menu - View commit details
-
Copy full SHA for 3951b70 - Browse repository at this point
Copy the full SHA 3951b70View commit details -
Configuration menu - View commit details
-
Copy full SHA for dd8d3ab - Browse repository at this point
Copy the full SHA dd8d3abView commit details -
Merge pull request mom-ocean#1142 from gmacgilchrist/add_dens_deriv_diag
Added diagnostics for partial derivatives of density
Configuration menu - View commit details
-
Copy full SHA for 33792c6 - Browse repository at this point
Copy the full SHA 33792c6View commit details
Commits on Jul 5, 2020
-
Configuration menu - View commit details
-
Copy full SHA for af25108 - Browse repository at this point
Copy the full SHA af25108View commit details -
Merge pull request mom-ocean#1152 from Hallberg-NOAA/remove_ifdefs
Removed #ifdef debugging blocks
Configuration menu - View commit details
-
Copy full SHA for ff1bef0 - Browse repository at this point
Copy the full SHA ff1bef0View commit details
Commits on Jul 6, 2020
-
Configuration menu - View commit details
-
Copy full SHA for b656ce3 - Browse repository at this point
Copy the full SHA b656ce3View commit details -
+Set all_default for 4 log_version calls
Added code to determine whether all parameters in the MOM_grid, MOM_restart, MOM_write_cputime and MOM_tracer_registry modules are being used with their default settings, and added all_default arguments to the log_version calls for these modules. All answers and output are identical, but there are white space changes in MOM_parameter_doc.short and SIS_parameter_doc.short files.
Configuration menu - View commit details
-
Copy full SHA for 029af68 - Browse repository at this point
Copy the full SHA 029af68View commit details -
Configuration menu - View commit details
-
Copy full SHA for 14d4cda - Browse repository at this point
Copy the full SHA 14d4cdaView commit details -
Merge pull request mom-ocean#1150 from marshallward/omp_affinity_test
Testing: Explicit OpenMP CPU affinity
Configuration menu - View commit details
-
Copy full SHA for 56ec441 - Browse repository at this point
Copy the full SHA 56ec441View commit details -
Configuration menu - View commit details
-
Copy full SHA for b97e31b - Browse repository at this point
Copy the full SHA b97e31bView commit details -
Configuration menu - View commit details
-
Copy full SHA for a6d5d28 - Browse repository at this point
Copy the full SHA a6d5d28View commit details -
Correted OMP directives for two OBC variables
- Members of a type cannot be individually labelled as shared/private - One variable was converted to shared since it was defiend in a non-OMP section and then labelled as private which meant it was uninitialized.
Configuration menu - View commit details
-
Copy full SHA for 153417f - Browse repository at this point
Copy the full SHA 153417fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9aed664 - Browse repository at this point
Copy the full SHA 9aed664View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4647870 - Browse repository at this point
Copy the full SHA 4647870View commit details
Commits on Jul 7, 2020
-
Merge branch 'module_doc_newlines' of https://github.com/Hallberg-NOA…
…A/MOM6 into Hallberg-NOAA-module_doc_newlines
Configuration menu - View commit details
-
Copy full SHA for a0e019b - Browse repository at this point
Copy the full SHA a0e019bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 13e61a0 - Browse repository at this point
Copy the full SHA 13e61a0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5736bcf - Browse repository at this point
Copy the full SHA 5736bcfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 371d4e7 - Browse repository at this point
Copy the full SHA 371d4e7View commit details -
Merge branch 'fix_openmp_affinity_issues_with_FMS2020' of https://git…
…hub.com/nikizadehgfdl/MOM6 into nikizadehgfdl-fix_openmp_affinity_issues_with_FMS2020
Configuration menu - View commit details
-
Copy full SHA for 10afb0b - Browse repository at this point
Copy the full SHA 10afb0bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5aae165 - Browse repository at this point
Copy the full SHA 5aae165View commit details -
Adds the Stanley version of EOS
- Stanley et al., 2020, adds the Brankart modification to volume mean density via linear corrections involving SGS sample variances and covariances of T and S. This commit adds the new interfaces that allow a call to calculate_density to include the variances and covariance as arguments. This correction sits above the particular EOS and thus can use any EOS so long as second derivatives are available within the EOS module.
Configuration menu - View commit details
-
Copy full SHA for 5019710 - Browse repository at this point
Copy the full SHA 5019710View commit details -
Renamed pressure_gradient_plm() to TS_PLM_edge_values()
- The routines pressure_gradient_plm() and pressure_gradient_ppm() were poorly named and had comments referring to the pressure gradient calculation even though the only calculate edge values in the vertical for T/S using ALE functions. The routines are actually more general and can be used outside of the PGF. The comments have been shortened and no longer refer to the PGF.
Configuration menu - View commit details
-
Copy full SHA for 3006b9c - Browse repository at this point
Copy the full SHA 3006b9cView commit details -
Break out density integrals into a new module
- The integrals of density routines used (mostly) by the PGF calculation were part of MOM_EOS. Originally, when writing the analytic FV PGF paper, this was the right place to put the integrals. The additional variants using the ALE reconstruction functions mean that it is cleaner to have these routines sit in a layer above EOS and ALE.
Configuration menu - View commit details
-
Copy full SHA for 7e8ac75 - Browse repository at this point
Copy the full SHA 7e8ac75View commit details -
Renamed ppoly_E to edge_values for a bit of clarity
- ppoly_E meant something to someone a while ago but we felt it would be better to clean up the ALE APIs. This is a pre-cursor to switching to a more precise description of reconstructions.
Configuration menu - View commit details
-
Copy full SHA for 2e1d823 - Browse repository at this point
Copy the full SHA 2e1d823View commit details -
Configuration menu - View commit details
-
Copy full SHA for 05dbf86 - Browse repository at this point
Copy the full SHA 05dbf86View commit details -
Tidied up logic for EOS_QUADRATURE
- Undid nesting of if / select statemnent - Changed FATAL messages
Configuration menu - View commit details
-
Copy full SHA for 7171c1a - Browse repository at this point
Copy the full SHA 7171c1aView commit details -
Removed find_depth_of_pressure_in_cell() from MOM_EOS
- Function had been moved to density_integrals already but not deleted - Also ordered public statements in MOM_EOS to help find things.
Configuration menu - View commit details
-
Copy full SHA for 6a0b23d - Browse repository at this point
Copy the full SHA 6a0b23dView commit details -
Reordered function in MOM_density_integrals
- Order was frustratingly illogical
Configuration menu - View commit details
-
Copy full SHA for 5b59cdc - Browse repository at this point
Copy the full SHA 5b59cdcView commit details -
- When converting from the two hor_index types to one (HII and HIO became HI) I retained the HI%isd:... declaration statements. We normally use `SZI_(G)` or `SZI_(HI)` so this switches to that style.
Configuration menu - View commit details
-
Copy full SHA for d3e1790 - Browse repository at this point
Copy the full SHA d3e1790View commit details -
Implemented elemental PLM functions
- This adds elemental functions for cellwise operations within the PLM construction procedure which allows the operations to be accessed from outside of the ALE functions on different array shapes but recover bitwise identical results. - The older subroutines now use the functions and some optimizations were obtained in the process.
Configuration menu - View commit details
-
Copy full SHA for 3e1f6b6 - Browse repository at this point
Copy the full SHA 3e1f6b6View commit details -
- Out of curiosity I want to be sure these weren't implicated in the long initialization cost.
Configuration menu - View commit details
-
Copy full SHA for 5930855 - Browse repository at this point
Copy the full SHA 5930855View commit details -
Fixed index capitalization in int_density_dz_generic_plm()
- Soft index convention was not properly implemented in original PLM density integrals. Fixed to avoid confusion.
Configuration menu - View commit details
-
Copy full SHA for a9d0caa - Browse repository at this point
Copy the full SHA a9d0caaView commit details -
Re-used pre-computed weights in int_density_dz_generic_plm()
- Probably makes no difference but we re-computed weights repeatedly even though we'd pre-computed them (and used only once). - Reduces number of local variables.
Configuration menu - View commit details
-
Copy full SHA for 7fbcb01 - Browse repository at this point
Copy the full SHA 7fbcb01View commit details -
Adds the PPM form of PGF by quadrature
- Removes (now) unused functions for quadrature and polynomial evaluation - Has been tested by setting the logical use_PPM=.false. - reproduces PLM mode bitwise
Configuration menu - View commit details
-
Copy full SHA for d25a36b - Browse repository at this point
Copy the full SHA d25a36bView commit details -
Configuration menu - View commit details
-
Copy full SHA for d945d70 - Browse repository at this point
Copy the full SHA d945d70View commit details -
- Use of new PLM functions led to out of date directives
Configuration menu - View commit details
-
Copy full SHA for aaa0487 - Browse repository at this point
Copy the full SHA aaa0487View commit details -
Updated to int_density_dz_generic_ppm() to use k and tv arguments
- Now passing in 3D structures and tv so that we can access other fields in tv%. - Corrected calculation of curvatures s6, t6 for interpolated interior line integrals. - Tested with use_PPM=.false. and PLM edge values. - Using PLM edge values with use_PPM=.true. does give different answers because t6,s6 are non-zero albeit tiny. This is due to FP truncation errors.
Configuration menu - View commit details
-
Copy full SHA for 80da001 - Browse repository at this point
Copy the full SHA 80da001View commit details -
Renamed MOM_PressureGradient_AFV
- Since the majority of code is not about the analytic integration I thought it time to rename this module
Configuration menu - View commit details
-
Copy full SHA for 783983e - Browse repository at this point
Copy the full SHA 783983eView commit details -
After renaming module, change _AFV_ to _FV_
- Continuation of rename of module
Configuration menu - View commit details
-
Copy full SHA for e833677 - Browse repository at this point
Copy the full SHA e833677View commit details -
Removed conditional scaling from int_density_dz_generic_ppm()
- This routine was suffering from if's inside loops. I've removed this one since it was just obfuscation, pretending to care about performance and actually reducing it.
Configuration menu - View commit details
-
Copy full SHA for 660150f - Browse repository at this point
Copy the full SHA 660150fView commit details -
Adds SGS variance to tv and adds Brankart effect to PGF
- Makes use of the Stanley equation of state to include effects of SGS temperature variance, salinity variance and T-S covariance.
Configuration menu - View commit details
-
Copy full SHA for 7ae38fe - Browse repository at this point
Copy the full SHA 7ae38feView commit details -
Configuration menu - View commit details
-
Copy full SHA for b7afafb - Browse repository at this point
Copy the full SHA b7afafbView commit details -
Re-wrote Stanley parameterization using vertical weights
- This now calculates the gradient of SGS temperature variance using the same discretization as used for the gradient of density along coordinate surfaces. - Added run-time coefficient for Stanley parameterization - Fixed openmp directives. - Alters halo over which vert_fill_TS() is called. - Add Stanley parameter to tc2 to test new code.
Configuration menu - View commit details
-
Copy full SHA for f462c4d - Browse repository at this point
Copy the full SHA f462c4dView commit details -
Added STANLEY_PRM_DET_COEFF run time parameter
- Renamed STANLEY_DET_COEFF to STANLEY_PRM_DET_COEFF to indicate this is for the Stanley parameterization as opposed to a related approach by Stanley for implementing the Brankart PGF correction.
Configuration menu - View commit details
-
Copy full SHA for 75a20d8 - Browse repository at this point
Copy the full SHA 75a20d8View commit details -
Adds the T variance Stanley component to PGF
- PGF_STANLEY_T2_DET_COEFF>=0. now adds the temperature variance contribution to the Brankart correction using the Stanley linearization of the EOS and parameterization of SGS variance.
Configuration menu - View commit details
-
Copy full SHA for c94e0cb - Browse repository at this point
Copy the full SHA c94e0cbView commit details -
- After starting with allocatables and switching to pointers I'd forgotten to nullify them.
Configuration menu - View commit details
-
Copy full SHA for 073b422 - Browse repository at this point
Copy the full SHA 073b422View commit details -
Correct scaling for second derivs in Stanley param
- Passing the scale= to calculate_density_second_derivs() was the double scaling the density contribution from SGS variance in the Stanley parameterization.
Configuration menu - View commit details
-
Copy full SHA for b7341c2 - Browse repository at this point
Copy the full SHA b7341c2View commit details -
Corrected indentation in MOM_EOS
- select case statements were indented as if once inside a loop.
Configuration menu - View commit details
-
Copy full SHA for 6356092 - Browse repository at this point
Copy the full SHA 6356092View commit details -
Fixed pressure scaling for calculate_stanley_density_array()
- The pressure scaling was wrong when trying to call calculate_density_second_derivs_array() from within calculate_stanley_density_array() because the latter should not do any scaling but the former always did. I had to call the lower level functions provided by WRIGHT, TEOS10, etc to avoid get the scaling tests to pass.
Configuration menu - View commit details
-
Copy full SHA for 7544c79 - Browse repository at this point
Copy the full SHA 7544c79View commit details -
Re-factored int_density_dz_generic_plm()
- In preparing to add Brankartc terms to PLM form of presure gradient I'm adapting the routine to look like the PPM routine which takes 3D arguments but only works on layer "k".
Configuration menu - View commit details
-
Copy full SHA for 31b7e0a - Browse repository at this point
Copy the full SHA 31b7e0aView commit details
Commits on Jul 8, 2020
-
Implement Brankart terms in PLM form of PGF
- The Brankart PGF terms are now implemented in the PLM recontruction routines, just as they were for the PPM form.
Configuration menu - View commit details
-
Copy full SHA for 5d4f1eb - Browse repository at this point
Copy the full SHA 5d4f1ebView commit details -
- Added documentation lines for PGF_STANLEY_T2_DET_COEFF
Configuration menu - View commit details
-
Copy full SHA for ee1232a - Browse repository at this point
Copy the full SHA ee1232aView commit details
Commits on Jul 10, 2020
-
Configuration menu - View commit details
-
Copy full SHA for f0bab12 - Browse repository at this point
Copy the full SHA f0bab12View commit details -
Corrected scaling in _1d and _scalar EOS functions
- Per feedback on mom-ocean#1156, corrected scaling for calculate_stanley_density_scalar() and calculate_stanley_density_1d().
Configuration menu - View commit details
-
Copy full SHA for e8adc48 - Browse repository at this point
Copy the full SHA e8adc48View commit details -
Removed unused member in PressureForce_CS
- Per feedback on mom-ocean#1156.
Configuration menu - View commit details
-
Copy full SHA for ec0946c - Browse repository at this point
Copy the full SHA ec0946cView commit details -
Added FATAL if trying to use parameterization in non-Boussinesq mode
- Per feedback on mom-ocean#1156
Configuration menu - View commit details
-
Copy full SHA for 4307fa5 - Browse repository at this point
Copy the full SHA 4307fa5View commit details -
(*)Set maximum value of au_visc
Set a hard-coded maximum value of CS%a_u and CS%a_v of 1e37 m s-1 so that these can be represented in diagnostics that are written with 32-bit floating point numbers. These values are so large that all answers are bitwise identical in the MOM6-examples test cases, but it is possible that answers could change.
Configuration menu - View commit details
-
Copy full SHA for b3a584d - Browse repository at this point
Copy the full SHA b3a584dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 553166a - Browse repository at this point
Copy the full SHA 553166aView commit details
Commits on Jul 11, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 50a7b3c - Browse repository at this point
Copy the full SHA 50a7b3cView commit details
Commits on Jul 14, 2020
-
+Eliminate uhbt_IC and ubt_IC from restart files
Eliminated the unused variables CS%uhbt_IC and CS%vhbt_IC from the barotropic control structure and from the MOM6 restart files. Also placed a logical test for CS%Gradual_BT_ICs around all references to CS%ubt_IC and CS%vbt_IC and eliminated these variables from the restart files when they would not be used. Additionally some unused arguments were removed from internal subroutines and some spelling or index case errors were corrected. All answers are bitwise identical, but the MOM6 restart files have fewer variables and some unused entries in the MOM_parameter_doc files have changed.
Configuration menu - View commit details
-
Copy full SHA for 8df3e7f - Browse repository at this point
Copy the full SHA 8df3e7fView commit details -
+Add the new parameter INTEGRAL_BT_CONTINUITY
Add the new runtime parameter INTEGRAL_BT_CONTINUITY which enables the use of the time-integrated barotropic velocity to determine the cumulative transport since the start of the barotropic stepping. This new option works in all of the MOM6-examples test cases with a SPLIT=True and USE_BT_CONT_TYPE=True. By default all answers are bitwise identical, but there are changes to the entries in the MOM_parameter_doc files.
Configuration menu - View commit details
-
Copy full SHA for 14d6348 - Browse repository at this point
Copy the full SHA 14d6348View commit details -
Added the new subroutines find_duhbt_dubt_int and find_dvhbt_dvbt_int, and use the time-integrated forms to set the inverse face area, the transport correction for consistency between the transport from the initial barotropic velocity and the summed layer transports, and the maximum corrective mass source when INTEGRAL_BT_CONT=True. Also only log BT_CONT_CORR_BOUNDS when BOUND_BT_CORR is set to true. By default, all answers are bitwise identical, but there are minor changes to the entries in the MOM_parameter_doc files.
Configuration menu - View commit details
-
Copy full SHA for 6374aaf - Browse repository at this point
Copy the full SHA 6374aafView commit details -
+Implemented integral_BT_cont options for OBCs
Added code to implement new integral_BT_cont options within the barotropic open boundary condition code. A number of new arguments were added to apply_velocity_OBCS. In addition, the handling of updates to ubt_sum, uhbt_sum and ubt_wtd with open boundary conditions were simplified. There are minor answer changes if INTEGRAL_BT_CONTINUITY=True, but all answers in the existing MOM6-examples tess cases are bitwise identical.
Configuration menu - View commit details
-
Copy full SHA for 4743f8c - Browse repository at this point
Copy the full SHA 4743f8cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2a73d7d - Browse repository at this point
Copy the full SHA 2a73d7dView commit details
Commits on Jul 16, 2020
-
+Reuse find_uhbt with INTEGRAL_BT_CONT
Revised the dimensions of the entries in the local_BT_Cont types when INTEGRAL_BT_CONT=True for efficiency and to enable find_uhbt and other routines to be used regardless of the value of INTEGRAL_BT_CONT. Some arguments that are no longer needed have been removed from some subroutines. All answers are bitwise identical in the MOM6-examples test suite, but changes to the order of arithmetic leads to changes from the previous version when INTEGRAL_BT_CONT=True, and the rescaling is controlled via new optional arguments to internal routines.
Configuration menu - View commit details
-
Copy full SHA for 37a7ee0 - Browse repository at this point
Copy the full SHA 37a7ee0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7a6a10a - Browse repository at this point
Copy the full SHA 7a6a10aView commit details -
(*?)Revised ice_shelf_driver.F90 so it compiles
Revised ice_shelf_driver.F90 so that it compiles successfully and is similar to MOM_driver.F90 where possible. In addition, deleted the files MOM_surface_forcing.F90 and user_surface_forcing.F90 in the ice_solo_driver directory, as these are unused and out-of-date versions of the equivalent files in the solo_driver directory. Some of the changes are not as streamlines as they could be if the solo_ice_shelf code used its own version of diag_mediator, or if the interface to diag_mediator were revised so that some of its ocean-specific arguments are optional. There is no test-case exercising this code, but at least it now compiles, whereas it did not compile before.
Configuration menu - View commit details
-
Copy full SHA for e218354 - Browse repository at this point
Copy the full SHA e218354View commit details
Commits on Jul 20, 2020
-
- FMS tag 2019.01.03 fixes problems for EMC allowing the newer FV3 to work with MOM6 which is not yet compatible with FMS2020.
Configuration menu - View commit details
-
Copy full SHA for f5df25d - Browse repository at this point
Copy the full SHA f5df25dView commit details
Commits on Jul 22, 2020
-
Merge pull request mom-ocean#1164 from adcroft/fms-2019.01.03
Move FMS tag to 2019.01.03
Configuration menu - View commit details
-
Copy full SHA for 6b0f83d - Browse repository at this point
Copy the full SHA 6b0f83dView commit details -
Avoid using uninitialized arrays
Modified recent additions to avoid using uninitialized arrays. This was not detected in tests of the previous PR because the arrays that were created from uninitialized arrays were themselves never used, so there are no answer changes but there were errors with intolerant compiler settings. Also corrected the dOxygen syntax in a comment and corrected some openMP directives that had been triggering warnings or errors. All answers are bitwise identical.
Configuration menu - View commit details
-
Copy full SHA for 535b43c - Browse repository at this point
Copy the full SHA 535b43cView commit details -
Merge pull request mom-ocean#1159 from ESMG/dev/esmg
+Adding a halo update for tracer reservoirs.
Configuration menu - View commit details
-
Copy full SHA for e55ef75 - Browse repository at this point
Copy the full SHA e55ef75View commit details -
Added missing openMP directives
Added some missing openMP directives that had been triggering warnings or errors, and could have created problems with more extensive testing. Also set some unset array bounds in the ice_shelf_dynamics code. All answers are bitwise identical in all working test cases.
Configuration menu - View commit details
-
Copy full SHA for 2a9248a - Browse repository at this point
Copy the full SHA 2a9248aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3c92d4c - Browse repository at this point
Copy the full SHA 3c92d4cView commit details
Commits on Jul 23, 2020
-
Merge pull request mom-ocean#1161 from Hallberg-NOAA/integral_bt_solver
MOM6: +(*)Add option to use time-integrated barotropic continuity
Configuration menu - View commit details
-
Copy full SHA for edc674c - Browse repository at this point
Copy the full SHA edc674cView commit details -
Merge pull request mom-ocean#1162 from Hallberg-NOAA/ice_shelf_driver
MOM6: (*?)Revised ice_shelf_driver.F90 so it compiles
Configuration menu - View commit details
-
Copy full SHA for 3e44491 - Browse repository at this point
Copy the full SHA 3e44491View commit details
Commits on Jul 27, 2020
-
Fixing loop bound error in MOM_PressureForce_Montgomery.F90
The "for" loop at L510 should be to nz instead of nz+1. Due to array allocation sizes, this loop was extending beyond the shope of the argument arrays.
Configuration menu - View commit details
-
Copy full SHA for 5680fe5 - Browse repository at this point
Copy the full SHA 5680fe5View commit details -
Testing: tc4 installs python-netCDF4 via venv (mom-ocean#1166)
Squash merge of following commits: * Testing: tc4 installs python-netCDF4 via venv Currently, users are expected to have numpy and netcdf4 python modules in order to generate the necessary netCDF input files. This fails in environments where these modules are unavailable. This patch now installs the modules into a virtual environment which are accessible when generating the tc4 inputs. This solution is local to tc4 but could be extended to other tests as needed. * Testing: remove Python numpy and netCDF4 modules The numpy and netCDF4 packages are no longer needed since tc4 now installs these locally. * Test: Install virtualenv for Python2 tc4 was using the venv module which appears to be python3-specific, and Travis Ubuntu defaults to python2. Also virtualenv was not installed in either case. This patch adds python-virtualenv to the install packages and uses the virtualenv module. * Test: Add python-dev for ARM64 numpy Travis ARM nodes need to build numpy natively when installed by pip, and thus require Python headers. These are provided by the python-dev package. * Test: Revert to Py3 for tc4 generation scripts Reverting the python 2 support (default for Travis) to use Python 3 syntax. The main reason is that Python 3 includes venv (equivalent to virtualenv) as its standard library, and is therefore guaranteed to exist if Python 3 exists. Python 3's virtualenv must be independently installed, which cannot be confirmed. This will cause problems for people without Python 3, but this is probably the best solution, or at least the starting point for a more general solution. * Test: Adding python3-venv to Travis Ubuntu apparently requires an explicit install of python3-venv despite it being part of the standard library. Go figure... * Test: Arm64 tc4 Configuration support Arm64 Ubuntu environments require explicit installations which are otherwise provided on x86 Ubuntu: * Python 3 Pip must be installed (python3-pip) * Wheel installation must be explicitly installed * Cython is required for numpy * Numpy must be explicitly built before installing python-netCDF4 * Test: tc4 common Python local-env Build times for setting up the virtual environments can be very expensive on the Arm64 Ubuntu nodes, so we now create a shared directory for launching the environments. * Test: Use '.' in place of 'source' for Make * Test: Test for required Python modules in tc4 We have reworked the Makefile to conditionally test for required Python modules in tc4. If unavailable, we install these in a virtual environment. This does not address many scenarios, such as if Python 3 is missing, venv is missing (as in Ubuntu), or handle the situation if they do not exist. It assumes that either the modules exist, or that they can be installed by venv. This should be seen as an iterative step to get things working on Travis x86 and Arm64, as well as GFDL's Gaea and most user Linux platforms. * Test: Explicit python execs for tc4 input build This resolves some issues with python2/3 resolution and limited support of various platforms for module support. Specifically, older platform with basic Python 3 support may not also have numpy support. In this case, we can defer back to Python 2 (or whatever the system Python may be). * Test: Setup Python venv at build time This patch moves the Python virtual environment configuration to the main Makefile, which is setup at build time, rather than in the model configuration Makefile, which will typically not have internet access if run on a compute node. As before, the venv will only be setup when the numpy and netCDF4 modules are unavailable. A minor bug in the logic of the check has also been fixed.
Configuration menu - View commit details
-
Copy full SHA for 6529752 - Browse repository at this point
Copy the full SHA 6529752View commit details -
Merge pull request mom-ocean#1169 from breichl/BugFix_MontgomeryPress…
…ureForce Fixing loop bound error in MOM_PressureForce_Montgomery.F90
Configuration menu - View commit details
-
Copy full SHA for df33724 - Browse repository at this point
Copy the full SHA df33724View commit details
Commits on Jul 29, 2020
-
Momentum budget terms multiplied by fractional layer-thicknesses (mom…
…-ocean#1163) Squash merge: * New diagnostics for barotropic momentum budget calculations are created. In these, different budget terms multiplied by fractional layer thicknesses are saved. Thus, these terms can be added over the whole to obtain the barotropic momentum budget. 'btstep' subroutine in MOM_barotropic module is modified to return fractional thicknesses. Pressure force acceleration multiplied by fractional thickness as diagnostics are added in this commit. * More thickness weighted diagnostics * Implemented Andrew Shao's suggestions * More fractional thickness multiplied diagnostics * Some barotropic diagnostics obtained from fractional thickness multiplied momentum budget terms * Removed trailing spaces * All fractional-thickness multiplied diagnostics implemented * define diagnostic variables as pointers * Shorter initialization of 2D arrays * Modifications in vertical friction diagnostics * Diagnostics initialization as pointers to save memory allocation * Vertical friction module * Removed commented lines and trailing spaces * Diagnostic description change * Fractional thickness-weighted diagnostics for acceleration due to relative vorticity and gradient of kinetic energy * Modifications in vertical friction diagnostics (fractional thickness-weighted) * Modifications in diag_hfrac_u and diag_hfrac_v calls * Made allocation of hfrac at u/v points optional. These arrays are only allocated if any of the relevant diagnostics are called. * Fractional-thickness weighted 3D diagnostics are now commented out as we do not the proper grid remapping option. * Initialization of 2D diagnostic arrays changed from pointer type to allocatable array style. * Trailing spaces removed and line lengths reduced to be under 120 characters * Comment modified Reviewed by Robert Hallberg <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 4c030e6 - Browse repository at this point
Copy the full SHA 4c030e6View commit details
Commits on Jul 30, 2020
-
This patch fixes three dimensionality errors in the OBC segments. - We add a missing GV%m_to_H conversion for time-dependent eta segments. - The `adjustSegmentEtaToFitBathymetry` function depends on the `segment%Htot` field when computing the dz_src cell spacings. While the calculation primarily assumes that all quantities scale as Z, the segment%Htot field scales as H, which was causing dimensionality errors. We resolve this by converting Htot from Z to H whenever it is used in the calculation. - Segment barotropic velocitys based on transports were limited to a hard-coded thickness of 1e-12, which was not scaled. We have added H-dimensional scaling to these constants.
Configuration menu - View commit details
-
Copy full SHA for 16a0a06 - Browse repository at this point
Copy the full SHA 16a0a06View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0c6a7d0 - Browse repository at this point
Copy the full SHA 0c6a7d0View commit details -
The current OBC segment list includes a "segment zero" which corresponds to when the segment maps (segnum_u, segnum_v) point to OBC_NONE, which is set to zero. The purpose of this "segment zero" seems to be for avoiding invalid references, so that OBC%segment(OBC%segnum_[uv](i,j)) always returns a valid result, included when set to OBC_NONE. This results in reading and setting values which are unused or unneeded. This patch replaces these redundant accesses to segment zero with various conditional blocks for avoiding these accesses.
Configuration menu - View commit details
-
Copy full SHA for 46714ec - Browse repository at this point
Copy the full SHA 46714ecView commit details -
Configuration menu - View commit details
-
Copy full SHA for dca4d1b - Browse repository at this point
Copy the full SHA dca4d1bView commit details -
Merge pull request mom-ocean#1170 from marshallward/tc4a_dimh_bug
OBC: H-dimensionality fixes
Configuration menu - View commit details
-
Copy full SHA for 390188e - Browse repository at this point
Copy the full SHA 390188eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9b75b6a - Browse repository at this point
Copy the full SHA 9b75b6aView commit details -
OBC: Remove segment 0 refs in mask_outside_OBCs
There were a few remaining segnum_[uv] references in MOM_open_boundary which could reference segment zero. This patch fixes those references.
Configuration menu - View commit details
-
Copy full SHA for a243225 - Browse repository at this point
Copy the full SHA a243225View commit details -
Merge branch 'remove_obc_seg0' of https://github.com/marshallward/mom6 …
…into remove_obc_seg0
Configuration menu - View commit details
-
Copy full SHA for c027b9d - Browse repository at this point
Copy the full SHA c027b9dView commit details
Commits on Jul 31, 2020
-
Merge pull request mom-ocean#1171 from marshallward/remove_obc_seg0
OBC: Removal of segment zero
Configuration menu - View commit details
-
Copy full SHA for 3d557d9 - Browse repository at this point
Copy the full SHA 3d557d9View commit details -
Improve the handling of very thin layers in make_frazil. This does not change answers for typical values of ANGSTROM, but can avoid problems that can arise when ANGSTROM=0. All answers in the existing MOM6-examples test cases are bitwise identical.
Configuration menu - View commit details
-
Copy full SHA for 1daad44 - Browse repository at this point
Copy the full SHA 1daad44View commit details -
(*)Improve advective CFL calculation with tiny h
Improved handling of massless layers in the calculation of the advective CFL numbers used in PPM tracer advection by using an Adcroft reciprocal instead of adding a small value in the denominator. Although all answers are bitwise identical in the existing MOM6-examples test cases, this can avoid problems with tracer advection when ANGSTROM is 0 or very small like those that were recently found in analogous SIS2 code.
Configuration menu - View commit details
-
Copy full SHA for 948e292 - Browse repository at this point
Copy the full SHA 948e292View commit details -
Infrastructure calls via framework directory
Revised module use statements and some infrastructure calls to go via the MOM6 framework directory rather than directly calling FMS infrastructure routines. All answers are bitwise identical.
Configuration menu - View commit details
-
Copy full SHA for cbbf848 - Browse repository at this point
Copy the full SHA cbbf848View commit details
Commits on Aug 4, 2020
-
Configuration menu - View commit details
-
Copy full SHA for bba60af - Browse repository at this point
Copy the full SHA bba60afView commit details
Commits on Aug 7, 2020
-
(*)Set dSV_dT and dSV_dS with unassociated fluxes
Set dSV_dT and dSV_dS if present in applyBoundaryFluxesInOut, even if boundary fluxes are not associated. With this change, setting BUOY_CONFIG='NONE' and BUOY_CONFIG='zero' both work and give similar (but not identical) answers in some test cases with an ePBL boundary layer parameterization, whereas before answers were tainted with uninitialized values when BUOY_CONFIG='NONE'. All answers in the existing MOM6-examples test suite are bitwise identical, but answers can change in other cases.
Configuration menu - View commit details
-
Copy full SHA for 7be0883 - Browse repository at this point
Copy the full SHA 7be0883View commit details -
(*)Fix an indexing bug in int_density_dz_linear
Corrected a horizontal indexing bug in int_density_dz_linear that caused the ISOMIP/layer test case to fail. This bug was first introduced with PR#732 on March 8, 2018. This bug fix will change answers with a linear equation of state and the finite volume pressure gradient force, however it does not change any of the verified answers in the MOM6-examples regression suite.
Configuration menu - View commit details
-
Copy full SHA for feed9ba - Browse repository at this point
Copy the full SHA feed9baView commit details -
Merge pull request mom-ocean#1173 from Hallberg-NOAA/infra_via_framework
Infrastructure calls via framework directory
Configuration menu - View commit details
-
Copy full SHA for f16c250 - Browse repository at this point
Copy the full SHA f16c250View commit details -
Configuration menu - View commit details
-
Copy full SHA for ef85adb - Browse repository at this point
Copy the full SHA ef85adbView commit details
Commits on Aug 8, 2020
-
Merge pull request mom-ocean#1172 from Hallberg-NOAA/better_advective…
…_CFL (*)Improve advective CFL calculation with tiny h
Configuration menu - View commit details
-
Copy full SHA for f8d1379 - Browse repository at this point
Copy the full SHA f8d1379View commit details
Commits on Aug 10, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 6461d75 - Browse repository at this point
Copy the full SHA 6461d75View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3c10ae1 - Browse repository at this point
Copy the full SHA 3c10ae1View commit details -
Merge pull request mom-ocean#1175 from Hallberg-NOAA/ISOMIP_fixes
(*)Fix code problems that appear in ISOMIP cases
Configuration menu - View commit details
-
Copy full SHA for 73746cb - Browse repository at this point
Copy the full SHA 73746cbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6838177 - Browse repository at this point
Copy the full SHA 6838177View commit details -
Merge pull request mom-ocean#1174 from MJHarrison-GFDL/move_init_OBC_…
…seg_data Move call to initialize_segment_data to MOM_state_initialization
Configuration menu - View commit details
-
Copy full SHA for 068c3cb - Browse repository at this point
Copy the full SHA 068c3cbView commit details
Commits on Aug 13, 2020
-
Configuration menu - View commit details
-
Copy full SHA for ff61dd1 - Browse repository at this point
Copy the full SHA ff61dd1View commit details
Commits on Aug 14, 2020
-
Initialize OBC segments for OBGC tracers
- This update queries the obgc modules (generic_tracers) for the OBC source files and var names for each generic tracers and initializes the segment fields accoringly. - With this update the obgc tracers should NOT appear in OBC_SEGMENT_XXX_DATA in MOM parameter files (MOM_override). - The default source file name is obgc_obc.nc - The default source file var name is the generic_tracer name - These can be overriden by field_table mechanism. E.g., "namelists","ocean_mod","generic_CFC" cfc11_obc_src_field_name = salt cfc12_obc_src_field_name = salt /
Configuration menu - View commit details
-
Copy full SHA for 1638c0b - Browse repository at this point
Copy the full SHA 1638c0bView commit details
Commits on Sep 1, 2020
-
Add OBC reservoirs for ocean_BGC tracers
- This update adds OBC reservoirs for all obgc tracers that are registered to have OBC. - This fixes restart issue with obgc tracers in test runs
Configuration menu - View commit details
-
Copy full SHA for d0c431b - Browse repository at this point
Copy the full SHA d0c431bView commit details
Commits on Oct 9, 2020
-
Configuration menu - View commit details
-
Copy full SHA for d06e144 - Browse repository at this point
Copy the full SHA d06e144View commit details
Commits on Jul 27, 2021
-
Fixes and set OBC_update period
- These are some fixes towards understanding the restart issue for OBC models. - Also, introduce a time period for OBC_segment update
Configuration menu - View commit details
-
Copy full SHA for 8acd7d0 - Browse repository at this point
Copy the full SHA 8acd7d0View commit details