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.

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

Fix for cmocean module import #112

Merged
merged 1 commit into from
Oct 25, 2016
Merged

Conversation

jkrasting
Copy link
Contributor

  • Lack of the cmocean submodule was causing the workflow to
    fail at GFDL.
  • Wrapped the 'import cmocean' statement in a try block.

@adcroft @nikizadehgfdl, can you see if this fixes the workflow issue?

  - Lack of the cmocean submodule was causing the workflow to
    fail at GFDL.
  - Wrapped the 'import cmocean' statement in a try block.
@adcroft adcroft merged commit 361fef2 into dev/master Oct 25, 2016
@jkrasting jkrasting deleted the user/jpk/dora-web-updates branch January 11, 2017 12:56
adcroft added a commit that referenced this pull request Aug 16, 2019
…-05' into dev/master

- Merge from dev/ncar onto dev/master updates MOM_parameter_doc files.

- NOAA-GFDL/MOM6@1328636 Merge branch 'gustavo-marques-dev-master-candidate-ncar-2019-08-05' into dev/master
- NOAA-GFDL/MOM6@35b5c76 Merge pull request #115 from gustavo-marques/update_meke
- NOAA-GFDL/MOM6@c149c20 Merge pull request #114 from gustavo-marques/update_mom_vert_friction
- NOAA-GFDL/MOM6@815db63 Change default way to computing FrictWork in MEKE
- NOAA-GFDL/MOM6@68ec55e Merge pull request #113 from gustavo-marques/rename_modules
- NOAA-GFDL/MOM6@c56450a Deletes all code related to Jansen15_drag
- NOAA-GFDL/MOM6@21fd427 Make sure that MEKE%GME_snk is only used when the array is allocated
- NOAA-GFDL/MOM6@d292a57 Deletes contribution from kv%slow when computing a_cpl
- NOAA-GFDL/MOM6@a34bdf4 Capitalize MOM inside MCT modules
- NOAA-GFDL/MOM6@fc55c36 Rename modules for NUOPC
- NOAA-GFDL/MOM6@8a04b99 Rename modules for MCT
- NOAA-GFDL/MOM6@3b2ad3f Rename modules in NUOPC
- NOAA-GFDL/MOM6@1305e73 Rename modules in MCT
- NOAA-GFDL/MOM6@06a7c46 Merge pull request #112 from gustavo-marques/mct_nuopc_validation
- NOAA-GFDL/MOM6@562297c more changes to have minimal differences between nuopc and mct
- NOAA-GFDL/MOM6@f72454b changes to have minimal differences between nuopc and mct
- NOAA-GFDL/MOM6@3135f62 removed trailing whitespace
- NOAA-GFDL/MOM6@7c90fa0 changes to get MOM_ocean_model.F90 closer to nuopc_driver
- NOAA-GFDL/MOM6@c4e349d Merge branch 'dev/ncar' into mvertens/validation_fixes2
- NOAA-GFDL/MOM6@3995037 more updates to have caps consistent with dev/ncar
- NOAA-GFDL/MOM6@8da9eb9 changes to the interfaces to bring them more in line with dev/ncar latest
- NOAA-GFDL/MOM6@b9844d7 Merge pull request #108 from gustavo-marques/merge-dev-master-candidate-2019-07-08
- NOAA-GFDL/MOM6@f5899da Merge branch 'dev/master' into merge-dev-master-candidate-2019-07-08
- NOAA-GFDL/MOM6@2a65e65 Merge pull request #107 from NCAR/mvertens/validation_fixes
- NOAA-GFDL/MOM6@05709a1 Merge pull request #104 from gustavo-marques/remove_salt_flux_from_net_FW
- NOAA-GFDL/MOM6@3fcd942 Deletes comments
- NOAA-GFDL/MOM6@87e6f17 removed trailing whitespace
- NOAA-GFDL/MOM6@6ec503f Merge branch 'dev/ncar' into mvertens/validation_fixes
- NOAA-GFDL/MOM6@cac0656 fixes to get taux and tauy roundoff between mct and nuopc
- NOAA-GFDL/MOM6@f8758ec Merge pull request #106 from gustavo-marques/bobs_solution
- NOAA-GFDL/MOM6@3f8c425 Merge pull request #105 from NCAR/mvertens/mom6_validation
- NOAA-GFDL/MOM6@3f7e9f6 changes needed for mom6 validation
- NOAA-GFDL/MOM6@97c2395 Commenting out salt_flux adjustment in net_FW in NUOPC cap
- NOAA-GFDL/MOM6@9d8468a Commenting salt_flux adjustment in net_FW
raphaeldussin pushed a commit to raphaeldussin/MOM6-examples that referenced this pull request Mar 11, 2020
…_mask_bugn

- NOAA-GFDL/SIS2@674739f Merge pull request NOAA-GFDL#112 from raphaeldussin/user/rd/fix_mask_bug
- NOAA-GFDL/SIS2@0e7b3dc slow/fast mask bug fix
- NOAA-GFDL/SIS2@acef10e Merge branch 'Hallberg-NOAA-avoid_land_bounds_check' into dev/gfdl
- NOAA-GFDL/SIS2@32fb766 Avoid sea-ice bounds checks over land
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants