Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*Removed dependence of OBC solutions on external h #147

Merged
merged 5 commits into from
Sep 6, 2017
Merged

*Removed dependence of OBC solutions on external h #147

merged 5 commits into from
Sep 6, 2017

Conversation

Hallberg-NOAA
Copy link
Member

Made a series of 4 separate corrections to calculations at open boundary
points to avoid any dependencies on the values of thicknesses outside of the
domain:

  • Corrected the calculation of the baroclinic pressure anomaly-driven accelerations due to deflections of the free surface in open boundary conditions at the end of the barotropic stepping.

  • Corrected the setup of the BT_cont_type at open boundary condition points.

  • Corrected the calculation of face-areas at open boundary condition points for  finding vertically averaged accelerations.

  • Corrected the calculation of the averaged normal velocities in the bottom boundary layer at open boundary condition points.

    Each of these code changes do change answers in test cases with some types of open boundary conditions, and the reference solutions for circle_OBCs have been updated for the combination of these 4 updates.

@Hallberg-NOAA
+Update the coupler_type_reform_rwh branch of FMS
58e7197 
  Changed the branch of FMS to the updated version of coupler_type_reform_rwh,
which has some additional minor changes to the coupler type compared with the
previous version on this branch.  All answers are bitwise identical, but there
are changes that will be required for a version of SIS2 that will soon be
checked onto dev/gfdl.
@Hallberg-NOAA
Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into de…
48c1bfe 
…v/gfdl
@Hallberg-NOAA
Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into de…
3871c25 
…v/gfdl
@Hallberg-NOAA
Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6-examples into de…
7e45804 
…v/gfdl
@Hallberg-NOAA
MOM6: *Removed dependence of OBC solutions on external h
3ec0ff1 
  Made a series of 4 separate corrections to calculations at open boundary
points to avoid any dependencies on the values of thicknesses outside of the
domain:
 - Corrected the calculation of the baroclinic pressure anomaly-driven
accelerations due to deflections of the free surface in open boundary conditions
at the end of the barotropic stepping.
 - Corrected the setup of the BT_cont_type at open boundary condition points.
 - Corrected the calculation of face-areas at open boundary condition points for
finding vertically averaged accelerations.
 - Corrected the calculation of the averaged normal velocities in the bottom
boundary layer at open boundary condition points.
  Each of these code changes do change answers in test cases with some types of
open boundary conditions, and the reference solutions for circle_OBCs have been
updated for the combination of these 4 updates.
MOM6 commit NOAA-GFDL/MOM6@993ad0f
@adcroft adcroft merged commit 3ec0ff1 into NOAA-GFDL:dev/gfdl Sep 6, 2017
adcroft added a commit to adcroft/MOM6-examples that referenced this pull request Sep 9, 2020
@adcroft
MOM6: Merge pull request #1176 from gustavo-marques/dev-master-candid…
63b44b1 
…ate-ncar-2020-08-11

- dev/NCAR to dev/master

