Fix GFDL python module problem #86
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adcroft
added a commit
that referenced
this pull request
Feb 7, 2019
…/master - PR from NCAR - Also updates global_ALE/*/available_diags.000000 Changes: - NOAA-GFDL/MOM6@f9c260d Merge branch 'gustavo-marques-sync_dev_master_19Dec18' into dev/master - NOAA-GFDL/MOM6@fb27736 Fixed line lengths >120 - NOAA-GFDL/MOM6@7e76893 Proper syntax is overrated. Fix more of them. - NOAA-GFDL/MOM6@c9c88de Fix more syntax errors - NOAA-GFDL/MOM6@e67fdaf Fix syntax errors - NOAA-GFDL/MOM6@ddb73dc Rename meltw to seaice_melt and melth to seaice_melt_heat - NOAA-GFDL/MOM6@aaed093 Merge branch 'dev/master' into sync_dev_master_19Dec18 - NOAA-GFDL/MOM6@a68376b Merge pull request #88 from gustavo-marques/vectors_rotation__mct - NOAA-GFDL/MOM6@10fb249 Rotate fields from different coordinates - NOAA-GFDL/MOM6@c7121e5 Merge pull request #87 from gustavo-marques/update_mct_fluxes - NOAA-GFDL/MOM6@4b81577 Fix indices bug in ocn_import - NOAA-GFDL/MOM6@08145fe Merge branch 'dev/ncar' into update_mct_fluxes - NOAA-GFDL/MOM6@dd6cb7f Merge pull request #86 from gustavo-marques/bug_fix_convert_IOB_to_forces - NOAA-GFDL/MOM6@88fd8c6 Change end do to enddo - NOAA-GFDL/MOM6@acc2ef5 Move pointer assignment outside of the loop - NOAA-GFDL/MOM6@a910cd0 Adds meltw into net_mass_src - NOAA-GFDL/MOM6@c284cdd Adds meltw and melth into FW_in and heat_in, respectively - NOAA-GFDL/MOM6@07b8936 Merge branch 'dev/ncar' into update_mct_fluxes - NOAA-GFDL/MOM6@24cdc5c Add heat_content_meltw - NOAA-GFDL/MOM6@ca03196 Merge pull request #84 from gustavo-marques/merge-dev-master-candidate-2018-10-15 - NOAA-GFDL/MOM6@3cd18ca Sets CS%ignore_fluxes_over_land = .false. when ePBL is not used - NOAA-GFDL/MOM6@622d19e Delete comment on whether meltw is needed in PRmE - NOAA-GFDL/MOM6@cd2648d Take meltw into account when adjust_net_fresh_water_to_zero=true - NOAA-GFDL/MOM6@9ede781 Merge branch 'dev-master-candidate-2018-10-15' into merge-dev-master-candidate-2018-10-15 - NOAA-GFDL/MOM6@f44b215 Merge branch 'dev-master-candidate-2018-10-15' into merge-dev-master-candidate-2018-10-15 - NOAA-GFDL/MOM6@7194593 Re-introduces salt_flux contribution into net_FW - NOAA-GFDL/MOM6@6acc499 Ignores volume flux of sea ice via reverse engineering - NOAA-GFDL/MOM6@9b0af26 Adds meltw and melth into fluxes - NOAA-GFDL/MOM6@d581094 Updates MCT doxygen after adding meltw and melth - NOAA-GFDL/MOM6@918f218 Adds meltw (water flux from seaice and snow) - NOAA-GFDL/MOM6@67e70c5 Add more complete description of Fioi_meltw - NOAA-GFDL/MOM6@70779e6 Deletes TODO comments. Signs are correct. - NOAA-GFDL/MOM6@e495d0c Add heat flux term deu to melt/freeze of sea ice - NOAA-GFDL/MOM6@a3dbe02 Merge pull request #81 from gustavo-marques/fix_salt_flux - NOAA-GFDL/MOM6@a2e9c1e Merge branch 'dev/ncar' into fix_salt_flux - NOAA-GFDL/MOM6@48582eb Merge pull request #82 from NOAA-GFDL/dev/master - NOAA-GFDL/MOM6@6f12f84 Adds a missing parameter and fixes a bug
adcroft
added a commit
that referenced
this pull request
Feb 7, 2019
Resovled conflicts: - ocean_only/global_ALE/layer/available_diags.000000 - ocean_only/global_ALE/z/available_diags.000000 MOM6 commits inside merge of dev/master to dev/gfdl: - NOAA-GFDL/MOM6@6dd6f52 Merge branch 'dev/master' into dev/gfdl - NOAA-GFDL/MOM6@f9c260d Merge branch 'gustavo-marques-sync_dev_master_19Dec18' into dev/master - NOAA-GFDL/MOM6@fb27736 Fixed line lengths >120 - NOAA-GFDL/MOM6@c401055 Merge pull request #886 from Hallberg-NOAA/unit_rescale_comments - NOAA-GFDL/MOM6@7e76893 Proper syntax is overrated. Fix more of them. - NOAA-GFDL/MOM6@c9c88de Fix more syntax errors - NOAA-GFDL/MOM6@e67fdaf Fix syntax errors - NOAA-GFDL/MOM6@ddb73dc Rename meltw to seaice_melt and melth to seaice_melt_heat - NOAA-GFDL/MOM6@06631bd Documented 93 thermodynamic variable units - NOAA-GFDL/MOM6@dea748a Documented 170 variable units - NOAA-GFDL/MOM6@ea5c097 Documented 116 tracer variable units - NOAA-GFDL/MOM6@bf1fa4b Documented 288 parameterization variable units - NOAA-GFDL/MOM6@c2473a7 Documented 300 miscellaneous variable units - NOAA-GFDL/MOM6@026f7d8 Documented units of 50 grid variables - NOAA-GFDL/MOM6@00b3289 Documented units of 110 core variables - NOAA-GFDL/MOM6@3d0c946 Documented units of 280 more variables - NOAA-GFDL/MOM6@e0c3d49 Documented temperature variable units - NOAA-GFDL/MOM6@6976ac6 Documented density variable units - NOAA-GFDL/MOM6@78e9659 Documented miscellaneous variable units - NOAA-GFDL/MOM6@00a8cdc dOxyGenize ice_solo_driver/MOM_surface_forcing.F90 - NOAA-GFDL/MOM6@17c4608 Document frequency units with square brackets - NOAA-GFDL/MOM6@dd34d00 Document velocity units with square brackets - NOAA-GFDL/MOM6@23eea80 Document more variable units with square brackets - NOAA-GFDL/MOM6@e424e0b Document additional thickness variable units - NOAA-GFDL/MOM6@9df0655 Use square-brackets in thickness documentation - NOAA-GFDL/MOM6@aaed093 Merge branch 'dev/master' into sync_dev_master_19Dec18 - NOAA-GFDL/MOM6@ad18eaf Use square-brackets in height documentation - NOAA-GFDL/MOM6@7dab975 Updated comments explaining the '~>' notation - NOAA-GFDL/MOM6@0e2066d Use square-bracket syntax in unit documentation - NOAA-GFDL/MOM6@a68376b Merge pull request #88 from gustavo-marques/vectors_rotation__mct - NOAA-GFDL/MOM6@10fb249 Rotate fields from different coordinates - NOAA-GFDL/MOM6@c2d6ff1 Further reduced use of square brackets in comments - NOAA-GFDL/MOM6@53f947c Reduced use of square brackets in comments - NOAA-GFDL/MOM6@c7121e5 Merge pull request #87 from gustavo-marques/update_mct_fluxes - NOAA-GFDL/MOM6@80b7ba9 Extended comments to clarify H units - NOAA-GFDL/MOM6@f8ee1e6 Renamed internal variables in EF4 - NOAA-GFDL/MOM6@83b410d Added comments explaining the '~>' notation - NOAA-GFDL/MOM6@4b81577 Fix indices bug in ocn_import - NOAA-GFDL/MOM6@08145fe Merge branch 'dev/ncar' into update_mct_fluxes - NOAA-GFDL/MOM6@dd6cb7f Merge pull request #86 from gustavo-marques/bug_fix_convert_IOB_to_forces - NOAA-GFDL/MOM6@88fd8c6 Change end do to enddo - NOAA-GFDL/MOM6@acc2ef5 Move pointer assignment outside of the loop - NOAA-GFDL/MOM6@a910cd0 Adds meltw into net_mass_src - NOAA-GFDL/MOM6@c284cdd Adds meltw and melth into FW_in and heat_in, respectively - NOAA-GFDL/MOM6@62709d7 Extended comments to clarify Z units - NOAA-GFDL/MOM6@47a3574 Merge pull request #885 from nikizadehgfdl/nikizadehgfdl/fix_compile_generics - NOAA-GFDL/MOM6@16d0745 This update fixes compilation issues of ESM - NOAA-GFDL/MOM6@28a83f1 Merge branch 'Hallberg-NOAA-rescale_topography' into dev/gfdl - NOAA-GFDL/MOM6@27e3a1d Merge branch 'rescale_topography' of https://github.com/Hallberg-NOAA/MOM6 into Hallberg-NOAA-rescale_topography - NOAA-GFDL/MOM6@378eb63 Merge branch 'Hallberg-NOAA-eliminate_Zd_to_m' into dev/gfdl - NOAA-GFDL/MOM6@50d1aeb Merge branch 'eliminate_Zd_to_m' of https://github.com/Hallberg-NOAA/MOM6 into Hallberg-NOAA-eliminate_Zd_to_m - NOAA-GFDL/MOM6@2925a58 Merge branch 'MFJansen-dev/gfdl' into dev/gfdl - NOAA-GFDL/MOM6@07b8936 Merge branch 'dev/ncar' into update_mct_fluxes - NOAA-GFDL/MOM6@24cdc5c Add heat_content_meltw - NOAA-GFDL/MOM6@5e5e315 Adds random noise option for Neverland IC - NOAA-GFDL/MOM6@45a6400 Added run-time parameter for Neverland perturbation - NOAA-GFDL/MOM6@de69ac0 Merge branch 'dev/gfdl' of https://github.com/MFJansen/MOM6 into MFJansen-dev/gfdl - NOAA-GFDL/MOM6@604a716 Rescale topography during initialization - NOAA-GFDL/MOM6@bc808be +Rescale topography in MOM_shared_initialization - NOAA-GFDL/MOM6@74014e7 Better comments in initialize_topography routines - NOAA-GFDL/MOM6@c9517fe +Rescale depth in USER_initialize_topography - NOAA-GFDL/MOM6@8560c62 +Rescale depth in shelfwave_initialize_topography - NOAA-GFDL/MOM6@c40b482 +Rescale depth in benchmark_initialize_topography - NOAA-GFDL/MOM6@e543439 +Rescale depth in Phillips_initialize_topography - NOAA-GFDL/MOM6@f272edc +Rescale depth in Kelvin_initialize_topography - NOAA-GFDL/MOM6@771e44f +Rescale depth in ISOMIP_initialize_topography - NOAA-GFDL/MOM6@a1653f6 +Rescale depth in DOME_initialize_topography - NOAA-GFDL/MOM6@f909e93 Merge branch 'dev/gfdl' into eliminate_Zd_to_m - NOAA-GFDL/MOM6@7f73764 +Recast ustar_gustless into Z/s - NOAA-GFDL/MOM6@5810cf0 Recast internal MOM_barotropic variables into Z - NOAA-GFDL/MOM6@fac1464 +Eliminated Zd_to_m from grid types - NOAA-GFDL/MOM6@3d4c891 +Add optional unit_scale_type arg to initialize_masks - NOAA-GFDL/MOM6@6c47801 +Add unit_scale_type arg to MOM_sum_output_init - NOAA-GFDL/MOM6@366efc8 +Add unit_scale_type arg to MOM_initialize_fixed - NOAA-GFDL/MOM6@d2bfd73 +Add unit_scale_type argument to diag_remap_update - NOAA-GFDL/MOM6@47909a1 Added perturbations to initial layer thicknesses in Neverland - NOAA-GFDL/MOM6@9ac67cc +Add unit_scale_type argument to tracer_Z_init - NOAA-GFDL/MOM6@967e470 +Rescaled variables in MOM_tidal_mixing - NOAA-GFDL/MOM6@375bab5 +Rescaled variables in MOM_internal_tides - NOAA-GFDL/MOM6@dcdc509 +Add US arg to set_up_ALE_sponge_vel_field_varying - NOAA-GFDL/MOM6@ca03196 Merge pull request #84 from gustavo-marques/merge-dev-master-candidate-2018-10-15 - NOAA-GFDL/MOM6@3cd18ca Sets CS%ignore_fluxes_over_land = .false. when ePBL is not used - NOAA-GFDL/MOM6@622d19e Delete comment on whether meltw is needed in PRmE - NOAA-GFDL/MOM6@cd2648d Take meltw into account when adjust_net_fresh_water_to_zero=true - NOAA-GFDL/MOM6@9ede781 Merge branch 'dev-master-candidate-2018-10-15' into merge-dev-master-candidate-2018-10-15 - NOAA-GFDL/MOM6@f44b215 Merge branch 'dev-master-candidate-2018-10-15' into merge-dev-master-candidate-2018-10-15 - NOAA-GFDL/MOM6@7194593 Re-introduces salt_flux contribution into net_FW - NOAA-GFDL/MOM6@6acc499 Ignores volume flux of sea ice via reverse engineering - NOAA-GFDL/MOM6@9b0af26 Adds meltw and melth into fluxes - NOAA-GFDL/MOM6@d581094 Updates MCT doxygen after adding meltw and melth - NOAA-GFDL/MOM6@918f218 Adds meltw (water flux from seaice and snow) - NOAA-GFDL/MOM6@67e70c5 Add more complete description of Fioi_meltw - NOAA-GFDL/MOM6@70779e6 Deletes TODO comments. Signs are correct. - NOAA-GFDL/MOM6@e495d0c Add heat flux term deu to melt/freeze of sea ice - NOAA-GFDL/MOM6@a3dbe02 Merge pull request #81 from gustavo-marques/fix_salt_flux - NOAA-GFDL/MOM6@a2e9c1e Merge branch 'dev/ncar' into fix_salt_flux - NOAA-GFDL/MOM6@48582eb Merge pull request #82 from NOAA-GFDL/dev/master - NOAA-GFDL/MOM6@6f12f84 Adds a missing parameter and fixes a bug
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.