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

Fix a few issues with analysis scripts #5

Merged
merged 1 commit into from
Nov 6, 2014
Merged

Fix a few issues with analysis scripts #5

merged 1 commit into from
Nov 6, 2014

Conversation

nikizadehgfdl
Copy link
Contributor

  • ocn_annual.frepp should load the proper modules for building MIDAS
  • ocn_annual.frepp should do "make frepp_local" to build and clean the MIDAS package
  • TS_depth_integrals.py should use 'Agg' instead of X to work on analysis nodes
  • TS_depth_integrals.py must be executable (chmod +x)
  • EddyKineticEnergy.py should not use logscale=True since it is broken

This pull request should fix issue #2

@nikizadehgfdl
Fix a few issues with analysis scripts
5c2878c 
- ocn_annual.frepp should load the proper modules for building MIDAS
- ocn_annual.frepp should do "make frepp_local" to build and clean the MIDAS package
- TS_depth_integrals.py should use 'Agg'  instead of X to work on analysis nodes
- TS_depth_integrals.py must be executable (chmod +x)
- EddyKineticEnergy.py should not use  logscale=True since it is broken
adcroft added a commit that referenced this pull request Nov 6, 2014
@adcroft
Merge pull request #5 from CommerceGov/usr/nnz/fix_analysis_template
e794854 
- Corrects environment and imports needed for MIDAS.
- Fixes EKE script.
- Fixes #2.
@adcroft adcroft merged commit e794854 into dev/master Nov 6, 2014
@Hallberg-NOAA Hallberg-NOAA mentioned this pull request May 27, 2016
Open
@nikizadehgfdl nikizadehgfdl deleted the usr/nnz/fix_analysis_template branch July 27, 2016 18:28
adcroft added a commit that referenced this pull request Aug 17, 2017
@adcroft
MOM6: Merge pull request #578 from NCAR/dev/ncar
8b801de 
- NOAA-GFDL/MOM6@ae22a0f Merge pull request #578 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@f4f882f Merge pull request #23 from gustavo-marques/combine_mct_modules
- NOAA-GFDL/MOM6@a85b728 Merge MCT modules
- NOAA-GFDL/MOM6@ba5b5ba Merge pull request #22 from gustavo-marques/check_fluxes
- NOAA-GFDL/MOM6@f5a8483 Adds option to write restart files
- NOAA-GFDL/MOM6@8745b4b Fills additional IOB fluxes
- NOAA-GFDL/MOM6@f6b22ff Merge branch 'dev/ncar' into check_fluxes
- NOAA-GFDL/MOM6@369d5d6 Merge pull request #21 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@2582e0a Adds run paramaters to control SW decomposition
- NOAA-GFDL/MOM6@58f78b9 Fill IOB, some fluxes still need to be checked
- NOAA-GFDL/MOM6@06a30ab Fixed clock and timing
- NOAA-GFDL/MOM6@1bca79b Merge pull request #20 from gustavo-marques/fix_merge
- NOAA-GFDL/MOM6@fb89b08 Adds code that got lost during merge
- NOAA-GFDL/MOM6@7480492 Merge pull request #19 from gustavo-marques/new_merge
- NOAA-GFDL/MOM6@be1e6cf Merge branch 'dev/master' into dev/ncar
- NOAA-GFDL/MOM6@76565cb Merge pull request #17 from gustavo-marques/fix_ssh_slopes
- NOAA-GFDL/MOM6@c04f081 Fix ssh slope calculation
- NOAA-GFDL/MOM6@17d4586 Merge pull request #16 from adcroft/ncar-cherry-picked-fixes
- NOAA-GFDL/MOM6@be46fee (*)Fixes gprime(1) when no layer coordinates are set
- NOAA-GFDL/MOM6@fccb7ae Avoids a SEGV when OBC are not in use with bi-harmonic friction
- NOAA-GFDL/MOM6@f42c970 Merge pull request #15 from gustavo-marques/small_fixes
- NOAA-GFDL/MOM6@31787c2 Adds reference to set_time that was lost during a conflict handling
- NOAA-GFDL/MOM6@d77936e Fix intent(inout) in ice_ocean_boundary
- NOAA-GFDL/MOM6@b403edd Merge pull request #14 from gustavo-marques/docs
- NOAA-GFDL/MOM6@4d346ca Merge branch 'dev/ncar' into docs
- NOAA-GFDL/MOM6@f7c26a5 Clean the module and start doxygenizing it
- NOAA-GFDL/MOM6@cd58e2a Merge pull request #13 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@37a53bc reorganize file structure
- NOAA-GFDL/MOM6@e6c5ddd Merge pull request #12 from gustavo-marques/fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@6b6289a Remove trailing whitespace
- NOAA-GFDL/MOM6@7ce40e5 Fix undefined reference to fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@d517719 Merge branch 'dev/ncar' into fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@b69ab33 Filling ice_ocean_bnd - Draft
- NOAA-GFDL/MOM6@a306c90 Merge pull request #11 from adcroft/use-ocn-public-for-surface
- NOAA-GFDL/MOM6@c83e238 Correct indexing when using ocean_public_type
- NOAA-GFDL/MOM6@1f39c84 Replaces use of "surface" with "ocean_public_type"
- NOAA-GFDL/MOM6@5cd8d7a Filling ice_ocean_bnd, still needs work
- NOAA-GFDL/MOM6@3ceef26 Merge pull request #10 from adcroft/sketch-out-mct-run
- NOAA-GFDL/MOM6@714e8d6 Adds placeholders for stepping foward MOM
- NOAA-GFDL/MOM6@7f2207c Merge pull request #7 from adcroft/fix-mct-whitespace
- NOAA-GFDL/MOM6@a1db77f Cleans up white space
- NOAA-GFDL/MOM6@5700d67 Merge pull request #6 from adcroft/add-use-only-for-imports
- NOAA-GFDL/MOM6@beac3ed Adds "only" for all use statements
- NOAA-GFDL/MOM6@231d19e Merge pull request #5 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@3a923a2 Got initialization working
- NOAA-GFDL/MOM6@8b38141 Wrapped global data
- NOAA-GFDL/MOM6@970f848 added debugging
- NOAA-GFDL/MOM6@2540ed8 Filled empty subroutines in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@ed3ed30 Added ocn_import_export module
- NOAA-GFDL/MOM6@aba7dc2 Completed ocn_init_mct
- NOAA-GFDL/MOM6@5df3bc3 Added method to point ponters to members of ocean_state_type
- NOAA-GFDL/MOM6@57e6086 Added methods to return domain/grid shape
- NOAA-GFDL/MOM6@37e7356 Added ocn_import_export.F90
- NOAA-GFDL/MOM6@2b794da Merge pull request #4 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@fbd405b Added coupler indices module
- NOAA-GFDL/MOM6@fa86163 Merge pull request #3 from NCAR/dev/gfdl
- NOAA-GFDL/MOM6@e8f2999 Merge pull request #2 from gustavo-marques/temp_salt_z_init_file
- NOAA-GFDL/MOM6@86936ba Adds option to read initial temp and salt from separate files
- NOAA-GFDL/MOM6@54f7976 Most initialization working
- NOAA-GFDL/MOM6@426357c Time and calendar initialization in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@346097d Moved blank ocn_comp_mct.F90
- NOAA-GFDL/MOM6@405fecb Merge pull request #1 from gustavo-marques/ice_shelf
- NOAA-GFDL/MOM6@711a613 Removes frazil's contribution to evaporation
adcroft added a commit that referenced this pull request Aug 17, 2017
@adcroft
MOM6: Merge branch 'dev/master' into dev/gfdl
3f17d14 
- Updates MOM_parameter_doc files.

- NOAA-GFDL/MOM6@cde6d3f Merge branch 'dev/master' into dev/gfdl
- NOAA-GFDL/MOM6@ae22a0f Merge pull request #578 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@f4f882f Merge pull request #23 from gustavo-marques/combine_mct_modules
- NOAA-GFDL/MOM6@a85b728 Merge MCT modules
- NOAA-GFDL/MOM6@ba5b5ba Merge pull request #22 from gustavo-marques/check_fluxes
- NOAA-GFDL/MOM6@f5a8483 Adds option to write restart files
- NOAA-GFDL/MOM6@8745b4b Fills additional IOB fluxes
- NOAA-GFDL/MOM6@f6b22ff Merge branch 'dev/ncar' into check_fluxes
- NOAA-GFDL/MOM6@369d5d6 Merge pull request #21 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@2582e0a Adds run paramaters to control SW decomposition
- NOAA-GFDL/MOM6@58f78b9 Fill IOB, some fluxes still need to be checked
- NOAA-GFDL/MOM6@06a30ab Fixed clock and timing
- NOAA-GFDL/MOM6@1bca79b Merge pull request #20 from gustavo-marques/fix_merge
- NOAA-GFDL/MOM6@fb89b08 Adds code that got lost during merge
- NOAA-GFDL/MOM6@7480492 Merge pull request #19 from gustavo-marques/new_merge
- NOAA-GFDL/MOM6@be1e6cf Merge branch 'dev/master' into dev/ncar
- NOAA-GFDL/MOM6@76565cb Merge pull request #17 from gustavo-marques/fix_ssh_slopes
- NOAA-GFDL/MOM6@c04f081 Fix ssh slope calculation
- NOAA-GFDL/MOM6@17d4586 Merge pull request #16 from adcroft/ncar-cherry-picked-fixes
- NOAA-GFDL/MOM6@be46fee (*)Fixes gprime(1) when no layer coordinates are set
- NOAA-GFDL/MOM6@fccb7ae Avoids a SEGV when OBC are not in use with bi-harmonic friction
- NOAA-GFDL/MOM6@f42c970 Merge pull request #15 from gustavo-marques/small_fixes
- NOAA-GFDL/MOM6@31787c2 Adds reference to set_time that was lost during a conflict handling
- NOAA-GFDL/MOM6@d77936e Fix intent(inout) in ice_ocean_boundary
- NOAA-GFDL/MOM6@b403edd Merge pull request #14 from gustavo-marques/docs
- NOAA-GFDL/MOM6@4d346ca Merge branch 'dev/ncar' into docs
- NOAA-GFDL/MOM6@f7c26a5 Clean the module and start doxygenizing it
- NOAA-GFDL/MOM6@cd58e2a Merge pull request #13 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@37a53bc reorganize file structure
- NOAA-GFDL/MOM6@e6c5ddd Merge pull request #12 from gustavo-marques/fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@6b6289a Remove trailing whitespace
- NOAA-GFDL/MOM6@7ce40e5 Fix undefined reference to fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@d517719 Merge branch 'dev/ncar' into fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@b69ab33 Filling ice_ocean_bnd - Draft
- NOAA-GFDL/MOM6@a306c90 Merge pull request #11 from adcroft/use-ocn-public-for-surface
- NOAA-GFDL/MOM6@c83e238 Correct indexing when using ocean_public_type
- NOAA-GFDL/MOM6@1f39c84 Replaces use of "surface" with "ocean_public_type"
- NOAA-GFDL/MOM6@5cd8d7a Filling ice_ocean_bnd, still needs work
- NOAA-GFDL/MOM6@3ceef26 Merge pull request #10 from adcroft/sketch-out-mct-run
- NOAA-GFDL/MOM6@714e8d6 Adds placeholders for stepping foward MOM
- NOAA-GFDL/MOM6@7f2207c Merge pull request #7 from adcroft/fix-mct-whitespace
- NOAA-GFDL/MOM6@a1db77f Cleans up white space
- NOAA-GFDL/MOM6@5700d67 Merge pull request #6 from adcroft/add-use-only-for-imports
- NOAA-GFDL/MOM6@beac3ed Adds "only" for all use statements
- NOAA-GFDL/MOM6@231d19e Merge pull request #5 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@3a923a2 Got initialization working
- NOAA-GFDL/MOM6@8b38141 Wrapped global data
- NOAA-GFDL/MOM6@970f848 added debugging
- NOAA-GFDL/MOM6@2540ed8 Filled empty subroutines in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@ed3ed30 Added ocn_import_export module
- NOAA-GFDL/MOM6@aba7dc2 Completed ocn_init_mct
- NOAA-GFDL/MOM6@5df3bc3 Added method to point ponters to members of ocean_state_type
- NOAA-GFDL/MOM6@57e6086 Added methods to return domain/grid shape
- NOAA-GFDL/MOM6@37e7356 Added ocn_import_export.F90
- NOAA-GFDL/MOM6@2b794da Merge pull request #4 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@fbd405b Added coupler indices module
- NOAA-GFDL/MOM6@fa86163 Merge pull request #3 from NCAR/dev/gfdl
- NOAA-GFDL/MOM6@e8f2999 Merge pull request #2 from gustavo-marques/temp_salt_z_init_file
- NOAA-GFDL/MOM6@86936ba Adds option to read initial temp and salt from separate files
- NOAA-GFDL/MOM6@54f7976 Most initialization working
- NOAA-GFDL/MOM6@426357c Time and calendar initialization in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@346097d Moved blank ocn_comp_mct.F90
- NOAA-GFDL/MOM6@405fecb Merge pull request #1 from gustavo-marques/ice_shelf
- NOAA-GFDL/MOM6@711a613 Removes frazil's contribution to evaporation
ashao pushed a commit to ashao/MOM6-examples that referenced this pull request Oct 3, 2017
@jkrasting
Merge pull request NOAA-GFDL#5 from NOAA-GFDL/dev/gfdl
b6a25d3 
Merge from dev/gfdl
marshallward added a commit to marshallward/MOM6-examples that referenced this pull request Nov 7, 2019
@marshallward
MOM6 and parameter update (NCAR, 2019/10/02)
b29c1aa 
This patch updates the repository to point to the updated dev/master
source, including NCAR's 2019/10/02 update.

Parameter changes:
- Removed: ADD_KV_SLOW
- Added: MEKE_EQUILIBRIUM_ALT

Diagnostic changes:
- Removed: FrictWork_diss

A seaice.stats file that had been added to Baltic_OM4_025 has also been
removed.

- NOAA-GFDL/MOM6@ec31391 Merge pull request #1013 from gustavo-marques/dev-master-candidate-ncar-2019-10-02
- NOAA-GFDL/MOM6@bccdf19 Restored comments documenting the dimensional rescaling of variables
- NOAA-GFDL/MOM6@be86d57 Merge branch 'dev/master' into dev-master-candidate-ncar-2019-10-02
- NOAA-GFDL/MOM6@3b957a7 Merge pull request NOAA-GFDL#126 from alperaltuntas/create_ncar_fork_of_doxygen
- NOAA-GFDL/MOM6@8648351 correct runoff units
- NOAA-GFDL/MOM6@de0777d fix import/export field tables
- NOAA-GFDL/MOM6@900ad92 fix subroutine table
- NOAA-GFDL/MOM6@51a179a Merge branch 'dev/ncar' into create_ncar_fork_of_doxygen
- NOAA-GFDL/MOM6@3260a30 Merge branch 'dev/ncar' of https://github.com/NCAR/MOM6 into dev/ncar
- NOAA-GFDL/MOM6@0369959 Merge branch 'dev/ncar' into create_ncar_fork_of_doxygen
- NOAA-GFDL/MOM6@d8a3886 Merge pull request NOAA-GFDL#125 from NCAR/rsdunlapiv/cap_doc_fix
- NOAA-GFDL/MOM6@d1b0322 Move doxygen to end of module to be consistent with MOM6 conventions
- NOAA-GFDL/MOM6@7dc0fd0 Fix the NUOPC cap doxygen to use HTML style formatting for the import/export field tables
- NOAA-GFDL/MOM6@2bd130f Merge pull request NOAA-GFDL#124 from alperaltuntas/create_ncar_fork_of_doxygen
- NOAA-GFDL/MOM6@521c732 set EXTRACT_ALL to generate call graphs
- NOAA-GFDL/MOM6@26c376c move ncar files to ncar/ dir
- NOAA-GFDL/MOM6@0b7f600 designate /mom_cap.F90 doxygen as subpage
- NOAA-GFDL/MOM6@e44474c changes for API page generation
- NOAA-GFDL/MOM6@ed59be3 Merge pull request NOAA-GFDL#6 from alperaltuntas/create_ncar_fork_of_doxygen
- NOAA-GFDL/MOM6@e18a5b4 rm empty line
- NOAA-GFDL/MOM6@3513c68 Merge pull request NOAA-GFDL#123 from alperaltuntas/create_ncar_fork_of_doxygen
- NOAA-GFDL/MOM6@46d4385 use Doxyfile_ncar_rtd if env var NCAR_FORK defined
- NOAA-GFDL/MOM6@c295ce1 add ncar version of Doxyfile
- NOAA-GFDL/MOM6@353cea1 remove unused modules
- NOAA-GFDL/MOM6@6eeeea5 Merge pull request NOAA-GFDL#122 from gustavo-marques/merge-dev-master-candidate-2019-08-30
- NOAA-GFDL/MOM6@992e826 Avoids posting Kv_slow when it is not initialized
- NOAA-GFDL/MOM6@ba2f186 Removed diagnostics related to FrictWork_diss and FrictWork_Max
- NOAA-GFDL/MOM6@fda9848 Merge pull request NOAA-GFDL#5 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@1852356 Removes white space
- NOAA-GFDL/MOM6@4d0e180 Merge branch 'dev/ncar' into merge-dev-master-candidate-2019-08-30
- NOAA-GFDL/MOM6@69ee7bc Merge pull request NOAA-GFDL#121 from gustavo-marques/fix_MEKE_GM_src
- NOAA-GFDL/MOM6@466903b Deletes more whitespace
- NOAA-GFDL/MOM6@584177f Deletes whitespace
- NOAA-GFDL/MOM6@fe44289 Fixes a bug when computing PE_release_h
- NOAA-GFDL/MOM6@25b409b Adding back 2018_answers and cleanning the code
- NOAA-GFDL/MOM6@ab9bc8a Adds OS%US as argument in add_shelf_forces
- NOAA-GFDL/MOM6@15a03c5 Commented out variables left over from merge
- NOAA-GFDL/MOM6@cfe0e70 Merge branch 'dev/ncar' into merge-dev-master-candidate-2019-08-30
- NOAA-GFDL/MOM6@38be24e Merge pull request NOAA-GFDL#120 from gustavo-marques/fix_gme
- NOAA-GFDL/MOM6@b810e26 Fixes line length exceeded
- NOAA-GFDL/MOM6@d329136 Merge pull request NOAA-GFDL#119 from NCAR/improve_consistency_check
- NOAA-GFDL/MOM6@7f7e8c0 Add EPS_OMESH value in error message
- NOAA-GFDL/MOM6@e02b358 compare mod 360 of diff and eps
- NOAA-GFDL/MOM6@d9a00d7 call MOM_error if mesh is inconsistent
- NOAA-GFDL/MOM6@c698b1a call get_eps_omesh and remove hardcoded limit
- NOAA-GFDL/MOM6@66f808b add units to EPS_OMESH
- NOAA-GFDL/MOM6@18c6f1e replace hard-coded mesh diff. limit with a param: eps_omesh
- NOAA-GFDL/MOM6@d05235f Final GME code fix
- NOAA-GFDL/MOM6@cc9e33d Adds new parameter, MEKE_EQUILIBRIUM_ALT
- NOAA-GFDL/MOM6@7ad7296 remove labeled format specifiers
- NOAA-GFDL/MOM6@d6277ca Merge pull request NOAA-GFDL#118 from gustavo-marques/consistency_check_nuopc
- NOAA-GFDL/MOM6@fb1133e Replaces CICE to MOM in error messages
- NOAA-GFDL/MOM6@d29a435 Adds consistency check between mesh and mom6 grid
- NOAA-GFDL/MOM6@2ac12ce Deleting comments
- NOAA-GFDL/MOM6@fa773cd Created new variables dvdx3/dudy3 for shearing strain on the Laplacian
- NOAA-GFDL/MOM6@0aeec9d Adds correct calculation of GME at q points
- NOAA-GFDL/MOM6@b339108 Groups terms for rotational invariance and deletes beta_h and beta_q (unused)
- NOAA-GFDL/MOM6@3257801 Removes unneeded calls to pass_var and add calls to pass_vector
- NOAA-GFDL/MOM6@3b7cb69 Fixes the remaining loop indices related to GME
- NOAA-GFDL/MOM6@e778191 Deletes max_diss_rate_bt since it is never used
- NOAA-GFDL/MOM6@93727f8 Fix first four loop indices suggested by Bob
- NOAA-GFDL/MOM6@5ff5a93 Merge pull request NOAA-GFDL#117 from gustavo-marques/remove_kv_slow
- NOAA-GFDL/MOM6@9f2f709 Removes visc%Kv_slow from restart files
- NOAA-GFDL/MOM6@6e145df Obsolete parameter ADD_KV_SLOW
- NOAA-GFDL/MOM6@b595da4 Merge pull request NOAA-GFDL#116 from gustavo-marques/fix_ocean_stats
- NOAA-GFDL/MOM6@b61053b Replaces timenow with time_start and corrects comments.
- NOAA-GFDL/MOM6@52225e3 Deletes blank line contains spaces
- NOAA-GFDL/MOM6@4191689 Deletes unecessary if statement
- NOAA-GFDL/MOM6@bd57605 Add time0 and timenow in NUOPC
- NOAA-GFDL/MOM6@52b018b Add time0 and timenow in MCT
@marshallward marshallward mentioned this pull request Nov 7, 2019
Merged
marshallward added a commit that referenced this pull request Mar 26, 2021
@marshallward
MOM6: Merge pull request #1357 from marshallward/emc_update_20210322
efb7a27 
- NOAA-GFDL/MOM6@b92d763ec Merge pull request #1357 from marshallward/emc_update_20210322
- NOAA-GFDL/MOM6@8cc501820 Style: Line length fix in MCT_cap
- NOAA-GFDL/MOM6@a1206ede8 Merge branch 'dev/gfdl' into emc_update_20210322
- NOAA-GFDL/MOM6@4fd897da2 Merge pull request #1355 from marshallward/test_submod_update
- NOAA-GFDL/MOM6@b33b3af7f Testing: Recurse target submodules, LDFLAGS hook
- NOAA-GFDL/MOM6@3193ab081 Merge pull request #1338 from OlgaSergienko/ice_dynamics
- NOAA-GFDL/MOM6@edc15f61c Merge branch 'dev/gfdl' into ice_dynamics
- NOAA-GFDL/MOM6@b89152c41 Merge branch 'dev/emc' into feature/allowmaskchanges
- NOAA-GFDL/MOM6@e5a40353f Merge pull request #61 from jiandewang/feature/update-to-GFDL-20210308
- NOAA-GFDL/MOM6@8dd907275 Merge pull request #1346 from marshallward/fgnv_bound_fix
- NOAA-GFDL/MOM6@33d28f138 Merge branch 'dev/gfdl' into fgnv_bound_fix
- NOAA-GFDL/MOM6@a6f680cc2 Merge pull request #1351 from adcroft/units-for-slope
- NOAA-GFDL/MOM6@ab241b642 Merge branch 'dev/gfdl' into units-for-slope
- NOAA-GFDL/MOM6@4255adad0 Merge pull request #1344 from adcroft/cvmix-update
- NOAA-GFDL/MOM6@5839494ce Merge branch 'dev/gfdl' into ice_dynamics
- NOAA-GFDL/MOM6@b911a3928 Merge branch 'dev/gfdl' into cvmix-update
- NOAA-GFDL/MOM6@0d60fd026 Change units of slope returned from calc_isoneutral_slopes() to "Z L-1"
- NOAA-GFDL/MOM6@250f00700 Merge pull request #1350 from Hallberg-NOAA/set_io_domain
- NOAA-GFDL/MOM6@abc8fe463 Removed blocks of commented text and multiplications by 0
- NOAA-GFDL/MOM6@8494ba8d6 change logical from "topog_..." to "topo_..."
- NOAA-GFDL/MOM6@5b686c838 add parameter for allowing land mask changes
- NOAA-GFDL/MOM6@bb5eb2527 Explicitly set (1x1) io_domain as a default
- NOAA-GFDL/MOM6@b47e493d3 Removed blocks of commented code. Added parentheses in calc_shelf_visc
- NOAA-GFDL/MOM6@3703ca7dd Merge remote-tracking branch 'GFDL/main' into feature/update-to-GFDL-20210308 this is corresponding to GFDL 20210308 main branch commit (hash # a4049e7)
- NOAA-GFDL/MOM6@a4049e784 Merge branch 'dev/gfdl' into main
- NOAA-GFDL/MOM6@651b4673f Bugfix: FGNV streamfunction vertical bounds
- NOAA-GFDL/MOM6@00cb11ce5 Merge pull request #56 from jiandewang/feature/update-to-GFDL-20210224
- NOAA-GFDL/MOM6@43dadc16a Defined variables in ice_shelf_solve_outer
- NOAA-GFDL/MOM6@aed4f0ee7 More style errors
- NOAA-GFDL/MOM6@2232fa288 corrected style errors in MOM_ice_shelf.F90; MOM_ice_shelf_dynamics.F90; MOM_ice_shelf_initialize.F90
- NOAA-GFDL/MOM6@9aa75c869 Modified MOM_ice_shelf_initialize.F90
- NOAA-GFDL/MOM6@5483bfed1 Cleaned initialize_ice_shelf_boundary_channel
- NOAA-GFDL/MOM6@e56d45335 Update CVMix to v0.98-beta
- NOAA-GFDL/MOM6@34dc0c848 Update CVMix to v0.94b-beta with API change
- NOAA-GFDL/MOM6@28b1ac922 Update CVMix to v0.93-beta (no API change)
- NOAA-GFDL/MOM6@a729a7fb4 Merge commit '00c2819457ab6d2497c871ce9a02d5e67e7f741c' into feature/update-to-GFDL-20210224 this is corresponding to GFDL 20210224 main branch commit (hash # 00c2819)
- NOAA-GFDL/MOM6@32cfe35a4 modified MOM_ice_shelf_initialize for testing with viscosity from a file
- NOAA-GFDL/MOM6@fdd83e658 dynamic ice shelf with non-linear viscosity and evolving ice thickness due to sub-ice-shelf melting
- NOAA-GFDL/MOM6@271bfce94 corrected boundary mask in init_boundary_channel and updated u_ and v_bdry_val through halo
- NOAA-GFDL/MOM6@89f4386eb corrected initialize_boundary_channel call
- NOAA-GFDL/MOM6@f0ae41c0c modified viscosity computations
- NOAA-GFDL/MOM6@cdc7690f4 Merge pull request #54 from DeniseWorthen/feature/optmesh
- NOAA-GFDL/MOM6@775205208 fixed ice-shelf advection
- NOAA-GFDL/MOM6@f30f636b2 corrected indecises in computation of driving stresses
- NOAA-GFDL/MOM6@a34ebb141 remove tempory bypass of mesh abort code
- NOAA-GFDL/MOM6@12b389520 Merge branch 'dev/emc' into feature/optmesh
- NOAA-GFDL/MOM6@13a5a2e0f comment out mask check which fails for mx100
- NOAA-GFDL/MOM6@7db2cc7a4 make mom mesh optional
- NOAA-GFDL/MOM6@d531a324a Merge pull request #51 from jiandewang/feature/update-to-GFDL-20210120
- NOAA-GFDL/MOM6@faeb13972 Merge pull request #1 from DeniseWorthen/bugfix/li2016fix
- NOAA-GFDL/MOM6@e7d0976de Fixes latent heat from fprec and frunoff
- NOAA-GFDL/MOM6@66ec49b2e Merge remote-tracking branch 'JiandeWang/feature/update-to-GFDL-20210120' into bugfix/li2016fix
- NOAA-GFDL/MOM6@e928fe22a Merge branch 'dev/emc' into bugfix/li2016fix
- NOAA-GFDL/MOM6@b544dad71 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@d63c2de85 Merge remote-tracking branch 'GFDL/main' into feature/update-to-GFDL-20210120 This is corresponding GFDL 20210120 main branch commit (hash # fe5e605)
- NOAA-GFDL/MOM6@cec1ad3b2 Merge pull request #49 from breichl/user/bgr/Tau_halo_updates_in_nupoc
- NOAA-GFDL/MOM6@91282c106 add brandon's halo update fix for LI_2016
- NOAA-GFDL/MOM6@29d768065 Add two halo updates for taux and tauy in mom_surface_forcing_nupoc - In A and B grid configuration halos were never updated after taux/tauy were populated. - This propogated through to the ustar_gustless field, hence caused a restart issue when using ustar_gustless in parameterizations. - This appears to correct the restart issue by updating the halos at the end of the A and B grid taux/tauy loops.
- NOAA-GFDL/MOM6@69b2a2354 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@ebac0adb8 Modifications to register_diag_field in MOM_ice_shelf_dynamics to make ice-shelf_fields consistent with diag_table Modifications to MOM_ice_shelf.F90 to apply melting to the case of a dynamic ice shelf.
- NOAA-GFDL/MOM6@d27bcbdba Matt's changes to drivers Merge branch 'revert_drivers' of https://github.com/MJHarrison-GFDL/MOM6 into matts-revert-drivers
- NOAA-GFDL/MOM6@39dd3e322 Modified MOM_ice_shelf_dynamics.F90
- NOAA-GFDL/MOM6@f1041d1f9 Fixed bugs in CG_action, matrix_diagonal and calc_shelf_visc in MOM_ice_shelf_dynamics.F90  modified initialize_ice_shelf_boundary_channel in MOM_ice_shelf_initialze.F90
- NOAA-GFDL/MOM6@a98f7db5e Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@f3bb72834 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@16ade2fe8 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@bfbd95aac white space changes
- NOAA-GFDL/MOM6@6164f63a9 manual add of dev/emc changes (statediagnose)
- NOAA-GFDL/MOM6@4e51baea1 Revert "Merge remote-tracking branch 'upstream/dev/emc' into dev/emc"
- NOAA-GFDL/MOM6@e4ca1dcb0 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@40bfb4bfe Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@6371e4892 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@58a69fcb6 Merge pull request #10 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@d53791175 Merge pull request #9 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@1be1217b2 Merge pull request #7 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@59270484c Merge pull request #6 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@fb02b3a4b Merge pull request #5 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@74f8d112c Merge pull request #4 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@2b7abecdc Merge pull request #2 from NOAA-EMC/dev/emc
marshallward added a commit that referenced this pull request Apr 14, 2021
@marshallward
MOM6: Merge pull request #1370 from Hallberg-NOAA/F_case_file_output
6354d81 
- NOAA-GFDL/MOM6@fc75e0fa4 Merge pull request #1370 from Hallberg-NOAA/F_case_file_output
- NOAA-GFDL/MOM6@e8e8abab9 Merge remote-tracking branch 'hallberg/F_case_file_output' into F_case_file_output
- NOAA-GFDL/MOM6@96f1d1e89 Use allocatable types in write_ocean_geometry_files
- NOAA-GFDL/MOM6@983824a69 Merge branch 'dev/gfdl' into F_case_file_output
- NOAA-GFDL/MOM6@5fe51b18e Merge pull request #1369 from Hallberg-NOAA/SIS2_IO_upgrades
- NOAA-GFDL/MOM6@0eb47b25a +More consistent treatment of input_filename = 'F'
- NOAA-GFDL/MOM6@03b997b88 +Enhanced support for novel axes in MOM_io
- NOAA-GFDL/MOM6@7ec08cd9b Merge pull request #1365 from marshallward/corad_vec_v2
- NOAA-GFDL/MOM6@dc66dd8a7 Merge branch 'dev/gfdl' into corad_vec_v2
- NOAA-GFDL/MOM6@c5c74419d Merge pull request #1364 from jkrasting/downsampled_diag_fix
- NOAA-GFDL/MOM6@a5fb36503 Merge branch 'dev/gfdl' into downsampled_diag_fix
- NOAA-GFDL/MOM6@d485a5123 Merge pull request #1363 from Hallberg-NOAA/SIS2_infra_support
- NOAA-GFDL/MOM6@b413f25c5 Merge branch 'SIS2_infra_support' of github.com:Hallberg-NOAA/MOM6 into SIS2_infra_support
- NOAA-GFDL/MOM6@358da7cc4 Corrected comments describing CT_copy_data
- NOAA-GFDL/MOM6@ad0bc3c41 Merge branch 'dev/gfdl' into SIS2_infra_support
- NOAA-GFDL/MOM6@fae570d0a Merge branch 'main' into main_to_gfdl
- NOAA-GFDL/MOM6@5f063044c Fixed downsampling summation for more diag types
- NOAA-GFDL/MOM6@c549ae9d9 Merge pull request #1358 from NOAA-GFDL/dev-gfdl-main-candidate-2021-03-26
- NOAA-GFDL/MOM6@ad372fdc2 Merge branch 'dev/gfdl' into SIS2_infra_support
- NOAA-GFDL/MOM6@d1dc6b5ba Coriolis: Improved coradcalc vectorization
- NOAA-GFDL/MOM6@2b6d3e115 Merge pull request #1362 from marshallward/horvisc_diag_to_stack
- NOAA-GFDL/MOM6@9792b2346 Fixed downsampling for x:sum y:point z:point diags
- NOAA-GFDL/MOM6@665cd9a3b Merge branch 'dev/gfdl' into horvisc_diag_to_stack
- NOAA-GFDL/MOM6@b6c7fdb02 change default value of use_mommesh as true
- NOAA-GFDL/MOM6@6d4a48390 Merge pull request #1360 from Hallberg-NOAA/fewer_timelevels
- NOAA-GFDL/MOM6@3c1cb2efd +Add MOM_domains interfaces needed by SIS2
- NOAA-GFDL/MOM6@cfa59aab1 +Add coupler_types interfaces needed by SIS2
- NOAA-GFDL/MOM6@97f111779 Merge branch 'dev/gfdl' into fewer_timelevels
- NOAA-GFDL/MOM6@813fc7975 Merge pull request #1359 from Hallberg-NOAA/FMS2_io_writes
- NOAA-GFDL/MOM6@2ffea27be MOM_hor_visc: Variables moved to stack
- NOAA-GFDL/MOM6@4fd380747 Merge branch 'dev/gfdl' into FMS2_io_writes
- NOAA-GFDL/MOM6@c62d51f9d Remove inappropriate timelevel arguments
- NOAA-GFDL/MOM6@13f1e70f5 Merge pull request #1356 from GEOS-ESM/bugfix/sanAkel/output-b-grid-currents
- NOAA-GFDL/MOM6@6c2b944e2 Merge branch 'dev/gfdl' into bugfix/sanAkel/output-b-grid-currents
- NOAA-GFDL/MOM6@67b03e324 Merge pull request #1353 from Hallberg-NOAA/less_checksums
- NOAA-GFDL/MOM6@5669d4360 Merge branch 'dev/gfdl' into less_checksums
- NOAA-GFDL/MOM6@b044be8ee Merge branch 'dev/gfdl' into FMS2_io_writes
- NOAA-GFDL/MOM6@fe9b2a106 Merge pull request #1352 from Hallberg-NOAA/FMS2_io
- NOAA-GFDL/MOM6@f6105cb22 Merge branch 'dev/gfdl' into FMS2_io
- NOAA-GFDL/MOM6@95ad9372b Fix distributed reads of checksums using FMS2_io
- NOAA-GFDL/MOM6@81c48cbf6 Merge pull request #5 from marshallward/FMS2_io_writes
- NOAA-GFDL/MOM6@ba643bde2 Explicit domain decomposition of horizontal axes
- NOAA-GFDL/MOM6@7bdecbc62 Add missing ".nc" to FMS2 output filenames
- NOAA-GFDL/MOM6@fad7e0d4a Merge branch 'dev/gfdl' into bugfix/sanAkel/output-b-grid-currents
- NOAA-GFDL/MOM6@17afc2b5e A call to pass_vector(...) is needed to correctly do a halo exchange before getting currents in A- or B-grid staggering. Now added.
- NOAA-GFDL/MOM6@3fe07d4c6 +Move FMS2 read helper routines into MOM_io_infra
- NOAA-GFDL/MOM6@2579d0771 Merge pull request #4 from gustavo-marques/less_checksums_mct_nuopc
- NOAA-GFDL/MOM6@66ac81057 Only write checksums from root PE MCT/NUOPC caps
- NOAA-GFDL/MOM6@84d5e2176 +FMS2 reads for ints & MOM_read_data_fms2 cleanup
- NOAA-GFDL/MOM6@4843c6c4d Merge branch 'dev/gfdl' into FMS2_io
- NOAA-GFDL/MOM6@03e174e14 Removed FMS2 MOM_axis and MOM_write_field_fms2
- NOAA-GFDL/MOM6@255233ba3 Added code to write via FMS2 interfaces
- NOAA-GFDL/MOM6@0fdc5c438 Correct warnings from categorize_axis
- NOAA-GFDL/MOM6@f89ddeaa8 +Add edge_axis argument to write_metadata_axis
- NOAA-GFDL/MOM6@ee0152f26 +Separate MOM_interp_infra axistype from MOM_io
- NOAA-GFDL/MOM6@09173f7dc Only write checksums from root PE for FMS_cap
- NOAA-GFDL/MOM6@30b057116 Merge branch 'dev/gfdl' into FMS2_io
- NOAA-GFDL/MOM6@91232095d Merge branch 'dev/gfdl' into FMS2_io
- NOAA-GFDL/MOM6@aab2ad645 +Add ability to read fields via FMS2 interfaces
- NOAA-GFDL/MOM6@23a78d2f6 Clean up in MOM_restart.F90
- NOAA-GFDL/MOM6@c68fedfea +Change arguments to MOM_register_variable_axes
- NOAA-GFDL/MOM6@0ba1aa53e +Simplified read_data_fms2 and write_field_fms2
- NOAA-GFDL/MOM6@f2459ec21 Merge branch 'user/jml/add_fms2io_to_MOM_restart' of https://github.com/wrongkindofdoctor/MOM6 into FMS2_io
- NOAA-GFDL/MOM6@a07757314 Explicitly set (1x1) io_domain as a default
- NOAA-GFDL/MOM6@d4531ca37 Duplicated infra/FMS1 into infra/FMS2
- NOAA-GFDL/MOM6@f806579bc Correct module use statements in infra/FMS1
- NOAA-GFDL/MOM6@2e46ea6d7 removed errant .true. in save_restart call
- NOAA-GFDL/MOM6@809b3ac52 added local logical variables to save restart wrapper that are set using the use_fms2 and write_ic flags if present to avoid invalid memory reference error added str_len argument to register_variable_attribute calls
- NOAA-GFDL/MOM6@a74c7eaba changed FMS release to 2020.03-beta1
- NOAA-GFDL/MOM6@5c2daa5da converted save_restart and restore_state to interface that call versions of the routines with the fms-io or fms2-io interfaces added module use statments for fms2_io and MOM_io helper routines to MOM_restart added use_fms2=.true. arguments to save_restart and restore_state calls added write_ic=.true. to the save_restart call in MOM.F90
- NOAA-GFDL/MOM6@40047fa50 Merge pull request #66 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@c8695c621 Merge pull request #65 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@0cf3cb9c9 Merge pull request #64 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@de7f95a57 Merge pull request #63 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@50c353935 Merge pull request #62 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@cbdcf8a52 Create hola_tierra.yml
- NOAA-GFDL/MOM6@763b17650 Merge pull request #61 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@ff3412651 Merge pull request #60 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@cea55fec4 Merge pull request #59 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@b8eee455f Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl
- NOAA-GFDL/MOM6@46b8f0fd5 Merge pull request #58 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@ff1a27f59 Merge pull request #57 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@496617cb1 Merge pull request #56 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@e9281f40e Merge pull request #55 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@4a5613400 Merge pull request #54 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@86c2a7dfa Merge pull request #53 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@c24535733 Merge pull request #52 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@8d7be6866 Merge pull request #51 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@7adcc9037 Merge pull request #50 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@aff2a13ab Merge pull request #49 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@477d9f85d Merge pull request #48 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@cee0a2166 Merge pull request #47 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@12dccaf8a Merge pull request #46 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@7dbca83ff Merge pull request #44 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@162ca970b Merge pull request #43 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@abaf004cb Merge pull request #42 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@075ab81e5 Merge pull request #41 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@e072bc7cc Merge in latest dev/gfdl updates (#40)
- NOAA-GFDL/MOM6@cae4cfd05 Merge branch 'dev/gfdl' of github.com:wrongkindofdoctor/MOM6 into dev/gfdl
- NOAA-GFDL/MOM6@ece60c11e Merge branch 'NOAA-GFDL-dev/gfdl' into dev/gfdl
- NOAA-GFDL/MOM6@3e27e4793 Merge branch 'dev/gfdl' of git://github.com/NOAA-GFDL/MOM6 into NOAA-GFDL-dev/gfdl
- NOAA-GFDL/MOM6@59109032e Merge pull request #38 from wrongkindofdoctor/revert-37-dev/gfdl
- NOAA-GFDL/MOM6@3c15a0c11 Revert "Merge in dev/gfdl updates (#37)"
- NOAA-GFDL/MOM6@855d7069d Merge in dev/gfdl updates (#37)
- NOAA-GFDL/MOM6@2c32568b7 merge in latest dev/gfdl updates (#36)
- NOAA-GFDL/MOM6@09bcebcfe Merge pull request #35 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@124a071e4 Merge pull request #33 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@a427676bd Merge pull request #32 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@0b874f32c Merge pull request #31 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@a5386da98 Merge pull request #30 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@5b2852cde Merge pull request #28 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@22c586562 Merge pull request #27 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@f9b5a7fca Merge pull request #26 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@577208343 Merge pull request #25 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@5589d8cc3 Merge pull request #24 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@aa11e1f66 Merge pull request #23 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@b5e5c48a6 Merge pull request #22 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@911d0a240 Merge pull request #21 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@601eb679c Merge pull request #20 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@b4fd53be9 Merge pull request #19 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@f6879f425 Merge pull request #18 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@139ab1fc0 Merge pull request #17 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@a0c80dcf3 Merge pull request #16 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@42cca4f46 Merge pull request #15 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@a1c556b7f Merge pull request #14 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@f5bc54b67 Merge pull request #13 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@6ffc8976f Merge pull request #12 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@30d35a3c6 Merge pull request #11 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@1304880fb Merge pull request #10 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@522069b31 Merge pull request #9 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@1bbc8de13 Merge pull request #8 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@9aa2aaeb1 Merge pull request #7 from NOAA-GFDL/dev/gfdl
- NOAA-GFDL/MOM6@b7f50fcbf Merge remote-tracking branch 'GFDL_MOM6/dev/gfdl' into dev/gfdl merge in latest MOM updates * GFDL_MOM6/dev/gfdl: (220 commits)   Update cache dir for /lustre/f2   Update cache dir for /lustre/f2   Calculate height-related diagnostics in Z   Set coord_adapt and coord_slight parameters in H   Corrected comments in build_zlike_column   +Pass max_depth to initialize_regridding in Z   Corrected comments in build_sigma_column   Combined scaling factors in build_adapt_column   Clarified comments in Idealized_Hurricane   +Recast MOM_diag_to_Z to work in units of Z   +Recast MOM_ALE_sponge to work in units of Z   +Added m_to_Z arg to horiz_interp_and_extrap_tracer   Find energetic_PBL column height changes in Z   +Find diapyc_energy_req column height changes in Z   Use local variables to rescale in MOM_Point_Accel   Recast MOM_sum_output to work in units of Z   Simplify MOM_diagnostics code   +Rescale depth inside of MEKE_lengthScales_0d   +Add conversion argument to register_static_field   Rescale values reported by PointAccel   ...
- NOAA-GFDL/MOM6@975262dc9 Merge pull request #5 from NOAA-GFDL/dev/gfdl
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

@adcroft adcroft

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nikizadehgfdl @adcroft