- NOAA-GFDL/MOM6@eb57e51f5 Merge pull request #1176 from gustavo-marques/dev-master-candidate-ncar-2020-08-11
- NOAA-GFDL/MOM6@2946903bc Fix one more letter case to follow MOM6 convention
- NOAA-GFDL/MOM6@e3bc47a8d Fix letter case to follow MOM6 convention
- NOAA-GFDL/MOM6@17936f3fd Add modifications suggested by Bob Hallberg
- NOAA-GFDL/MOM6@ab9386c66 In do-loops, use uppercase K index for variables discretized on interfaces
- NOAA-GFDL/MOM6@287281cf6 Remove unnecessary present(num_rest_files) condition
- NOAA-GFDL/MOM6@6331da102 Remove (:,:) after 2-d variable declariation
- NOAA-GFDL/MOM6@608f4bfb8 Merge branch 'dev/master' into dev-master-candidate-ncar-2020-08-11
- NOAA-GFDL/MOM6@aa8ce213f Merge pull request NOAA-GFDL#156 from NCAR/fix_multi_restart
- NOAA-GFDL/MOM6@648bb1ce8 make mct cap be able to read multiple restart files from rpointer
- NOAA-GFDL/MOM6@829aadea9 make mct cap be able to write multiple restart files to rpointer
- NOAA-GFDL/MOM6@bba3e91b5 increase nuopc cap restart filename length
- NOAA-GFDL/MOM6@0a5515b3d increase restart filename lengths
- NOAA-GFDL/MOM6@4c91ae3ac add filename length check
- NOAA-GFDL/MOM6@7a2256c50 correct restart file suffix index
- NOAA-GFDL/MOM6@4c6090010 read/write multiple restart filenames from/to rpointer files
- NOAA-GFDL/MOM6@ff27ad560 add num_rest_files to ocean_model_restart
- NOAA-GFDL/MOM6@2fe90f2fe retrieve num_rest_files from save_restart
- NOAA-GFDL/MOM6@330d7c45a Merge pull request NOAA-GFDL#155 from gustavo-marques/LBD_improvements_jun2020
- NOAA-GFDL/MOM6@388b100c8 Fix default zeta_bot values
- NOAA-GFDL/MOM6@3698c4055 Merge pull request NOAA-GFDL#154 from gustavo-marques/restart_nuopc
- NOAA-GFDL/MOM6@0c98fa994 Merge pull request NOAA-GFDL#153 from gustavo-marques/add_calls_time_interp_external_init
- NOAA-GFDL/MOM6@bb222c875 Merge pull request NOAA-GFDL#152 from gustavo-marques/add_diagnostics
- NOAA-GFDL/MOM6@ca86bad51 Remove trailing space
- NOAA-GFDL/MOM6@8fdcd9048 Improve documentation and changed default method
- NOAA-GFDL/MOM6@7f478aa3e Add option to apply linear decay at the base of hbl
- NOAA-GFDL/MOM6@aed316cd7 Merge branch 'dev/ncar' into restart_nuopc
- NOAA-GFDL/MOM6@abb10ed4c Add calls to time_interp_external_init
- NOAA-GFDL/MOM6@473c3f47b Remove unused module
- NOAA-GFDL/MOM6@a69aea961 Add new diagnostics
- NOAA-GFDL/MOM6@4041cc90b Fix bug when applying ND only in the interior
- NOAA-GFDL/MOM6@fd68ffa0b Merge pull request NOAA-GFDL#151 from gustavo-marques/merge-dev-master-candidate-2020-05-15
- NOAA-GFDL/MOM6@97547426a Fix OMP directives broken by merge
- NOAA-GFDL/MOM6@532e65ad5 undo OMP changes in MOM_EOS
- NOAA-GFDL/MOM6@b34478800 undo indent change from conflict resolve
- NOAA-GFDL/MOM6@2f44ca7ce correct conflict resolve in KPP
- NOAA-GFDL/MOM6@81805cc99 Merge branch 'dev/ncar' into merge-dev-master-candidate-2020-05-15
- NOAA-GFDL/MOM6@85f4dc09b Merge pull request NOAA-GFDL#150 from NCAR/omp_performance
- NOAA-GFDL/MOM6@4755458e3 Merge branch 'dev-master-candidate-2020-05-15-patch1' into merge-dev-master-candidate-2020-05-15
- NOAA-GFDL/MOM6@fab21a749 Fixes an integer-kind mismatch in MOM_random, seed_from_time()
- NOAA-GFDL/MOM6@6d5a5f90b Merge branch 'dev-master-candidate-2020-05-15' into merge-dev-master-candidate-2020-05-15
- NOAA-GFDL/MOM6@02f5a8cf3 Merge pull request NOAA-GFDL#149 from gustavo-marques/fix_tidal_mixing
- NOAA-GFDL/MOM6@c42d104c5 Merge pull request NOAA-GFDL#148 from gustavo-marques/leith_improvements
- NOAA-GFDL/MOM6@809593cb4 Merge branch 'dev/ncar' into leith_improvements
- NOAA-GFDL/MOM6@4e54ad531 Merge pull request NOAA-GFDL#147 from gustavo-marques/biharmonic_grid_Re
- NOAA-GFDL/MOM6@c06515f19 Add tidal diffusivities (Kd_tidal) into Kd_int
- NOAA-GFDL/MOM6@933b09abe Remove OMP directive that came with cherry-picking
- NOAA-GFDL/MOM6@7d228f73a Add missing OMP directives
- NOAA-GFDL/MOM6@b412fde96 Fix Leith_Ah
- NOAA-GFDL/MOM6@c53525eae Clean QG_Leith
- NOAA-GFDL/MOM6@48310e3d6 eliminate omp parallel open/close in to int_density_dz_generic_plm
- NOAA-GFDL/MOM6@98f5a8d97 add omp directives to int_density_dz_generic_plm
- NOAA-GFDL/MOM6@1165a61ba further refactor smoothing subroutine
- NOAA-GFDL/MOM6@e47e8b712 uncomment KPP clocks
- NOAA-GFDL/MOM6@e5fcc694d remove OMP enclosing get_BLD call
- NOAA-GFDL/MOM6@1e7fa519b add KPP timing clocks and omp directives
- NOAA-GFDL/MOM6@cd00022b5 Fix OMP calls
- NOAA-GFDL/MOM6@e3cbcbbd0 Fix openmp directives
- NOAA-GFDL/MOM6@e955c6d9a Fix openmp directives
- NOAA-GFDL/MOM6@3fb86e3ed Avoid division by zero
- NOAA-GFDL/MOM6@b609dead2 Fix indices in KE calculation
- NOAA-GFDL/MOM6@49ab54ab5 move pass_var in KPP smoothing outside the do-loop
- NOAA-GFDL/MOM6@65f36d768 Add diags for Lapl. and Bihar grid Reynolds #s
- NOAA-GFDL/MOM6@6cf28bf15 Add option to scale AH via a biharmonic Reynolds #
- NOAA-GFDL/MOM6@3dd70fe71 remove unnecessary kOBL computation
- NOAA-GFDL/MOM6@2aa10917d optimize barotropic timestepping openmp
- NOAA-GFDL/MOM6@01f7c452e uncomment omp in barotropic solver
- NOAA-GFDL/MOM6@0a2bb505f uncomment omp directive for KPP_compute_BLD
- NOAA-GFDL/MOM6@e089a159f bug fix for cesm when restart_option is none
- NOAA-GFDL/MOM6@1a6411f0c added changes to unify cap with EMC changes
- NOAA-GFDL/MOM6@2fe522454 updates to clean up differences between nems and cmeps for restarts
adcroft added a commit that referenced this pull request Sep 9, 2020
@adcroft
Merge branch 'dev/master' into dev/gfdl
6840cd2 
- dev/master -> dev/gfdl

- NOAA-GFDL/MOM6@fae989582 Merge branch 'Hallberg-NOAA-merge_ncar_gfdl' into dev/gfdl
- NOAA-GFDL/MOM6@97793be50 Merge branch 'dev/master' into merge_ncar_gfdl
- NOAA-GFDL/MOM6@eb57e51f5 Merge pull request #1176 from gustavo-marques/dev-master-candidate-ncar-2020-08-11
- NOAA-GFDL/MOM6@c32db2594 Merge pull request #1193 from adcroft/brankart
- NOAA-GFDL/MOM6@365dd7c32 Merge branch 'dev/gfdl' into brankart
- NOAA-GFDL/MOM6@413427889 Merge branch 'Hallberg-NOAA-fix_memory_macros' into dev/gfdl
- NOAA-GFDL/MOM6@71f6921a1 Merge branch 'fix_memory_macros' of https://github.com/Hallberg-NOAA/MOM6 into Hallberg-NOAA-fix_memory_macros
- NOAA-GFDL/MOM6@edff25e02 Rename intermediate variable in Stanley PGF parameterization
- NOAA-GFDL/MOM6@b155bf36b (*)Correct the use of memory macros for arguments
- NOAA-GFDL/MOM6@4dbc12697 Adds land masking of thicknesses in SGS estimate
- NOAA-GFDL/MOM6@63a2e2ae8 Merge branch 'dev/gfdl' into brankart
- NOAA-GFDL/MOM6@54cf60d99 Merge branch 'dev/gfdl' into brankart
- NOAA-GFDL/MOM6@995e42232 Fix spelling in comments and line length
- NOAA-GFDL/MOM6@2946903bc Fix one more letter case to follow MOM6 convention
- NOAA-GFDL/MOM6@e3bc47a8d Fix letter case to follow MOM6 convention
- NOAA-GFDL/MOM6@17936f3fd Add modifications suggested by Bob Hallberg
- NOAA-GFDL/MOM6@ab9386c66 In do-loops, use uppercase K index for variables discretized on interfaces
- NOAA-GFDL/MOM6@287281cf6 Remove unnecessary present(num_rest_files) condition
- NOAA-GFDL/MOM6@6331da102 Remove (:,:) after 2-d variable declariation
- NOAA-GFDL/MOM6@608f4bfb8 Merge branch 'dev/master' into dev-master-candidate-ncar-2020-08-11
- NOAA-GFDL/MOM6@aa8ce213f Merge pull request #156 from NCAR/fix_multi_restart
- NOAA-GFDL/MOM6@648bb1ce8 make mct cap be able to read multiple restart files from rpointer
- NOAA-GFDL/MOM6@829aadea9 make mct cap be able to write multiple restart files to rpointer
- NOAA-GFDL/MOM6@bba3e91b5 increase nuopc cap restart filename length
- NOAA-GFDL/MOM6@0a5515b3d increase restart filename lengths
- NOAA-GFDL/MOM6@4c91ae3ac add filename length check
- NOAA-GFDL/MOM6@7a2256c50 correct restart file suffix index
- NOAA-GFDL/MOM6@4c6090010 read/write multiple restart filenames from/to rpointer files
- NOAA-GFDL/MOM6@ff27ad560 add num_rest_files to ocean_model_restart
- NOAA-GFDL/MOM6@2fe90f2fe retrieve num_rest_files from save_restart
- NOAA-GFDL/MOM6@f549dd011 Use thickness weighted variance estimate in PGF
- NOAA-GFDL/MOM6@859abbd36 Add diagnostic of SGS T variance in Stanley PGF
- NOAA-GFDL/MOM6@330d7c45a Merge pull request #155 from gustavo-marques/LBD_improvements_jun2020
- NOAA-GFDL/MOM6@388b100c8 Fix default zeta_bot values
- NOAA-GFDL/MOM6@3698c4055 Merge pull request #154 from gustavo-marques/restart_nuopc
- NOAA-GFDL/MOM6@0c98fa994 Merge pull request #153 from gustavo-marques/add_calls_time_interp_external_init
- NOAA-GFDL/MOM6@bb222c875 Merge pull request #152 from gustavo-marques/add_diagnostics
- NOAA-GFDL/MOM6@ca86bad51 Remove trailing space
- NOAA-GFDL/MOM6@8fdcd9048 Improve documentation and changed default method
- NOAA-GFDL/MOM6@7f478aa3e Add option to apply linear decay at the base of hbl
- NOAA-GFDL/MOM6@aed316cd7 Merge branch 'dev/ncar' into restart_nuopc
- NOAA-GFDL/MOM6@abb10ed4c Add calls to time_interp_external_init
- NOAA-GFDL/MOM6@473c3f47b Remove unused module
- NOAA-GFDL/MOM6@a69aea961 Add new diagnostics
- NOAA-GFDL/MOM6@4041cc90b Fix bug when applying ND only in the interior
- NOAA-GFDL/MOM6@fd68ffa0b Merge pull request #151 from gustavo-marques/merge-dev-master-candidate-2020-05-15
- NOAA-GFDL/MOM6@97547426a Fix OMP directives broken by merge
- NOAA-GFDL/MOM6@532e65ad5 undo OMP changes in MOM_EOS
- NOAA-GFDL/MOM6@b34478800 undo indent change from conflict resolve
- NOAA-GFDL/MOM6@2f44ca7ce correct conflict resolve in KPP
- NOAA-GFDL/MOM6@81805cc99 Merge branch 'dev/ncar' into merge-dev-master-candidate-2020-05-15
- NOAA-GFDL/MOM6@85f4dc09b Merge pull request #150 from NCAR/omp_performance
- NOAA-GFDL/MOM6@4755458e3 Merge branch 'dev-master-candidate-2020-05-15-patch1' into merge-dev-master-candidate-2020-05-15
- NOAA-GFDL/MOM6@fab21a749 Fixes an integer-kind mismatch in MOM_random, seed_from_time()
- NOAA-GFDL/MOM6@6d5a5f90b Merge branch 'dev-master-candidate-2020-05-15' into merge-dev-master-candidate-2020-05-15
- NOAA-GFDL/MOM6@02f5a8cf3 Merge pull request #149 from gustavo-marques/fix_tidal_mixing
- NOAA-GFDL/MOM6@c42d104c5 Merge pull request #148 from gustavo-marques/leith_improvements
- NOAA-GFDL/MOM6@809593cb4 Merge branch 'dev/ncar' into leith_improvements
- NOAA-GFDL/MOM6@4e54ad531 Merge pull request #147 from gustavo-marques/biharmonic_grid_Re
- NOAA-GFDL/MOM6@c06515f19 Add tidal diffusivities (Kd_tidal) into Kd_int
- NOAA-GFDL/MOM6@933b09abe Remove OMP directive that came with cherry-picking
- NOAA-GFDL/MOM6@7d228f73a Add missing OMP directives
- NOAA-GFDL/MOM6@b412fde96 Fix Leith_Ah
- NOAA-GFDL/MOM6@c53525eae Clean QG_Leith
- NOAA-GFDL/MOM6@48310e3d6 eliminate omp parallel open/close in to int_density_dz_generic_plm
- NOAA-GFDL/MOM6@98f5a8d97 add omp directives to int_density_dz_generic_plm
- NOAA-GFDL/MOM6@1165a61ba further refactor smoothing subroutine
- NOAA-GFDL/MOM6@e47e8b712 uncomment KPP clocks
- NOAA-GFDL/MOM6@e5fcc694d remove OMP enclosing get_BLD call
- NOAA-GFDL/MOM6@1e7fa519b add KPP timing clocks and omp directives
- NOAA-GFDL/MOM6@cd00022b5 Fix OMP calls
- NOAA-GFDL/MOM6@e3cbcbbd0 Fix openmp directives
- NOAA-GFDL/MOM6@e955c6d9a Fix openmp directives
- NOAA-GFDL/MOM6@3fb86e3ed Avoid division by zero
- NOAA-GFDL/MOM6@b609dead2 Fix indices in KE calculation
- NOAA-GFDL/MOM6@49ab54ab5 move pass_var in KPP smoothing outside the do-loop
- NOAA-GFDL/MOM6@65f36d768 Add diags for Lapl. and Bihar grid Reynolds #s
- NOAA-GFDL/MOM6@6cf28bf15 Add option to scale AH via a biharmonic Reynolds #
- NOAA-GFDL/MOM6@3dd70fe71 remove unnecessary kOBL computation
- NOAA-GFDL/MOM6@2aa10917d optimize barotropic timestepping openmp
- NOAA-GFDL/MOM6@01f7c452e uncomment omp in barotropic solver
- NOAA-GFDL/MOM6@0a2bb505f uncomment omp directive for KPP_compute_BLD
- NOAA-GFDL/MOM6@e089a159f bug fix for cesm when restart_option is none
- NOAA-GFDL/MOM6@1a6411f0c added changes to unify cap with EMC changes
- NOAA-GFDL/MOM6@2fe522454 updates to clean up differences between nems and cmeps for restarts
Hallberg-NOAA added a commit that referenced this pull request Jun 8, 2021
@Hallberg-NOAA
Update MOM_parameter_doc files after MOM6 PR #1413
ae27c86 
  Updated the MOM_parameter_doc files to reflect the fact that VISBECK_MAX_SLOPE
