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

New coordinate, rho, for the seamount test. #75

Merged
merged 1 commit into from
Mar 25, 2016
Merged

New coordinate, rho, for the seamount test. #75

merged 1 commit into from
Mar 25, 2016

Conversation

gustavo-marques
Copy link
Member

Addded a rho coordiate test, which was missing. We made it working by adding MASS_WEIGHT_IN_PRESSURE_GRADIENT = True and making the min. thickness small (MIN_THICKNESS = 1.E-9).

@gustavo-marques
New coordinate, rho, for the seamount test.
4e7ae2b 
Addded a rho coordiate test, which was missing. We made it working by adding MASS_WEIGHT_IN_PRESSURE_GRADIENT = True and making the min. thickness small (MIN_THICKNESS = 1.E-9).
@adcroft adcroft merged commit 4e7ae2b into NOAA-GFDL:dev/master Mar 25, 2016
adcroft added a commit that referenced this pull request Oct 5, 2018
@adcroft
MOM6: Merge branch 'gustavo-marques-dev-ncar-candidate-2018-09-26' in…
585b9ce 
…to dev/master

PR from NCAR:
- NOAA-GFDL/MOM6@c77ad425c Merge branch 'gustavo-marques-dev-ncar-candidate-2018-09-26' into dev/master
- NOAA-GFDL/MOM6@c09a6611a Merge pull request #4 from alperaltuntas/bkgnd_mixing_fix
- NOAA-GFDL/MOM6@3666d609d read prandtl_bknd for all cases
- NOAA-GFDL/MOM6@4306feb4b  end if to endif and end do to enddo
- NOAA-GFDL/MOM6@3714a3955 un-indent subroutines
- NOAA-GFDL/MOM6@caec6dd27 read prandtl_bkgnd only for cvmix or horiz_varying_background
- NOAA-GFDL/MOM6@f91944488 fix divide by error if Kd=0.0
- NOAA-GFDL/MOM6@67b041352 Merge pull request #4 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@bf44b18b5 Merge branch 'dev/master' into dev-ncar-candidate-2018-09-26
- NOAA-GFDL/MOM6@bcb195a83 Merge pull request #80 from gustavo-marques/pass_OBLD_caps
- NOAA-GFDL/MOM6@6f6f92a51 Change melt potential from time accumulated to instantaneous
- NOAA-GFDL/MOM6@9f0676e83 Copy Hml into sfc_state, so that caps can access it
- NOAA-GFDL/MOM6@6ccd94c73 Pass Hml, from ePBL or KPP, via a call to diabatic
- NOAA-GFDL/MOM6@405061779 Add OBLD into MCT cap
- NOAA-GFDL/MOM6@1ced255e0 Merge pull request #78 from gustavo-marques/update_melt_potential
- NOAA-GFDL/MOM6@d32386dc5 Allocates visc%MLD when hfreeze >= 0.0
- NOAA-GFDL/MOM6@ddccc44c9 Copy OBLD to visc%MLD when using KPP
- NOAA-GFDL/MOM6@d3d8215bd Add a new implementation for the melt potential calculation
- NOAA-GFDL/MOM6@f1445de5f Add option to use melt potential in mct and couple_driver
- NOAA-GFDL/MOM6@9c8b3c5da Comment DEBUG message
- NOAA-GFDL/MOM6@b7d83affc Merge pull request #73 from alperaltuntas/horiz_varying_background
- NOAA-GFDL/MOM6@4a7de48ad Merge pull request #77 from gustavo-marques/add_melt_potential_mct
- NOAA-GFDL/MOM6@5d6ff165f Merge branch 'dev/ncar' into add_melt_potential_mct
- NOAA-GFDL/MOM6@d0bc3bc2f Fix bug and make sure melt potential is always <= 0
- NOAA-GFDL/MOM6@c6b253400 Pass melt/freeze potential to coupler; reset melt_potential
- NOAA-GFDL/MOM6@eb2c69f1d Replace units (W/m^2 to J/m^2) in the comments
- NOAA-GFDL/MOM6@be0e7a844 Remove dt from extract_surface_state
- NOAA-GFDL/MOM6@12011dec9 Merge pull request #76 from gustavo-marques/merge-candidate-2018-07-16
- NOAA-GFDL/MOM6@05d6c805a Update melt_potential again, but values are still ~ 3 x smaller
- NOAA-GFDL/MOM6@0a55527b0 Merge branch 'dev/ncar' into merge-candidate-2018-07-16
- NOAA-GFDL/MOM6@7347ad973 Update calculation of melt_potential
- NOAA-GFDL/MOM6@4e5bf7494 Change calculation of melt_potential
- NOAA-GFDL/MOM6@60eb7ec30 Add comment about icefrq used in Hycom
- NOAA-GFDL/MOM6@d981745f8 Fix a call to ocn_export
- NOAA-GFDL/MOM6@b52db1ff5 Allocate/deallocate melt_potential
- NOAA-GFDL/MOM6@3cdd97bfa Add option to calculate melt potential
- NOAA-GFDL/MOM6@a840dc0f4 Pass melt potential (o2x_Fioo_q) via mct driver
- NOAA-GFDL/MOM6@4e41df988 Merge pull request #3 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@02d9be2f9 rm temporarily the noupc cap
- NOAA-GFDL/MOM6@04845d4e8 Merge pull request #74 from NCAR/dev/nuopc
- NOAA-GFDL/MOM6@25873994d rename mom_cap
- NOAA-GFDL/MOM6@353f60f07 Merge pull request #75 from NCAR/dev/nuopc_alper
- NOAA-GFDL/MOM6@0cdce0817 Merge branch 'dev-master-candidate-2018-07-16' into merge-candidate-2018-07-16
- NOAA-GFDL/MOM6@116fdfba4 rm trailing spaces
- NOAA-GFDL/MOM6@838de5293 improve mct cap doxumentation
- NOAA-GFDL/MOM6@290d4f5e4 add only keywords
- NOAA-GFDL/MOM6@ad1a2957d limit line widths to 120 chars
- NOAA-GFDL/MOM6@a2c6a7a2f improve tab width consistency
- NOAA-GFDL/MOM6@c2655b3ab fix call to shelf_calc_flux
- NOAA-GFDL/MOM6@8606be9df removed more trailing white space
- NOAA-GFDL/MOM6@d32333e07 fixed trailing white space
- NOAA-GFDL/MOM6@7fb01ffe9 removed trailing whitespace
- NOAA-GFDL/MOM6@f49c205eb more cleanup of cesm cap
- NOAA-GFDL/MOM6@450f87cbc more changes to get the nuopc cap working
- NOAA-GFDL/MOM6@403f59a8c changes needed to get nuopc cap restarting correctly
- NOAA-GFDL/MOM6@6f43605f9 removed use for shr_flds_dom_coord and shr_flds_dom_other by hardwiring names
- NOAA-GFDL/MOM6@2d89fa416 merged to head of dev/ncar
- NOAA-GFDL/MOM6@62dea759f updates for get nuopc working
- NOAA-GFDL/MOM6@bd90705ea Merge pull request #72 from gustavo-marques/update_KPP
- NOAA-GFDL/MOM6@ebceaece5 add horiz_varying_background scheme
- NOAA-GFDL/MOM6@48845179f check whether KD, KV and PRANDTL_BKGND are compatible
- NOAA-GFDL/MOM6@4b2bd2f13 Merge branch 'kpp_changes' into horiz_varying_background
- NOAA-GFDL/MOM6@1516d6a40 add safety checks for MOM_bkgnd_mixing schemes
- NOAA-GFDL/MOM6@7f67a4596 changes to get mom6 working correctly in nuopc mode and addition of debug output
- NOAA-GFDL/MOM6@c4f2a5e7f more updates
- NOAA-GFDL/MOM6@9e2578044 Merge branch 'dev/nuopc' of https://github.com/NCAR/MOM6 into dev/nuopc
- NOAA-GFDL/MOM6@50e4a654a additional changes to have mom cap nuopc working without a lot of diagnostic output
- NOAA-GFDL/MOM6@f3ca0c8df fixes to get mom cap working with cice
- NOAA-GFDL/MOM6@eef4bf2d4 Added global grid nx and ny scalars to MOM6 cap for writing history files
- NOAA-GFDL/MOM6@b7a88a6cc Merge branch 'mvertens/dev_nuopc' into dev/nuopc
- NOAA-GFDL/MOM6@4c1a97fc7 no longer need to scale by mask - since its done in MOM_surface_forcing
- NOAA-GFDL/MOM6@5f1b51c72 more cleanup of ocn_comp_mct
- NOAA-GFDL/MOM6@3d1962c01 changes to MOM6 to get nuopc and mct caps similar
- NOAA-GFDL/MOM6@b10f3434a last set of changes on the mct side to get mct and nuopc caps compatible
- NOAA-GFDL/MOM6@972293480 more updates to get nuopc and mct closer
- NOAA-GFDL/MOM6@f482863b3 more changes to bring in nuopc and mct caps closer together
- NOAA-GFDL/MOM6@8a230737d more udpates to make mct and mom caps similar
- NOAA-GFDL/MOM6@06565ec01 major refactor of mct interface - and addition -f MOM_ocean_model.F90 and MOM_surface_forcing.F90 to mct and nuopc cap codes
- NOAA-GFDL/MOM6@9fae628cd fixes for having mom6 work with nuopc-cmeps-v0.4
- NOAA-GFDL/MOM6@0a494857f Merge branch 'dev/ncar_nuopc' of https://github.com/mvertens/MOM6 into dev/nuopc
- NOAA-GFDL/MOM6@93d7a07bc changes to mom cap to be compatible with nuopcB_180413
- NOAA-GFDL/MOM6@fdc7962b5 updates for cesm-nuopc-cmeps-mom6-nems_cap configuration
- NOAA-GFDL/MOM6@d30900b26 update mom6 nuopc cap
- NOAA-GFDL/MOM6@2cfa6314a update mom_cap for cesm
- NOAA-GFDL/MOM6@5374582b3 update mom cap from NEMS
- NOAA-GFDL/MOM6@7bf531bf3 placed the GFDL MOM6 cap as a starting point in the new nuopc_driver/ directory
adcroft added a commit that referenced this pull request Oct 12, 2018
@adcroft
Merge branch 'dev/master' into dev/gfdl
7da7cf3 
Merging in dev/master after PR from NCAR:

- NOAA-GFDL/MOM6@587c9b7ac Merge branch 'dev/master' into dev/gfdl
- NOAA-GFDL/MOM6@c4d6dd011 Merge pull request #857 from wrongkindofdoctor/user/jml/add_mol_wt_to_aof
- NOAA-GFDL/MOM6@c77ad425c Merge branch 'gustavo-marques-dev-ncar-candidate-2018-09-26' into dev/master
- NOAA-GFDL/MOM6@120562440 Merge pull request #858 from MFJansen/patch-1
- NOAA-GFDL/MOM6@7575e39e3 Swapped argument attribute order
- NOAA-GFDL/MOM6@76f80bc95 Removed trailing white space
- NOAA-GFDL/MOM6@940311546 Bug fix to compute Rd_dx whenever MEKE is used
- NOAA-GFDL/MOM6@c09a6611a Merge pull request #4 from alperaltuntas/bkgnd_mixing_fix
- NOAA-GFDL/MOM6@3666d609d read prandtl_bknd for all cases
- NOAA-GFDL/MOM6@ecefa4c7d added mol_wt dummy argument to atmos_ocean_fluxes in solo_driver
- NOAA-GFDL/MOM6@ab7040a0b Merge pull request #4 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@4306feb4b  end if to endif and end do to enddo
- NOAA-GFDL/MOM6@3714a3955 un-indent subroutines
- NOAA-GFDL/MOM6@caec6dd27 read prandtl_bkgnd only for cvmix or horiz_varying_background
- NOAA-GFDL/MOM6@f91944488 fix divide by error if Kd=0.0
- NOAA-GFDL/MOM6@67b041352 Merge pull request #4 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@2701b7a07 Merge pull request #854 from Hallberg-NOAA/correct_ice_shelf_grid
- NOAA-GFDL/MOM6@7effdd26b Merge pull request #3 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@bf44b18b5 Merge branch 'dev/master' into dev-ncar-candidate-2018-09-26
- NOAA-GFDL/MOM6@bcb195a83 Merge pull request #80 from gustavo-marques/pass_OBLD_caps
- NOAA-GFDL/MOM6@180e0ea12 (*)Correct the grid used for allocate_forcing_type
- NOAA-GFDL/MOM6@6f6f92a51 Change melt potential from time accumulated to instantaneous
- NOAA-GFDL/MOM6@9f0676e83 Copy Hml into sfc_state, so that caps can access it
- NOAA-GFDL/MOM6@6ccd94c73 Pass Hml, from ePBL or KPP, via a call to diabatic
- NOAA-GFDL/MOM6@e23fac158 Merge branch 'Hallberg-NOAA-fix_vertex_shearmix' into dev/gfdl
- NOAA-GFDL/MOM6@508bde943 Merge branch 'fix_vertex_shearmix' of https://github.com/Hallberg-NOAA/MOM6 into Hallberg-NOAA-fix_vertex_shearmix
- NOAA-GFDL/MOM6@9ede9b61a +(*)Corrected halo data when VERTEX_SHEAR=True
- NOAA-GFDL/MOM6@1cc8d7202 +Added optional halo_TS arg to set_diffusivity_init
- NOAA-GFDL/MOM6@fd6fb2e8b +Added an optional halo argument to geothermal
- NOAA-GFDL/MOM6@76a87b41d +Added an optional halo argument to make_frazil
- NOAA-GFDL/MOM6@405061779 Add OBLD into MCT cap
- NOAA-GFDL/MOM6@1ced255e0 Merge pull request #78 from gustavo-marques/update_melt_potential
- NOAA-GFDL/MOM6@d32386dc5 Allocates visc%MLD when hfreeze >= 0.0
- NOAA-GFDL/MOM6@ddccc44c9 Copy OBLD to visc%MLD when using KPP
- NOAA-GFDL/MOM6@d3d8215bd Add a new implementation for the melt potential calculation
- NOAA-GFDL/MOM6@f1445de5f Add option to use melt potential in mct and couple_driver
- NOAA-GFDL/MOM6@9c8b3c5da Comment DEBUG message
- NOAA-GFDL/MOM6@b0f123659 Merge pull request #2 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@b7d83affc Merge pull request #73 from alperaltuntas/horiz_varying_background
- NOAA-GFDL/MOM6@4a7de48ad Merge pull request #77 from gustavo-marques/add_melt_potential_mct
- NOAA-GFDL/MOM6@5d6ff165f Merge branch 'dev/ncar' into add_melt_potential_mct
- NOAA-GFDL/MOM6@d0bc3bc2f Fix bug and make sure melt potential is always <= 0
- NOAA-GFDL/MOM6@c6b253400 Pass melt/freeze potential to coupler; reset melt_potential
- NOAA-GFDL/MOM6@eb2c69f1d Replace units (W/m^2 to J/m^2) in the comments
- NOAA-GFDL/MOM6@be0e7a844 Remove dt from extract_surface_state
- NOAA-GFDL/MOM6@12011dec9 Merge pull request #76 from gustavo-marques/merge-candidate-2018-07-16
- NOAA-GFDL/MOM6@05d6c805a Update melt_potential again, but values are still ~ 3 x smaller
- NOAA-GFDL/MOM6@0a55527b0 Merge branch 'dev/ncar' into merge-candidate-2018-07-16
- NOAA-GFDL/MOM6@7347ad973 Update calculation of melt_potential
- NOAA-GFDL/MOM6@4e5bf7494 Change calculation of melt_potential
- NOAA-GFDL/MOM6@60eb7ec30 Add comment about icefrq used in Hycom
- NOAA-GFDL/MOM6@d981745f8 Fix a call to ocn_export
- NOAA-GFDL/MOM6@b52db1ff5 Allocate/deallocate melt_potential
- NOAA-GFDL/MOM6@3cdd97bfa Add option to calculate melt potential
- NOAA-GFDL/MOM6@a840dc0f4 Pass melt potential (o2x_Fioo_q) via mct driver
- NOAA-GFDL/MOM6@4e41df988 Merge pull request #3 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@02d9be2f9 rm temporarily the noupc cap
- NOAA-GFDL/MOM6@04845d4e8 Merge pull request #74 from NCAR/dev/nuopc
- NOAA-GFDL/MOM6@25873994d rename mom_cap
- NOAA-GFDL/MOM6@353f60f07 Merge pull request #75 from NCAR/dev/nuopc_alper
- NOAA-GFDL/MOM6@0cdce0817 Merge branch 'dev-master-candidate-2018-07-16' into merge-candidate-2018-07-16
- NOAA-GFDL/MOM6@116fdfba4 rm trailing spaces
- NOAA-GFDL/MOM6@838de5293 improve mct cap doxumentation
- NOAA-GFDL/MOM6@290d4f5e4 add only keywords
- NOAA-GFDL/MOM6@ad1a2957d limit line widths to 120 chars
- NOAA-GFDL/MOM6@a2c6a7a2f improve tab width consistency
- NOAA-GFDL/MOM6@c2655b3ab fix call to shelf_calc_flux
- NOAA-GFDL/MOM6@8606be9df removed more trailing white space
- NOAA-GFDL/MOM6@d32333e07 fixed trailing white space
- NOAA-GFDL/MOM6@7fb01ffe9 removed trailing whitespace
- NOAA-GFDL/MOM6@f49c205eb more cleanup of cesm cap
- NOAA-GFDL/MOM6@450f87cbc more changes to get the nuopc cap working
- NOAA-GFDL/MOM6@403f59a8c changes needed to get nuopc cap restarting correctly
- NOAA-GFDL/MOM6@6f43605f9 removed use for shr_flds_dom_coord and shr_flds_dom_other by hardwiring names
- NOAA-GFDL/MOM6@2d89fa416 merged to head of dev/ncar
- NOAA-GFDL/MOM6@62dea759f updates for get nuopc working
- NOAA-GFDL/MOM6@bd90705ea Merge pull request #72 from gustavo-marques/update_KPP
- NOAA-GFDL/MOM6@ebceaece5 add horiz_varying_background scheme
- NOAA-GFDL/MOM6@48845179f check whether KD, KV and PRANDTL_BKGND are compatible
- NOAA-GFDL/MOM6@4b2bd2f13 Merge branch 'kpp_changes' into horiz_varying_background
- NOAA-GFDL/MOM6@1516d6a40 add safety checks for MOM_bkgnd_mixing schemes
- NOAA-GFDL/MOM6@7f67a4596 changes to get mom6 working correctly in nuopc mode and addition of debug output
- NOAA-GFDL/MOM6@c4f2a5e7f more updates
- NOAA-GFDL/MOM6@9e2578044 Merge branch 'dev/nuopc' of https://github.com/NCAR/MOM6 into dev/nuopc
- NOAA-GFDL/MOM6@50e4a654a additional changes to have mom cap nuopc working without a lot of diagnostic output
- NOAA-GFDL/MOM6@f3ca0c8df fixes to get mom cap working with cice
- NOAA-GFDL/MOM6@eef4bf2d4 Added global grid nx and ny scalars to MOM6 cap for writing history files
- NOAA-GFDL/MOM6@b7a88a6cc Merge branch 'mvertens/dev_nuopc' into dev/nuopc
- NOAA-GFDL/MOM6@4c1a97fc7 no longer need to scale by mask - since its done in MOM_surface_forcing
- NOAA-GFDL/MOM6@5f1b51c72 more cleanup of ocn_comp_mct
- NOAA-GFDL/MOM6@3d1962c01 changes to MOM6 to get nuopc and mct caps similar
- NOAA-GFDL/MOM6@b10f3434a last set of changes on the mct side to get mct and nuopc caps compatible
- NOAA-GFDL/MOM6@972293480 more updates to get nuopc and mct closer
- NOAA-GFDL/MOM6@f482863b3 more changes to bring in nuopc and mct caps closer together
- NOAA-GFDL/MOM6@8a230737d more udpates to make mct and mom caps similar
- NOAA-GFDL/MOM6@06565ec01 major refactor of mct interface - and addition -f MOM_ocean_model.F90 and MOM_surface_forcing.F90 to mct and nuopc cap codes
- NOAA-GFDL/MOM6@9fae628cd fixes for having mom6 work with nuopc-cmeps-v0.4
- NOAA-GFDL/MOM6@0a494857f Merge branch 'dev/ncar_nuopc' of https://github.com/mvertens/MOM6 into dev/nuopc
- NOAA-GFDL/MOM6@93d7a07bc changes to mom cap to be compatible with nuopcB_180413
- NOAA-GFDL/MOM6@fdc7962b5 updates for cesm-nuopc-cmeps-mom6-nems_cap configuration
- NOAA-GFDL/MOM6@d30900b26 update mom6 nuopc cap
- NOAA-GFDL/MOM6@2cfa6314a update mom_cap for cesm
- NOAA-GFDL/MOM6@5374582b3 update mom cap from NEMS
- NOAA-GFDL/MOM6@7bf531bf3 placed the GFDL MOM6 cap as a starting point in the new nuopc_driver/ directory
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
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gustavo-marques @adcroft