cannot compile with PGI and -openmp #10
Comments
nikizadehgfdl
changed the title
adcroft
added a commit
to mom-ocean/MOM6
that referenced
this issue
Dec 2, 2014
Also closes issue NOAA-GFDL/MOM6-examples#10 .
adcroft
added a commit
that referenced
this issue
Aug 17, 2017
- 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 issue
Aug 17, 2017
- 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
adcroft
added a commit
that referenced
this issue
Apr 1, 2020
…-27' into dev/master - Update of MOM6 from NCAR/MOM6 - NOAA-GFDL/MOM6@010492e Merge branch 'gustavo-marques-dev-master-candidate-ncar-2020-03-27' into dev/master - NOAA-GFDL/MOM6@e73db38 Merge branch 'dev-master-candidate-ncar-2020-03-27' of https://github.com/gustavo-marques/MOM6 into gustavo-marques-dev-master-candidate-ncar-2020-03-27 - NOAA-GFDL/MOM6@6ce3dd9 Change CDRAG_MEKE to MEKE_CDRAG - NOAA-GFDL/MOM6@0cddf1f Merge pull request #146 from NCAR/fix_tracer_advect_omp - NOAA-GFDL/MOM6@8025fd4 refactor advect_x and advect_y calls - NOAA-GFDL/MOM6@3768a11 make advect_y thread-safe - NOAA-GFDL/MOM6@3d05d85 make T_adx_2d diagnostics thread-safe - NOAA-GFDL/MOM6@6636e0f fix OMP directive variable list - NOAA-GFDL/MOM6@afe0335 Merge pull request #144 from gustavo-marques/merge_GME_outside_MEKE - NOAA-GFDL/MOM6@1f308a0 Extend loop indices and add calls to pass_vector - NOAA-GFDL/MOM6@1ecade5 Updates GME by removing dependency on MEKE - NOAA-GFDL/MOM6@c012019 Merge pull request #143 from gustavo-marques/fix_vhGM_GEOMETRIC - NOAA-GFDL/MOM6@c429824 Fix a bug in the vmGM field when using GEOMETRIC - NOAA-GFDL/MOM6@0eb0615 Merge pull request #142 from NCAR/omp_fixes - NOAA-GFDL/MOM6@f832925 initialize fluid entrainment arrays - NOAA-GFDL/MOM6@276c6b4 call chksum for drag_vel if its allocated - NOAA-GFDL/MOM6@4478066 uncomment omp do block in advect_tracer - NOAA-GFDL/MOM6@7533454 fix omp in calculate_diagnostic_fields - NOAA-GFDL/MOM6@21918b4 comment out OMP directives in KPP_compute_BLD temporarily - NOAA-GFDL/MOM6@049abb0 fix omp directives in set_viscous_BBL - NOAA-GFDL/MOM6@67e5481 fix omp directive for melt_potential - NOAA-GFDL/MOM6@46b1f34 correct namespace name for doxygen - NOAA-GFDL/MOM6@83da090 Merge pull request #141 from alperaltuntas/fix_gnu_bugs - NOAA-GFDL/MOM6@ba5a442 if not allocated, do not assign R_rho - NOAA-GFDL/MOM6@435a741 Close param file before it gets opened by ocean_model_init again. - NOAA-GFDL/MOM6@ab54b96 Merge pull request #140 from alperaltuntas/fix_omp2 - NOAA-GFDL/MOM6@a9c896e set CS%MEKE_equilibrium_restoring, to false by default - NOAA-GFDL/MOM6@3540446 fix unitialized logical var in MOM_MEKE - NOAA-GFDL/MOM6@63cf741 fix kpp omp directives - NOAA-GFDL/MOM6@22f0242 Merge branch 'dev/ncar' of https://github.com/NCAR/MOM6 into dev/ncar - NOAA-GFDL/MOM6@1ed6b94 Merge pull request #139 from gustavo-marques/update_LBD - NOAA-GFDL/MOM6@9db5ba1 Improve documentation and unit tests - NOAA-GFDL/MOM6@0525a4c Change flux limiting calculation - NOAA-GFDL/MOM6@248a87c Fix units description and delete placeholder for the pressure reconstruction - NOAA-GFDL/MOM6@c8361e7 Add a note saying khtr_avg should be computed once khtr is 3D - NOAA-GFDL/MOM6@dce59f4 Fix a bug in the LBD method 2 - NOAA-GFDL/MOM6@5c8b32f Fix a bug when checking if hbl > htot - NOAA-GFDL/MOM6@408bd2f Merge branch 'near_surface_fluxes' of github.com:ashao/MOM6 into near_surface_fluxes - NOAA-GFDL/MOM6@31d2941 Fix bug in boundary_k_range if hbl > htot - NOAA-GFDL/MOM6@4fe0191 Compute tracer tendency due to lateral diffusion - NOAA-GFDL/MOM6@e2bafc5 fix omp directives in MOM_thickness_diffuse - NOAA-GFDL/MOM6@1ae069b Merge branch 'dev/ncar' into near_surface_fluxes - NOAA-GFDL/MOM6@44d36c4 Merge pull request #138 from gustavo-marques/fix_ocean_model_data_get - NOAA-GFDL/MOM6@1d1914f Merge pull request #136 from gustavo-marques/merge-dev-master-candidate-2019-12-17 - NOAA-GFDL/MOM6@0188f35 Merge branch 'dev-master-candidate-2019-12-17' into merge-dev-master-candidate-2019-12-17 - NOAA-GFDL/MOM6@f7debed Delete ocean_model_data_get from MCT and NUOPC caps - NOAA-GFDL/MOM6@a12abd6 Revert "Merge pull request #133 from gustavo-marques/clean_caps" - NOAA-GFDL/MOM6@c7c7bf1 Merge branch 'dev-master-candidate-2019-12-17' into merge-dev-master-candidate-2019-12-17 - NOAA-GFDL/MOM6@c358114 Merge pull request #135 from gustavo-marques/LBD_merge - NOAA-GFDL/MOM6@d276f3f Merge branch 'dev/ncar' into near_surface_fluxes - NOAA-GFDL/MOM6@8a3e3e7 Merge branch 'near_surface_fluxes' into LBD_merge - NOAA-GFDL/MOM6@2cccc83 Merge pull request #134 from gustavo-marques/fix_leith - NOAA-GFDL/MOM6@3d17e03 Merge pull request #133 from gustavo-marques/clean_caps - NOAA-GFDL/MOM6@e538144 remove duplicate fld_list_add calls - NOAA-GFDL/MOM6@2c7de66 Merge pull request #132 from NOAA-EMC/dev/emc - NOAA-GFDL/MOM6@78bb4c1 Delete quotes from doxygen comment - NOAA-GFDL/MOM6@8c95cc0 Fix bugs in Leith add new input parameter - NOAA-GFDL/MOM6@c50a978 Toggle continuous neutral diffusion in interior only - NOAA-GFDL/MOM6@89eaede Delete ocean_model_data_get* from all the caps - NOAA-GFDL/MOM6@20d076b Modify continuous neutral diffusion to account for boundary layer - NOAA-GFDL/MOM6@a2d9636 Merge pull request #131 from gustavo-marques/meke_khtr - NOAA-GFDL/MOM6@cb79e97 add changes from old MOM6 repo in cmeps_integration branch that were (#10) - NOAA-GFDL/MOM6@97d07bc Set the default for CDRAG_MEKE to CDRAG - NOAA-GFDL/MOM6@02c986a Set default value to 0.003 - NOAA-GFDL/MOM6@e71a573 Fix doxygen references - NOAA-GFDL/MOM6@9303e99 Fix typos and bugs - NOAA-GFDL/MOM6@f3dba16 Add new option to avoid negative thicknesses - NOAA-GFDL/MOM6@7135281 Merge pull request #8 from DeniseWorthen/feature/runoff_optional - NOAA-GFDL/MOM6@147f7a3 Merge pull request #130 from DeniseWorthen/feature/runoff_optional - NOAA-GFDL/MOM6@2c6bdf9 Create a separate param for MEKE bottom drag (CDRAG_MEKE) - NOAA-GFDL/MOM6@b66eafe backs out change in standard name for liquid and frozen heat flux since this will require a change in the nuopc field_dictionary. The fields are not currently used. - NOAA-GFDL/MOM6@b1ce184 Documentation and minor improvements - NOAA-GFDL/MOM6@0a89aac Fix registry of lbd diagnostics - NOAA-GFDL/MOM6@6bce8ab Clean the code and fix line length exceeding 120 - NOAA-GFDL/MOM6@7f2b93e Replace lbm to lbd (lateral boundary diffusion) - NOAA-GFDL/MOM6@64be85f minor text changes; uncomment runoff heat flux terms; required change made in feature/runoff_names branch of NEMS - NOAA-GFDL/MOM6@419a021 removes data_override and associated calls from mom_cap renames: iob%rofl_flux => iob%lrunoff iob%rofi_flux => iob%frunoff iob%runoff_hflx = > iob%lrunoff_hflx iob%calving_hflx => iob%frunoff_hflx makes changes in mom_cap_methods and mom_surface_forcing_nuopc consistent w/ new iob names temporarily comments out _hflx terms in mom_cap,mom_cap_methods adds flag in mom_surface_forcing_nuopc for adding liquid river runoff via data_override - NOAA-GFDL/MOM6@ba6140c Merge pull request #1 from NOAA-EMC/dev/emc - NOAA-GFDL/MOM6@9a6f7f6 Merge NOAA-GFDL dev/master from 20191107 - NOAA-GFDL/MOM6@07481e4 updating mom_cap to add data override which was deleted in merge - NOAA-GFDL/MOM6@100e92d Merge remote-tracking branch 'GFDL/dev/master' into testnewdevmaster20191107 - NOAA-GFDL/MOM6@80743e6 Adding river runoff (from Jiande) Squashed commit of the following: - NOAA-GFDL/MOM6@462768b Merge pull request #128 from gustavo-marques/fix_MEKE_GM_src - NOAA-GFDL/MOM6@050aa31 Moves allocation of CS%equilibrium_value inside subroutine MEKE_equilibrium_restoring - NOAA-GFDL/MOM6@3f041d9 MEKE diagnostic array fixes - NOAA-GFDL/MOM6@2bb321e Merge pull request #127 from gustavo-marques/depth_scaled_khth - NOAA-GFDL/MOM6@ebf5ee0 Adds MEKE_equilibrium_restoring - NOAA-GFDL/MOM6@1522ad0 Minor changes in the doxygen comments - NOAA-GFDL/MOM6@223037c Deletes unneeded variables from calc_depth_function - NOAA-GFDL/MOM6@67016eb Reverts description in DO_DYNAMICS to older version as this was changed by mistake. - NOAA-GFDL/MOM6@bb785a8 Adds option to scale KHTH with depth - NOAA-GFDL/MOM6@839217d Rearranged MEKE_EQUILIBRIUM subroutine - NOAA-GFDL/MOM6@486da1d Replaces trunit to conc in the documentation - NOAA-GFDL/MOM6@15c9f06 Hard-code min of SN to be 1.0e-7 - NOAA-GFDL/MOM6@8f3cf96 Add placeholders for adding method3 and applying filter on method1 - NOAA-GFDL/MOM6@5583f84 Renames lateral_boundary_mixing to lateral_boundary_diffusion - NOAA-GFDL/MOM6@69ec18c Removes redundant statement in netrual diffusion - NOAA-GFDL/MOM6@af41095 Fix uninitialized variables in find_surface when NDIFF_INTERIOR_ONLY = False - NOAA-GFDL/MOM6@e806fba Fixes a bug in the bulk_method - NOAA-GFDL/MOM6@d7da982 Improves the calculation of F_bulk to minimize roundoff errors - NOAA-GFDL/MOM6@82c1bca First set of commits to limit neutral diffusion to the interior - NOAA-GFDL/MOM6@3c5c7d1 Merge branch 'rewrite_discontinuous_sort' into near_surface_fluxes - NOAA-GFDL/MOM6@91ca2d1 Fix flux limiter in LBM when < 0 - NOAA-GFDL/MOM6@ca23e66 Make fluxes_bulk_method more roundoff safe - NOAA-GFDL/MOM6@5aaf34b Add flux limiter for bulk layer fluxes - NOAA-GFDL/MOM6@9f15e4f Adds new unit test and fixes diagnostics - NOAA-GFDL/MOM6@c880539 Update LBM flux names and fix posting of 2d diags - NOAA-GFDL/MOM6@bcec94c Merge branch 'dev/ncar' into fix_MEKE_GM_src - NOAA-GFDL/MOM6@bb46c38 Calculates bottomFac2 IF CS%MEKE_GEOMETRIC=True - NOAA-GFDL/MOM6@66a8f0a Fix bug in LBM diagnostics and add diags - NOAA-GFDL/MOM6@a4f9550 Added new equilibrium formula for MEKE - NOAA-GFDL/MOM6@73d0d78 Fixes a bug in method2 of LBM, where diffusivities were not used - NOAA-GFDL/MOM6@4d5c786 Fixes undoxygenized LBM module variables - NOAA-GFDL/MOM6@e5645b1 Fixes line length exceeding 120 - NOAA-GFDL/MOM6@f38a369 Fixes unit test for layer by layer and removes the hbl_min = MIN(hbl_L, hbl_R) - NOAA-GFDL/MOM6@c41b8b0 Adds two unit tests for layer by layer method - NOAA-GFDL/MOM6@6d6d3b8 Adds two unit tests for layer by layer method - NOAA-GFDL/MOM6@3cb68d3 Adds missing arguments after merge - NOAA-GFDL/MOM6@62e3227 Adding layer by layer method for bottom boundary - NOAA-GFDL/MOM6@8d9c6a4 Merge branch 'dev/ncar' into near_surface_fluxes - NOAA-GFDL/MOM6@3bb1f55 Adding first version of LBM method=2 - NOAA-GFDL/MOM6@4d0aed6 Fixes units and moves bulk diags inside if statement - NOAA-GFDL/MOM6@f6800c2 Update halos for hbl in LBM - NOAA-GFDL/MOM6@915bcb1 Diagnostics for lateral boundary mixing scheme - NOAA-GFDL/MOM6@223a815 Merge branch 'near_surface_fluxes' of github.com:ashao/MOM6 into HEAD - NOAA-GFDL/MOM6@322aa77 Rename MOM_boundary_lateral_mixing.F90 for consistency - NOAA-GFDL/MOM6@332a264 Try to restore commits from accidental move of file - NOAA-GFDL/MOM6@e5f96f4 Fix minor bugs in lateral boundary mixing - NOAA-GFDL/MOM6@9b4d2c2 Only allocate KPP_CS if requested - NOAA-GFDL/MOM6@8ab7aa8 Convert diffusive flux convergence to a change in tracer - NOAA-GFDL/MOM6@8a4ed84 Guard against case where the boundary layer is 0 on one column - NOAA-GFDL/MOM6@df938a1 Add masking in lateral_boundary_fluxes - NOAA-GFDL/MOM6@ae6529e Hook lateral boundary mixing into tracer_hor_diff - NOAA-GFDL/MOM6@a4dbeb1 Hook in lateral boundary mixing initialization - NOAA-GFDL/MOM6@2b10a8b Skeleton for boundary layer mixing interfaces - NOAA-GFDL/MOM6@4e63c75 Update API for boundary_layer_fluxes unit tests - NOAA-GFDL/MOM6@79bea68 New unit tests for surface boundary fluxes - NOAA-GFDL/MOM6@f87aaa2 Fixes bulk_average calculation and takes into account partial cells when computing fluxes - NOAA-GFDL/MOM6@a36f5d6 Removes more trailing space - NOAA-GFDL/MOM6@17385cc Removes trailing space and fixes line length exceeded - NOAA-GFDL/MOM6@6677820 Updates layer_fluxes_bulk_method and bulk_average - NOAA-GFDL/MOM6@8385231 Add function and unit tests for boundary layer mixing - NOAA-GFDL/MOM6@654a12c Add additional unit tests for bulk method - NOAA-GFDL/MOM6@576fafb Initial commit for implementing near-surface mixing
marshallward
added a commit
that referenced
this issue
Apr 21, 2020
…ssure - NOAA-GFDL/MOM6@c745c5b14 Merge pull request #1089 from Hallberg-NOAA/rescale_pressure - NOAA-GFDL/MOM6@8cddc685a Merge branch 'dev/gfdl' into rescale_pressure - NOAA-GFDL/MOM6@59d2537ac Merge pull request #1070 from ashao/remap_v_extensive - NOAA-GFDL/MOM6@f5eb17194 Eliminated some US args in MOM_neutral_diffusion - NOAA-GFDL/MOM6@18b21938b Fixed compile time bugs in mom_surface_forcing_mct - NOAA-GFDL/MOM6@37d30b596 Eliminated the use of GV%mks_g_Earth - NOAA-GFDL/MOM6@3a817efe9 Fixed a diagnostic halo extent - NOAA-GFDL/MOM6@e3c434e57 Store return values from EOS_domain - NOAA-GFDL/MOM6@718c3ab1f Removed US argument to find_depth_of_pressure_in_cell - NOAA-GFDL/MOM6@9c5239eaf Corrected MOM_EOS dimensional rescaling problem - NOAA-GFDL/MOM6@f0f894c57 Merge branch 'Adcroft_rescale_pressure' into rescale_pressure - NOAA-GFDL/MOM6@7282956a8 Merge branch 'rescale_pressure' of git://github.com/adcroft/MOM6 into Adcroft_rescale_pressure - NOAA-GFDL/MOM6@cdeda16d3 Switched versions of calculate_density in 22 calls - NOAA-GFDL/MOM6@760dc3960 +Rescaled variables in coord_adapt - NOAA-GFDL/MOM6@9b53927c1 Rescaled internal MOM_CVMix variables - NOAA-GFDL/MOM6@371ed85ca Initialize scaling params without EOS_init() - NOAA-GFDL/MOM6@0caf9ccab Missed a conflict resolution - NOAA-GFDL/MOM6@353f441f9 Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into remap_v_extensive - NOAA-GFDL/MOM6@abecf021e Merge branch 'Hallberg-NOAA-rescale_pressure' into rescale_pressure - NOAA-GFDL/MOM6@4f42d7278 Fixed the spelling in an openMP directive - NOAA-GFDL/MOM6@18d520e3c Remove optional US from most MOM_EOS functions - NOAA-GFDL/MOM6@acf23a413 Use the 'dom=' interface to calculate_density - NOAA-GFDL/MOM6@c309289b6 Add doxygen comments for h_begin in diag_ctrl - NOAA-GFDL/MOM6@415a6bce2 Adds unit conversions to EOS type - NOAA-GFDL/MOM6@ab9d8e95f +Added dom interface to calculate_density - NOAA-GFDL/MOM6@620a97c4d Merge branch 'dev/gfdl' into rescale_pressure - NOAA-GFDL/MOM6@6c0e58b7d Merge pull request #1090 from adcroft/rm-gearth-from-obcs - NOAA-GFDL/MOM6@b4c4f28aa Resolve conflict with NOAA-GFDL/MOM6#1088 - NOAA-GFDL/MOM6@71d1c733e Merge branch 'dev/gfdl' into rm-gearth-from-obcs - NOAA-GFDL/MOM6@e8dba197b Merge branch 'index_rotation' into dev/gfdl - NOAA-GFDL/MOM6@c325f9c1b Removes G_EARTH from OBCs - NOAA-GFDL/MOM6@f632ffc87 Explicit array rotation index; modulo chksum turns - NOAA-GFDL/MOM6@a00c3277f (*)Reordered setting calculate_density loop bounds - NOAA-GFDL/MOM6@77b6b7471 (*)Set loop bounds in calculate_density calls - NOAA-GFDL/MOM6@87054b464 Added an omitted dOxygen comment - NOAA-GFDL/MOM6@ae944c212 Merge branch 'dev/gfdl' into rescale_pressure - NOAA-GFDL/MOM6@da120120c Minor cleanup related to pressure rescaling - NOAA-GFDL/MOM6@b84b2d35f Rescaled variables in convert_thickness - NOAA-GFDL/MOM6@4182ad23c +Add optional US arg to calculate_compress - NOAA-GFDL/MOM6@bb73bb8f3 +(*)Rescaled pressures used to build coordinates - NOAA-GFDL/MOM6@a01dae523 Corrected 3 openMP declarations - NOAA-GFDL/MOM6@608d210a6 Rescaled pressures in wave speed calculations - NOAA-GFDL/MOM6@ad0c70e2a Rescaled three diagnosed densities - NOAA-GFDL/MOM6@030a63681 Nullify a pointer in neutral diffusion unit tests - NOAA-GFDL/MOM6@7643bce4e Simpler calculate_density in ISOMIP_initialization - NOAA-GFDL/MOM6@a7836f0a7 +Rescaled variables in MOM_neutral_diffusion.F90 - NOAA-GFDL/MOM6@b72afce2b +Made arguments to unit_scaling_init optional - NOAA-GFDL/MOM6@22215cb0b Internal field index rotation - NOAA-GFDL/MOM6@04fcfd456 +Rescaled args to find_depth_of_pressure_in_cell - NOAA-GFDL/MOM6@2a951e7b7 Redirected various EOS interfaces to common code - NOAA-GFDL/MOM6@00db8d5fb Corrected a bug in calculate_spec_vol_derivs_H1_1d - NOAA-GFDL/MOM6@500c9e313 Rescaled pressures in 17 calculate_density calls - NOAA-GFDL/MOM6@8df34f4e2 Rescaled internal MOM_diapyc_energy_req variables - NOAA-GFDL/MOM6@1e8c50166 Corrected pressure units in comments - NOAA-GFDL/MOM6@6948cb743 +Replaced optional pres_scale args with US args - NOAA-GFDL/MOM6@fb820c1e7 +Rescaled pressure arguments to multiple routines - NOAA-GFDL/MOM6@3223eb6bd +Rescaled the units of tv%P_Ref to [R L2 T-2] - NOAA-GFDL/MOM6@2fc1c2e5a Use new HI_1d forms of calculate_density calls - NOAA-GFDL/MOM6@ce0905e17 +Add hor_index_type variants of EOS routines - NOAA-GFDL/MOM6@1252e3b82 Pass rescaled pressures to calculate_TFreeze - NOAA-GFDL/MOM6@5e1645878 +Add optional pres_scale arg to calculate_TFreeze - NOAA-GFDL/MOM6@3e9c645d1 Merge pull request #1087 from adcroft/vkernal-tests-to-stdout - NOAA-GFDL/MOM6@3767883f3 Replaced 0,6 with stderr,stdout - NOAA-GFDL/MOM6@916be3c56 Rescaled ice_shelf_CS%g_Earth like GV%g_Earth - NOAA-GFDL/MOM6@30063376c Write test fails to both stderr and stdout - NOAA-GFDL/MOM6@978d772be Moved vkernel unit tests to stdout - NOAA-GFDL/MOM6@20ae74d65 Merge branch 'dev/gfdl' into rescale_pressure - NOAA-GFDL/MOM6@6af725f2b +Rescaled the units of fluxes%p_surf - NOAA-GFDL/MOM6@fc9dfd071 Merge branch 'ESMG-dev/esmg' into dev/gfdl - NOAA-GFDL/MOM6@27e7a1f2d Merge branch 'dev/esmg' of https://github.com/ESMG/MOM6 into ESMG-dev/esmg - NOAA-GFDL/MOM6@7e6443238 Merge branch 'Hallberg-NOAA-fix_iceshelf_problems' into dev/gfdl - NOAA-GFDL/MOM6@6d7dde480 Use combined scaling factors - NOAA-GFDL/MOM6@f9b63f304 +Added RL2_T2_to_Pa element to unit_scale_type - NOAA-GFDL/MOM6@efbbd317b Rescaled pressures in calculate_vertical_integrals - NOAA-GFDL/MOM6@f29e32a44 Rescaled pressure in calc_isoneutral_slopes - NOAA-GFDL/MOM6@94f94ede6 Rescaled pressure in find_eta routines - NOAA-GFDL/MOM6@3b3c34ab9 +Rescaled non-Boussinesq pressure force calcs - NOAA-GFDL/MOM6@7632abe2d +Add optional SV_scale arg to int_specific_vol_dp - NOAA-GFDL/MOM6@63c451005 +Rescaled Boussinesq pressure force calculations - NOAA-GFDL/MOM6@5a56df7d7 +Add optional pres_scale arguments to EOS routines - NOAA-GFDL/MOM6@f75edd93a Added a ramp option for SSH OBCs. - NOAA-GFDL/MOM6@43ebd34bb Removed spaces from a blank line - NOAA-GFDL/MOM6@4693962ce Merge branch 'dev/gfdl' into fix_iceshelf_problems - NOAA-GFDL/MOM6@5ec169e95 Merge branch 'dev/master' into dev/gfdl - NOAA-GFDL/MOM6@bcc3f5ed8 Merge branch 'dev/gfdl' into fix_iceshelf_problems - NOAA-GFDL/MOM6@7cdffb103 (*)Use state%taux_shelf to set state%ustar_shelf - NOAA-GFDL/MOM6@684681b2b +Ice shelf code cleanup - NOAA-GFDL/MOM6@010492e2c Merge branch 'gustavo-marques-dev-master-candidate-ncar-2020-03-27' into dev/master - NOAA-GFDL/MOM6@04d5a83dc (*)Use a blend of ice-shelf and open water fluxes - NOAA-GFDL/MOM6@fcb1e92a1 +Add optional arg to ice_shelf_min_thickness_calve - NOAA-GFDL/MOM6@e87c66427 (*)Removed rescaling from mean_melt_flux to vprec - NOAA-GFDL/MOM6@e88732c3e (*)Do not use Hml>0 as an ice shelf melt filter - NOAA-GFDL/MOM6@1a8c75aa6 (*+)Set ice shelf latent heat consistently - NOAA-GFDL/MOM6@880da8024 (*+)Corrected a bug in setting ustar_shelf - NOAA-GFDL/MOM6@3c3f72167 (*+)Corrected bugs in 3-eqn ice shelf skin salinity - NOAA-GFDL/MOM6@7121619b2 (*)Use global_area_integral in add_shelf_flux - NOAA-GFDL/MOM6@63fd8e1e8 +Added optional arg area to global_area_integral - NOAA-GFDL/MOM6@7fb8f5555 Flipped the sign convention for wT_flux - NOAA-GFDL/MOM6@e73db3840 Merge branch 'dev-master-candidate-ncar-2020-03-27' of https://github.com/gustavo-marques/MOM6 into gustavo-marques-dev-master-candidate-ncar-2020-03-27 - NOAA-GFDL/MOM6@6ce3dd9b7 Change CDRAG_MEKE to MEKE_CDRAG - NOAA-GFDL/MOM6@0cddf1f28 Merge pull request #146 from NCAR/fix_tracer_advect_omp - NOAA-GFDL/MOM6@8025fd4d7 refactor advect_x and advect_y calls - NOAA-GFDL/MOM6@3768a118d make advect_y thread-safe - NOAA-GFDL/MOM6@3d05d8537 make T_adx_2d diagnostics thread-safe - NOAA-GFDL/MOM6@6636e0f43 fix OMP directive variable list - NOAA-GFDL/MOM6@afe033517 Merge pull request #144 from gustavo-marques/merge_GME_outside_MEKE - NOAA-GFDL/MOM6@1f308a02f Extend loop indices and add calls to pass_vector - NOAA-GFDL/MOM6@24782fa85 Move allocation of diagnostic arrays - NOAA-GFDL/MOM6@9a330fab8 Loop over recreation of diagnostic grid explicitly - NOAA-GFDL/MOM6@e23f03c81 Fix compilation errors - NOAA-GFDL/MOM6@3a3a10217 Merge branch 'remap_v_extensive' of github.com:ashao/MOM6 into remap_v_extensive - NOAA-GFDL/MOM6@1ecade5e0 Updates GME by removing dependency on MEKE - NOAA-GFDL/MOM6@46ce21ec7 Store h_extensive for both native and remapped coordinates - NOAA-GFDL/MOM6@c01201978 Merge pull request #143 from gustavo-marques/fix_vhGM_GEOMETRIC - NOAA-GFDL/MOM6@3477bbe45 Revert "Set target diagnostic grid based on boolean" - NOAA-GFDL/MOM6@9abcb1036 Set target diagnostic grid based on boolean - NOAA-GFDL/MOM6@c42982419 Fix a bug in the vmGM field when using GEOMETRIC - NOAA-GFDL/MOM6@0eb06153a Merge pull request #142 from NCAR/omp_fixes - NOAA-GFDL/MOM6@f83292592 initialize fluid entrainment arrays - NOAA-GFDL/MOM6@276c6b4d2 call chksum for drag_vel if its allocated - NOAA-GFDL/MOM6@447806678 uncomment omp do block in advect_tracer - NOAA-GFDL/MOM6@75334543b fix omp in calculate_diagnostic_fields - NOAA-GFDL/MOM6@988f8f2b0 Merge branch 'dev/gfdl' into remap_v_extensive - NOAA-GFDL/MOM6@ed51bcd66 Modify remapping of vertically extensive diagnostics - NOAA-GFDL/MOM6@21918b451 comment out OMP directives in KPP_compute_BLD temporarily - NOAA-GFDL/MOM6@049abb032 fix omp directives in set_viscous_BBL - NOAA-GFDL/MOM6@67e5481df fix omp directive for melt_potential - NOAA-GFDL/MOM6@46b1f34a0 correct namespace name for doxygen - NOAA-GFDL/MOM6@83da0906a Merge pull request #141 from alperaltuntas/fix_gnu_bugs - NOAA-GFDL/MOM6@ba5a44271 if not allocated, do not assign R_rho - NOAA-GFDL/MOM6@435a7412c Close param file before it gets opened by ocean_model_init again. - NOAA-GFDL/MOM6@ab54b961c Merge pull request #140 from alperaltuntas/fix_omp2 - NOAA-GFDL/MOM6@a9c896e65 set CS%MEKE_equilibrium_restoring, to false by default - NOAA-GFDL/MOM6@3540446d5 fix unitialized logical var in MOM_MEKE - NOAA-GFDL/MOM6@63cf741f4 fix kpp omp directives - NOAA-GFDL/MOM6@22f0242e7 Merge branch 'dev/ncar' of https://github.com/NCAR/MOM6 into dev/ncar - NOAA-GFDL/MOM6@1ed6b9462 Merge pull request #139 from gustavo-marques/update_LBD - NOAA-GFDL/MOM6@9db5ba14a Improve documentation and unit tests - NOAA-GFDL/MOM6@0525a4c10 Change flux limiting calculation - NOAA-GFDL/MOM6@248a87ca4 Fix units description and delete placeholder for the pressure reconstruction - NOAA-GFDL/MOM6@c8361e799 Add a note saying khtr_avg should be computed once khtr is 3D - NOAA-GFDL/MOM6@dce59f430 Fix a bug in the LBD method 2 - NOAA-GFDL/MOM6@5c8b32fb1 Fix a bug when checking if hbl > htot - NOAA-GFDL/MOM6@408bd2f63 Merge branch 'near_surface_fluxes' of github.com:ashao/MOM6 into near_surface_fluxes - NOAA-GFDL/MOM6@31d2941d0 Fix bug in boundary_k_range if hbl > htot - NOAA-GFDL/MOM6@4fe019156 Compute tracer tendency due to lateral diffusion - NOAA-GFDL/MOM6@e2bafc51c fix omp directives in MOM_thickness_diffuse - NOAA-GFDL/MOM6@1ae069b37 Merge branch 'dev/ncar' into near_surface_fluxes - NOAA-GFDL/MOM6@44d36c4a2 Merge pull request #138 from gustavo-marques/fix_ocean_model_data_get - NOAA-GFDL/MOM6@1d1914ff9 Merge pull request #136 from gustavo-marques/merge-dev-master-candidate-2019-12-17 - NOAA-GFDL/MOM6@0188f3507 Merge branch 'dev-master-candidate-2019-12-17' into merge-dev-master-candidate-2019-12-17 - NOAA-GFDL/MOM6@f7debedda Delete ocean_model_data_get from MCT and NUOPC caps - NOAA-GFDL/MOM6@a12abd6db Revert "Merge pull request #133 from gustavo-marques/clean_caps" - NOAA-GFDL/MOM6@c7c7bf184 Merge branch 'dev-master-candidate-2019-12-17' into merge-dev-master-candidate-2019-12-17 - NOAA-GFDL/MOM6@c3581144d Merge pull request #135 from gustavo-marques/LBD_merge - NOAA-GFDL/MOM6@d276f3f84 Merge branch 'dev/ncar' into near_surface_fluxes - NOAA-GFDL/MOM6@8a3e3e7e4 Merge branch 'near_surface_fluxes' into LBD_merge - NOAA-GFDL/MOM6@2cccc837a Merge pull request #134 from gustavo-marques/fix_leith - NOAA-GFDL/MOM6@3d17e0390 Merge pull request #133 from gustavo-marques/clean_caps - NOAA-GFDL/MOM6@e53814498 remove duplicate fld_list_add calls - NOAA-GFDL/MOM6@2c7de6631 Merge pull request #132 from NOAA-EMC/dev/emc - NOAA-GFDL/MOM6@78bb4c14c Delete quotes from doxygen comment - NOAA-GFDL/MOM6@8c95cc061 Fix bugs in Leith add new input parameter - NOAA-GFDL/MOM6@c50a97891 Toggle continuous neutral diffusion in interior only - NOAA-GFDL/MOM6@89eaede6c Delete ocean_model_data_get* from all the caps - NOAA-GFDL/MOM6@20d076b4d Modify continuous neutral diffusion to account for boundary layer - NOAA-GFDL/MOM6@a2d9636e2 Merge pull request #131 from gustavo-marques/meke_khtr - NOAA-GFDL/MOM6@cb79e977f add changes from old MOM6 repo in cmeps_integration branch that were (#10) - NOAA-GFDL/MOM6@97d07bcb4 Set the default for CDRAG_MEKE to CDRAG - NOAA-GFDL/MOM6@02c986a77 Set default value to 0.003 - NOAA-GFDL/MOM6@e71a5736a Fix doxygen references - NOAA-GFDL/MOM6@9303e9946 Fix typos and bugs - NOAA-GFDL/MOM6@f3dba1609 Add new option to avoid negative thicknesses - NOAA-GFDL/MOM6@7135281fb Merge pull request #8 from DeniseWorthen/feature/runoff_optional - NOAA-GFDL/MOM6@147f7a382 Merge pull request #130 from DeniseWorthen/feature/runoff_optional - NOAA-GFDL/MOM6@2c6bdf925 Create a separate param for MEKE bottom drag (CDRAG_MEKE) - NOAA-GFDL/MOM6@b66eafe4e backs out change in standard name for liquid and frozen heat flux since this will require a change in the nuopc field_dictionary. The fields are not currently used. - NOAA-GFDL/MOM6@b1ce184a3 Documentation and minor improvements - NOAA-GFDL/MOM6@0a89aaca9 Fix registry of lbd diagnostics - NOAA-GFDL/MOM6@6bce8ab9e Clean the code and fix line length exceeding 120 - NOAA-GFDL/MOM6@7f2b93e4c Replace lbm to lbd (lateral boundary diffusion) - NOAA-GFDL/MOM6@64be85f76 minor text changes; uncomment runoff heat flux terms; required change made in feature/runoff_names branch of NEMS - NOAA-GFDL/MOM6@419a021d9 removes data_override and associated calls from mom_cap renames: iob%rofl_flux => iob%lrunoff iob%rofi_flux => iob%frunoff iob%runoff_hflx = > iob%lrunoff_hflx iob%calving_hflx => iob%frunoff_hflx makes changes in mom_cap_methods and mom_surface_forcing_nuopc consistent w/ new iob names temporarily comments out _hflx terms in mom_cap,mom_cap_methods adds flag in mom_surface_forcing_nuopc for adding liquid river runoff via data_override - NOAA-GFDL/MOM6@ba6140c33 Merge pull request #1 from NOAA-EMC/dev/emc - NOAA-GFDL/MOM6@9a6f7f65e Merge NOAA-GFDL dev/master from 20191107 - NOAA-GFDL/MOM6@07481e41d updating mom_cap to add data override which was deleted in merge - NOAA-GFDL/MOM6@100e92db5 Merge remote-tracking branch 'GFDL/dev/master' into testnewdevmaster20191107 - NOAA-GFDL/MOM6@80743e6cb Adding river runoff (from Jiande) Squashed commit of the following: - NOAA-GFDL/MOM6@462768be6 Merge pull request #128 from gustavo-marques/fix_MEKE_GM_src - NOAA-GFDL/MOM6@050aa31b3 Moves allocation of CS%equilibrium_value inside subroutine MEKE_equilibrium_restoring - NOAA-GFDL/MOM6@3f041d93f MEKE diagnostic array fixes - NOAA-GFDL/MOM6@2bb321efb Merge pull request #127 from gustavo-marques/depth_scaled_khth - NOAA-GFDL/MOM6@ebf5ee0d3 Adds MEKE_equilibrium_restoring - NOAA-GFDL/MOM6@1522ad0d7 Minor changes in the doxygen comments - NOAA-GFDL/MOM6@223037c76 Deletes unneeded variables from calc_depth_function - NOAA-GFDL/MOM6@67016eba9 Reverts description in DO_DYNAMICS to older version as this was changed by mistake. - NOAA-GFDL/MOM6@bb785a8e0 Adds option to scale KHTH with depth - NOAA-GFDL/MOM6@839217d9d Rearranged MEKE_EQUILIBRIUM subroutine - NOAA-GFDL/MOM6@486da1dfc Replaces trunit to conc in the documentation - NOAA-GFDL/MOM6@15c9f0646 Hard-code min of SN to be 1.0e-7 - NOAA-GFDL/MOM6@8f3cf968d Add placeholders for adding method3 and applying filter on method1 - NOAA-GFDL/MOM6@5583f84db Renames lateral_boundary_mixing to lateral_boundary_diffusion - NOAA-GFDL/MOM6@69ec18c3a Removes redundant statement in netrual diffusion - NOAA-GFDL/MOM6@af410950e Fix uninitialized variables in find_surface when NDIFF_INTERIOR_ONLY = False - NOAA-GFDL/MOM6@e806fbabd Fixes a bug in the bulk_method - NOAA-GFDL/MOM6@d7da98270 Improves the calculation of F_bulk to minimize roundoff errors - NOAA-GFDL/MOM6@82c1bca13 First set of commits to limit neutral diffusion to the interior - NOAA-GFDL/MOM6@3c5c7d181 Merge branch 'rewrite_discontinuous_sort' into near_surface_fluxes - NOAA-GFDL/MOM6@91ca2d13e Fix flux limiter in LBM when < 0 - NOAA-GFDL/MOM6@ca23e661b Make fluxes_bulk_method more roundoff safe - NOAA-GFDL/MOM6@5aaf34b7f Add flux limiter for bulk layer fluxes - NOAA-GFDL/MOM6@9f15e4f7a Adds new unit test and fixes diagnostics - NOAA-GFDL/MOM6@c8805391f Update LBM flux names and fix posting of 2d diags - NOAA-GFDL/MOM6@bcec94ce2 Merge branch 'dev/ncar' into fix_MEKE_GM_src - NOAA-GFDL/MOM6@bb46c38d8 Calculates bottomFac2 IF CS%MEKE_GEOMETRIC=True - NOAA-GFDL/MOM6@66a8f0afb Fix bug in LBM diagnostics and add diags - NOAA-GFDL/MOM6@a4f9550f9 Added new equilibrium formula for MEKE - NOAA-GFDL/MOM6@73d0d7895 Fixes a bug in method2 of LBM, where diffusivities were not used - NOAA-GFDL/MOM6@4d5c7862f Fixes undoxygenized LBM module variables - NOAA-GFDL/MOM6@e5645b14c Fixes line length exceeding 120 - NOAA-GFDL/MOM6@f38a36972 Fixes unit test for layer by layer and removes the hbl_min = MIN(hbl_L, hbl_R) - NOAA-GFDL/MOM6@c41b8b0c7 Adds two unit tests for layer by layer method - NOAA-GFDL/MOM6@6d6d3b8a4 Adds two unit tests for layer by layer method - NOAA-GFDL/MOM6@3cb68d348 Adds missing arguments after merge - NOAA-GFDL/MOM6@62e322735 Adding layer by layer method for bottom boundary - NOAA-GFDL/MOM6@8d9c6a430 Merge branch 'dev/ncar' into near_surface_fluxes - NOAA-GFDL/MOM6@3bb1f5561 Adding first version of LBM method=2 - NOAA-GFDL/MOM6@4d0aed6b2 Fixes units and moves bulk diags inside if statement - NOAA-GFDL/MOM6@f6800c2bc Update halos for hbl in LBM - NOAA-GFDL/MOM6@915bcb19f Diagnostics for lateral boundary mixing scheme - NOAA-GFDL/MOM6@223a815a2 Merge branch 'near_surface_fluxes' of github.com:ashao/MOM6 into HEAD - NOAA-GFDL/MOM6@322aa77b8 Rename MOM_boundary_lateral_mixing.F90 for consistency - NOAA-GFDL/MOM6@332a2648d Try to restore commits from accidental move of file - NOAA-GFDL/MOM6@e5f96f424 Fix minor bugs in lateral boundary mixing - NOAA-GFDL/MOM6@9b4d2c2bb Only allocate KPP_CS if requested - NOAA-GFDL/MOM6@8ab7aa8ef Convert diffusive flux convergence to a change in tracer - NOAA-GFDL/MOM6@8a4ed840d Guard against case where the boundary layer is 0 on one column - NOAA-GFDL/MOM6@df938a1bb Add masking in lateral_boundary_fluxes - NOAA-GFDL/MOM6@ae6529ea8 Hook lateral boundary mixing into tracer_hor_diff - NOAA-GFDL/MOM6@a4dbeb158 Hook in lateral boundary mixing initialization - NOAA-GFDL/MOM6@2b10a8bbc Skeleton for boundary layer mixing interfaces - NOAA-GFDL/MOM6@4e63c751c Update API for boundary_layer_fluxes unit tests - NOAA-GFDL/MOM6@79bea6876 New unit tests for surface boundary fluxes - NOAA-GFDL/MOM6@f87aaa22b Fixes bulk_average calculation and takes into account partial cells when computing fluxes - NOAA-GFDL/MOM6@a36f5d64c Removes more trailing space - NOAA-GFDL/MOM6@17385cc86 Removes trailing space and fixes line length exceeded - NOAA-GFDL/MOM6@667782043 Updates layer_fluxes_bulk_method and bulk_average - NOAA-GFDL/MOM6@838523136 Add function and unit tests for boundary layer mixing - NOAA-GFDL/MOM6@654a12c60 Add additional unit tests for bulk method - NOAA-GFDL/MOM6@576fafbf2 Initial commit for implementing near-surface mixing
marshallward
added a commit
that referenced
this issue
Mar 8, 2021
- NOAA-GFDL/MOM6@a4049e784 Merge branch 'dev/gfdl' into main - NOAA-GFDL/MOM6@4e05839b1 Merge pull request #1342 from NOAA-GFDL/gfdl-fms2 - NOAA-GFDL/MOM6@e7a80bcf7 Merge pull request #1345 from hmkhatri/add_diagnostic - NOAA-GFDL/MOM6@075be64b5 Typo correction - Change from Jsd to JsdB in array allocations - NOAA-GFDL/MOM6@ba7bbabf4 Typo corrected - Change from Jsd to JsdB in array allocations - NOAA-GFDL/MOM6@b57431d48 Merge pull request #1343 from hmkhatri/add_diagnostic - NOAA-GFDL/MOM6@fbf0e912c Merge branch 'dev/gfdl' into add_diagnostic - NOAA-GFDL/MOM6@a5452744d Merge pull request #1340 from herrwang0/fix-vel_underflow-missingline - NOAA-GFDL/MOM6@b895f1e3a Changed to stack arrays - NOAA-GFDL/MOM6@e52eabf09 Change to stack arrays for 2D diagnostics - NOAA-GFDL/MOM6@7ed57b019 H_to_m - NOAA-GFDL/MOM6@2165ebb6f dimen. - NOAA-GFDL/MOM6@2c4137b24 dimensions - NOAA-GFDL/MOM6@77d44cbb2 Dimensional consistency test - NOAA-GFDL/MOM6@e0bda290d Merge pull request #1341 from adcroft/Hallberg-NOAA-gfdl-fms2 - NOAA-GFDL/MOM6@d2ec275c1 Merge pull request #10 from marshallward/hallberg-fms2-acfix - NOAA-GFDL/MOM6@3b8cc9cf3 Testing: Target uses local autoconf - NOAA-GFDL/MOM6@8f0748c11 Merge pull request #9 from marshallward/hallberg-fms2-acfix - NOAA-GFDL/MOM6@efb3612aa Remove AC_CHECK_FILE for legacy MOM_memory.h - NOAA-GFDL/MOM6@95ed51faf Correct path to FMS_cap in gnu:ice-ocean-nolibs job - NOAA-GFDL/MOM6@c0ddee004 Update build scripts for new dir structure - NOAA-GFDL/MOM6@5f827ed1d typo correction - NOAA-GFDL/MOM6@73addc4c2 Depth-integrated momentum budget diagnostics - NOAA-GFDL/MOM6@0393546f7 Depth-integrated momentum budget diagnostics - NOAA-GFDL/MOM6@fb882c9a2 Fix a missing line to reset vbt if smaller than vel_underflow in MOM_barotropic - NOAA-GFDL/MOM6@0d22f32b7 +MOM6/docs reflects the new directory structure - NOAA-GFDL/MOM6@f06669efa Merge pull request #1329 from herrwang0/fix-wavedrag-initRayleigh - NOAA-GFDL/MOM6@6e49a91fd +New config_src directory structure - NOAA-GFDL/MOM6@ac886457c Merge branch 'dev/gfdl' into fix-wavedrag-initRayleigh - NOAA-GFDL/MOM6@d8733fed2 Merge pull request #1337 from NOAA-GFDL/main - NOAA-GFDL/MOM6@9544de2de Remove blank line spaces - NOAA-GFDL/MOM6@a0b296e45 Remove the trailing space - NOAA-GFDL/MOM6@42eb7c7df 1. Initialize Rayleigh_[uv] to separate loops 2. Split the loop that addes Rayleigh drag term to [uv]_accel_bt, so that the if-block is now outside the loop - NOAA-GFDL/MOM6@8912b1340 Fix the bug that Rayleigh_[uv] was not initialized in MOM_barotropic
adcroft
pushed a commit
that referenced
this issue
Mar 8, 2021
- NOAA-GFDL/MOM6@4e05839b1 Merge pull request #1342 from NOAA-GFDL/gfdl-fms2 - NOAA-GFDL/MOM6@e7a80bcf7 Merge pull request #1345 from hmkhatri/add_diagnostic - NOAA-GFDL/MOM6@075be64b5 Typo correction - Change from Jsd to JsdB in array allocations - NOAA-GFDL/MOM6@ba7bbabf4 Typo corrected - Change from Jsd to JsdB in array allocations - NOAA-GFDL/MOM6@b57431d48 Merge pull request #1343 from hmkhatri/add_diagnostic - NOAA-GFDL/MOM6@fbf0e912c Merge branch 'dev/gfdl' into add_diagnostic - NOAA-GFDL/MOM6@a5452744d Merge pull request #1340 from herrwang0/fix-vel_underflow-missingline - NOAA-GFDL/MOM6@b895f1e3a Changed to stack arrays - NOAA-GFDL/MOM6@e52eabf09 Change to stack arrays for 2D diagnostics - NOAA-GFDL/MOM6@7ed57b019 H_to_m - NOAA-GFDL/MOM6@2165ebb6f dimen. - NOAA-GFDL/MOM6@2c4137b24 dimensions - NOAA-GFDL/MOM6@77d44cbb2 Dimensional consistency test - NOAA-GFDL/MOM6@e0bda290d Merge pull request #1341 from adcroft/Hallberg-NOAA-gfdl-fms2 - NOAA-GFDL/MOM6@d2ec275c1 Merge pull request #10 from marshallward/hallberg-fms2-acfix - NOAA-GFDL/MOM6@3b8cc9cf3 Testing: Target uses local autoconf - NOAA-GFDL/MOM6@8f0748c11 Merge pull request #9 from marshallward/hallberg-fms2-acfix - NOAA-GFDL/MOM6@efb3612aa Remove AC_CHECK_FILE for legacy MOM_memory.h - NOAA-GFDL/MOM6@95ed51faf Correct path to FMS_cap in gnu:ice-ocean-nolibs job - NOAA-GFDL/MOM6@c0ddee004 Update build scripts for new dir structure - NOAA-GFDL/MOM6@5f827ed1d typo correction - NOAA-GFDL/MOM6@73addc4c2 Depth-integrated momentum budget diagnostics - NOAA-GFDL/MOM6@0393546f7 Depth-integrated momentum budget diagnostics - NOAA-GFDL/MOM6@fb882c9a2 Fix a missing line to reset vbt if smaller than vel_underflow in MOM_barotropic - NOAA-GFDL/MOM6@0d22f32b7 +MOM6/docs reflects the new directory structure - NOAA-GFDL/MOM6@f06669efa Merge pull request #1329 from herrwang0/fix-wavedrag-initRayleigh - NOAA-GFDL/MOM6@6e49a91fd +New config_src directory structure - NOAA-GFDL/MOM6@ac886457c Merge branch 'dev/gfdl' into fix-wavedrag-initRayleigh - NOAA-GFDL/MOM6@d8733fed2 Merge pull request #1337 from NOAA-GFDL/main - NOAA-GFDL/MOM6@9544de2de Remove blank line spaces - NOAA-GFDL/MOM6@a0b296e45 Remove the trailing space - NOAA-GFDL/MOM6@42eb7c7df 1. Initialize Rayleigh_[uv] to separate loops 2. Split the loop that addes Rayleigh drag term to [uv]_accel_bt, so that the if-block is now outside the loop - NOAA-GFDL/MOM6@8912b1340 Fix the bug that Rayleigh_[uv] was not initialized in MOM_barotropic
adcroft
added a commit
that referenced
this issue
Mar 12, 2021
- Merge from main for both MMOM6-examples and MOM6 - NOAA-GFDL/MOM6@56e914753 Merge pull request #1349 from marshallward/merge_from_main - NOAA-GFDL/MOM6@887c7af0d Merge branch 'main' into merge_from_main - NOAA-GFDL/MOM6@1b05969fe Merge pull request #1348 from herrwang0/fix-ocean_solo-res-dir - NOAA-GFDL/MOM6@5b293ef68 Merge branch 'dev/gfdl' into fix-ocean_solo-res-dir - NOAA-GFDL/MOM6@54033aab4 Bugfix: empty restart_input_dir for *_solo.res This commit fixes the issue that dirs%restart_input_dir is not initiated before "ocean_solo.res" and "ice_solo.res" are read. - NOAA-GFDL/MOM6@4e05839b1 Merge pull request #1342 from NOAA-GFDL/gfdl-fms2 - NOAA-GFDL/MOM6@e7a80bcf7 Merge pull request #1345 from hmkhatri/add_diagnostic - NOAA-GFDL/MOM6@075be64b5 Typo correction - Change from Jsd to JsdB in array allocations - NOAA-GFDL/MOM6@ba7bbabf4 Typo corrected - Change from Jsd to JsdB in array allocations - NOAA-GFDL/MOM6@e0bda290d Merge pull request #1341 from adcroft/Hallberg-NOAA-gfdl-fms2 - NOAA-GFDL/MOM6@d2ec275c1 Merge pull request #10 from marshallward/hallberg-fms2-acfix - NOAA-GFDL/MOM6@3b8cc9cf3 Testing: Target uses local autoconf - NOAA-GFDL/MOM6@8f0748c11 Merge pull request #9 from marshallward/hallberg-fms2-acfix - NOAA-GFDL/MOM6@efb3612aa Remove AC_CHECK_FILE for legacy MOM_memory.h - NOAA-GFDL/MOM6@95ed51faf Correct path to FMS_cap in gnu:ice-ocean-nolibs job - NOAA-GFDL/MOM6@c0ddee004 Update build scripts for new dir structure - NOAA-GFDL/MOM6@0d22f32b7 +MOM6/docs reflects the new directory structure - NOAA-GFDL/MOM6@6e49a91fd +New config_src directory structure
marshallward
added a commit
that referenced
this issue
Mar 26, 2021
- 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 issue
Apr 14, 2021
- 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
The text was updated successfully, but these errors were encountered: