Update ocn_annual.frepp #51
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
The script is failing like: ``` make frepp_local (cd ../../..; git submodule init tools/python/025gridGeneration/MIDAS) error: Malformed value for push.default: simple error: Must be one of nothing, matching, tracking or current. fatal: bad config file line 6 in /home/Niki.Zadeh/.gitconfig make: *** [MIDAS/README.md] Error 128 ``` I think this is due to the old version of default git on analysis nodes. A "module load git" saves the day. Why is this suddenly happening I have no explanation for. May be something changed on analysis nodes.
|
Adding the module load git will certainly fix the git version but the line suggests that error is from an old tag? The path is now |
adcroft
added a commit
that referenced
this pull request
Sep 22, 2015
Updated ocn_annual.frepp with "module load git"
adcroft
added a commit
that referenced
this pull request
Jun 29, 2017
- NOAA-GFDL/icebergs@c67f435 Fixes hang when mpp_io is not called on some PEs with empty berg restarts - NOAA-GFDL/icebergs@a527054 Merge pull request #51 from adcroft/id-fix-for-32-bit - NOAA-GFDL/icebergs@f7988fe Removed last vestiges of %iceberg_num - NOAA-GFDL/icebergs@be47643 Read id from restarts or generate ids if iceberg_num is present - NOAA-GFDL/icebergs@08ea446 Split convert_old_id() in cij_from_old_id() - NOAA-GFDL/icebergs@3038a47 Start grd%iceberg_counter at 0 and increment before generating berg - NOAA-GFDL/icebergs@df4e43a Add id to write_restart() - NOAA-GFDL/icebergs@22bb2a0 Removed read_restart_bergs_orig() - NOAA-GFDL/icebergs@32eba0a Use %id instead of $iceberg_num - NOAA-GFDL/icebergs@04e827b Fix id_from_2_ints() for Intel and PGI - NOAA-GFDL/icebergs@1efcdaf Use %id in all print statements - NOAA-GFDL/icebergs@bbde6c2 Set %id everywhere %iceberg_num is set - NOAA-GFDL/icebergs@a5d3576 Use push/pull_buffer_value() in pack_traj_into_buffer2() - NOAA-GFDL/icebergs@905f4f2 Modularized generate_id(), added convert_old_id() - NOAA-GFDL/icebergs@c8d5b63 Re-factor pack_berg_into_buffer2() - NOAA-GFDL/icebergs@85dfb93 Removed use/public lines for pack_berg_into_buffer2 - NOAA-GFDL/icebergs@2ec7bd0 Merge branch 'fix-empty-restart-files' into id-fix-for-32-bit - NOAA-GFDL/icebergs@04dfea1 Fix for when restart files have zero bergs - NOAA-GFDL/icebergs@e7fc83f Set berg%id everywhere %iceberg_num is set - NOAA-GFDL/icebergs@33e090d Added function generate_id() - NOAA-GFDL/icebergs@0348755 Add functions id_from_2_ints() and split_id()
marshallward
added a commit
that referenced
this pull request
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 pull request
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
Hallberg-NOAA
added a commit
that referenced
this pull request
Jan 3, 2022
Updated the version of MOM6 that MOM6-examples points to, and updated those MOM_parameter_doc.all files to reflect new runtime options. All answers in the MOM6-examples test suite and TC tests are bitwise identical, but some of these changes can change solutions, mostly fixing cases that did not work previously. The non-merge MOM6 commits that are included in this update are: - NOAA-GFDL/MOM6@2d3263108 Option to homogenize forces and fluxes (#51) - NOAA-GFDL/MOM6@71cf8316b Merge pull request #37 from Hallberg-NOAA/offline_tracer_fix - NOAA-GFDL/MOM6@2b2214d9b (*)Use por_face_area in zonal_face_thickness - NOAA-GFDL/MOM6@5ad8a2cd1 Deleted commented out offline tracer lines - NOAA-GFDL/MOM6@1028ee035 Merge pull request #43 from Hallberg-NOAA/opacity_rescale - NOAA-GFDL/MOM6@d9d82e325 Eliminate unneeded diagnostic arrays in CorAdCalc - NOAA-GFDL/MOM6@5d4e8a19f (*)Removed problematic offline tracer lines - NOAA-GFDL/MOM6@0544f9f2e +(*)Avoid segmentation faults if PEN_SW_NBANDS = 0 - NOAA-GFDL/MOM6@049241ce1 +Rescaled optics%opacity_band - NOAA-GFDL/MOM6@86eb106ac Correct the units in two comments - NOAA-GFDL/MOM6@112ac4998 +(*)Revised offline tracer algorithms - NOAA-GFDL/MOM6@fcfd238ab +Refactored and rescaled the offline tracer code - NOAA-GFDL/MOM6@05edb63da (*)Offline tracer read bug fix - NOAA-GFDL/MOM6@90739bea1 Correct comments describing advect_tracer args - NOAA-GFDL/MOM6@5172c495c Warn if opacity_from_chl is called without fluxes - NOAA-GFDL/MOM6@d7337145e (*)Fix extract_diabatic_member
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.
The script is failing like:
I think this is due to the old version of default git on analysis nodes. A "module load git" saves the day.
Why is this suddenly happening I have no explanation for. May be something changed on analysis nodes.