is not being recorded in some cases where its value is not used as a result of
MOM6 PR #1413.  Also updated the parameter doc files for several of the test
cases that are not routinely run in the pipeline testing.  Updated the versions
of MOM6 and SIS2 that are pointed to the versions right after MOM6 PR #1413 was
merged into dev/gfdl and SIS2 PR #147 was merged into its dev/gfdl.  No
solutions change as the result of the updated versions of MOM6 and SIS2.

  The non-merge MOM6 commits in this update include:
- NOAA-GFDL/MOM6@da287e1a7 Merge pull request #1413 from marshallward/valgrind_fixes
- NOAA-GFDL/MOM6@a6a799928 Merge pull request #1412 from ESMG/ESMG_sponge_masking
- NOAA-GFDL/MOM6@d9edec107 Update MOM_internal_tide_input.F90
- NOAA-GFDL/MOM6@121ec5c47 Merge pull request #1411 from Hallberg-NOAA/rescale_user_OBC_code
- NOAA-GFDL/MOM6@616413a58 Memory management cleanup and initialization fixes
- NOAA-GFDL/MOM6@b583c00d8 Change to masking of u,v sponges.
- NOAA-GFDL/MOM6@627ae3f5d Tiny cleaning up edits.
- NOAA-GFDL/MOM6@29061de6a +Dimensional rescaling of user OBC test cases

  The SIS2 commits in this update include:
- NOAA-GFDL/SIS2@11934c6 Merge pull request #147 from ESMG/dev/esmg
- ESMG/SIS2@a4cdaf0 Take guts back out of a routine.
- ESMG/SIS2@2acd393 Merge branch 'n_aero' into dev/esmg
- ESMG/SIS2@16e1b4b Don't need the guts of icepack_query_tracer_sizes
- ESMG/SIS2@87bca6f Guts of things copied over from Icepack.
- ESMG/SIS2@4ea2d75 Working version of icepack_tracers.F90
- ESMG/SIS2@e525f5b Integer n_aero, n_iso.
- ESMG/SIS2@27c6f8a Merge pull request #5 from MJHarrison-GFDL/n_iso_to_int
- ESMG/SIS2@f4c1aa3 Changes parameter n_iso and n_aero type to integer
- ESMG/SIS2@079c7b1 Merge pull request #4 from MJHarrison-GFDL/ice_ridging_interfaces
- ESMG/SIS2@54f9039 additional Icepack interfaces
- ESMG/SIS2@77b49be Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
- ESMG/SIS2@9aa2b52 Clean out some trailing whitespace.
- ESMG/SIS2@12432e3 Merge remote-tracking branch 'matt/Icepack' into dev/esmg
- ESMG/SIS2@184036d Call compress ice after ice_ridging to clean up any residual part size excess
- ESMG/SIS2@b662f69 Merge pull request #1 from MJHarrison-GFDL/Icepack
- ESMG/SIS2@b528a23 Re-normalized ice coverage after call to ridge_ice
- ESMG/SIS2@4d0d910 Modifications to enable Icepack APIs for ridging.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Hallberg-NOAA @adcroft