(*)Merge MOM6/main from 16 May 2022

[gustavo-marques]

Merging changes incorporated into MOM6/main via https://github.com/mom-ocean/MOM6/pull/1570.

Answers in aux_mom will change because of:

• Del2vort_h was made rotationally invariant in https://github.com/NOAA-GFDL/MOM6/commit/ab4d226bb8ea14d58f6176839cc80c56e8ff7b0a. This changes answers for cases where LEITH_AH = True;
• Improvement on how to compute tracer stocks https://github.com/NOAA-GFDL/MOM6/commit/1bf82205a981fa0ae7390d0e513cdef8315bc23c. This leads to round-off changes in total age.

[codecov-commenter]

Codecov Report

Merging #219 (132028c) into dev/ncar (b1eda27) will decrease coverage by 0.14%. The diff coverage is 18.94%.

:exclamation: Current head 132028c differs from pull request most recent head e969261. Consider uploading reports for the commit e969261 to get more accurate results

@@             Coverage Diff              @@
##           dev/ncar     #219      +/-   ##
============================================
- Coverage     28.76%   28.62%   -0.15%     
============================================
  Files           245      252       +7     
  Lines         72126    73514    +1388     
============================================
+ Hits          20750    21040     +290     
- Misses        51376    52474    +1098     

Impacted Files	Coverage Δ
...g_src/drivers/solo_driver/MESO_surface_forcing.F90	0.00% <0.00%> (ø)
config_src/drivers/solo_driver/MOM_driver.F90	67.33% <0.00%> (-0.55%)	:arrow_down:
...ig_src/drivers/solo_driver/MOM_surface_forcing.F90	21.05% <0.00%> (ø)
...g_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90	0.00% <ø> (ø)
...fig_src/external/GFDL_ocean_BGC/generic_tracer.F90	0.00% <ø> (ø)
...c/external/GFDL_ocean_BGC/generic_tracer_utils.F90	0.00% <ø> (ø)
config_src/external/ODA_hooks/ocean_da_types.F90	0.00% <ø> (ø)
config_src/external/ODA_hooks/write_ocean_obs.F90	0.00% <ø> (ø)
config_src/external/drifters/MOM_particles.F90	0.00% <0.00%> (ø)
...nfig_src/external/drifters/MOM_particles_types.F90	0.00% <ø> (ø)
... and 255 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update b1eda27...e969261. Read the comment docs.

[alperaltuntas]

@gustavo-marques Does this need to be tested with aux_mom or have you already tested it?

[gustavo-marques]

I have tested it already.

20220520_132002_beb5hn: 13 tests
  DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods (Overall: FAIL) details:
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods CREATE_NEWCASE
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods XML
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods SETUP
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods SHAREDLIB_BUILD time=460
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods NLCOMP
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods MODEL_BUILD time=707
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods SUBMIT
    FAIL DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods RUN time=5426
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_1_Tp_base
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_2_Lp_base
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_3_Hp_base
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_4_Zp_base
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_5_Rp_base
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_6_Qp_base
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_7_Tn_base
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_8_Ln_base
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_9_Hn_base
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_10_Zn_base
    PASS DIMCS_Ld1.TL319_t061.GMOM_JRA.cheyenne_intel.mom-cfc_mods COMPARE_dimscale_11_Rn_base
  ERI_Vmct.T62_t061.GMOM.cheyenne_intel (Overall: DIFF) details:
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel CREATE_NEWCASE
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel XML
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel SETUP
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel SHAREDLIB_BUILD time=466
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel NLCOMP
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel MODEL_BUILD time=481
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel SUBMIT
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel RUN time=1228
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel COMPARE_base_hybrid
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel COMPARE_base_rest
    FAIL ERI_Vmct.T62_t061.GMOM.cheyenne_intel BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: DIFF
    FAIL ERI_Vmct.T62_t061.GMOM.cheyenne_intel MEMCOMP Error: Memory usage increase >10% from baseline's 67040.490000 to 131552.660000
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel TPUTCOMP
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel MEMLEAK
    PASS ERI_Vmct.T62_t061.GMOM.cheyenne_intel SHORT_TERM_ARCHIVER
  ERS.T62_g16.CMOM_IAF.cheyenne_intel (Overall: DIFF) details:
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel CREATE_NEWCASE
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel XML
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel SETUP
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel SHAREDLIB_BUILD time=539
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel NLCOMP
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel MODEL_BUILD time=526
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel SUBMIT
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel RUN time=346
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel COMPARE_base_rest
    FAIL ERS.T62_g16.CMOM_IAF.cheyenne_intel BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: DIFF
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel MEMLEAK insuffiencient data for memleak test
    PASS ERS.T62_g16.CMOM_IAF.cheyenne_intel SHORT_TERM_ARCHIVER
  ERS.T62_t061.GMOM_JRA.cheyenne_intel (Overall: DIFF) details:
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel CREATE_NEWCASE
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel XML
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel SETUP
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel SHAREDLIB_BUILD time=303
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel NLCOMP
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel MODEL_BUILD time=525
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel SUBMIT
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel RUN time=677
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel COMPARE_base_rest
    FAIL ERS.T62_t061.GMOM_JRA.cheyenne_intel BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: DIFF
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel MEMLEAK insuffiencient data for memleak test
    PASS ERS.T62_t061.GMOM_JRA.cheyenne_intel SHORT_TERM_ARCHIVER
  ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel (Overall: DIFF) details:
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel CREATE_NEWCASE
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel XML
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel SETUP
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel SHAREDLIB_BUILD time=350
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel NLCOMP
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel MODEL_BUILD time=524
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel SUBMIT
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel RUN time=1653
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel COMPARE_base_rest
    FAIL ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: ERROR BFAIL some baseline files were missing
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel MEMLEAK insuffiencient data for memleak test
    PASS ERS.TL319_t061.GMOM_JRA_WD.cheyenne_intel SHORT_TERM_ARCHIVER
  ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel (Overall: DIFF) details:
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel CREATE_NEWCASE
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel XML
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel SETUP
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel SHAREDLIB_BUILD time=314
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel NLCOMP
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel MODEL_BUILD time=526
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel SUBMIT
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel RUN time=1425
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel COMPARE_base_rest
    FAIL ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: DIFF
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel MEMLEAK insuffiencient data for memleak test
    PASS ERS.TL319_t061_wt061.GMOM_JRA_WD.cheyenne_intel SHORT_TERM_ARCHIVER
  PET.TL319_t061.GMOM_JRA.cheyenne_intel (Overall: DIFF) details:
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel CREATE_NEWCASE
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel XML
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel SETUP
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel SHAREDLIB_BUILD time=580
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel NLCOMP
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel MODEL_BUILD time=620
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel SUBMIT
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel RUN time=722
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel COMPARE_base_single_thread
    FAIL PET.TL319_t061.GMOM_JRA.cheyenne_intel BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: DIFF
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel MEMLEAK insuffiencient data for memleak test
    PASS PET.TL319_t061.GMOM_JRA.cheyenne_intel SHORT_TERM_ARCHIVER
  SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu (Overall: DIFF) details:
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu CREATE_NEWCASE
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu XML
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu SETUP
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu SHAREDLIB_BUILD time=275
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu NLCOMP
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu MODEL_BUILD time=304
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu SUBMIT
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu RUN time=98
    FAIL SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: DIFF
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu TPUTCOMP
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu MEMLEAK insuffiencient data for memleak test
    PASS SMS_D_Ld2_Vmct.T62_g16.CMOM.cheyenne_gnu SHORT_TERM_ARCHIVER
  SMS_D.T62_t061.GMOM_IAF.cheyenne_intel (Overall: DIFF) details:
    PASS SMS_D.T62_t061.GMOM_IAF.cheyenne_intel CREATE_NEWCASE
    PASS SMS_D.T62_t061.GMOM_IAF.cheyenne_intel XML
    PASS SMS_D.T62_t061.GMOM_IAF.cheyenne_intel SETUP
    PASS SMS_D.T62_t061.GMOM_IAF.cheyenne_intel SHAREDLIB_BUILD time=313
    PASS SMS_D.T62_t061.GMOM_IAF.cheyenne_intel NLCOMP
    PASS SMS_D.T62_t061.GMOM_IAF.cheyenne_intel MODEL_BUILD time=224
    PASS SMS_D.T62_t061.GMOM_IAF.cheyenne_intel SUBMIT
    PASS SMS_D.T62_t061.GMOM_IAF.cheyenne_intel RUN time=874
    FAIL SMS_D.T62_t061.GMOM_IAF.cheyenne_intel BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: DIFF
    PASS SMS_D.T62_t061.GMOM_IAF.cheyenne_intel MEMLEAK insuffiencient data for memleak test
    PASS SMS_D.T62_t061.GMOM_IAF.cheyenne_intel SHORT_TERM_ARCHIVER
  SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom (Overall: DIFF) details:
    PASS SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom CREATE_NEWCASE
    PASS SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom XML
    PASS SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom SETUP
    PASS SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom SHAREDLIB_BUILD time=540
    PASS SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom NLCOMP
    PASS SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom MODEL_BUILD time=543
    PASS SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom SUBMIT
    PASS SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom RUN time=411
    FAIL SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: DIFF
    PASS SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom MEMLEAK insuffiencient data for memleak test
    PASS SMS_Ld2.f09_t061.B1850MOM.cheyenne_intel.mom-bmom SHORT_TERM_ARCHIVER
  SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel (Overall: DIFF) details:
    PASS SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel CREATE_NEWCASE
    PASS SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel XML
    PASS SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel SETUP
    PASS SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel SHAREDLIB_BUILD time=311
    PASS SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel NLCOMP
    PASS SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel MODEL_BUILD time=517
    PASS SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel SUBMIT
    PASS SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel RUN time=1254
    FAIL SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: DIFF
    PASS SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel MEMLEAK insuffiencient data for memleak test
    PASS SMS_Ld40.T62_t061.CMOM_IAF.cheyenne_intel SHORT_TERM_ARCHIVER
  SMS.T62_t025.CMOM.cheyenne_intel (Overall: PASS) details:
    PASS SMS.T62_t025.CMOM.cheyenne_intel CREATE_NEWCASE
    PASS SMS.T62_t025.CMOM.cheyenne_intel XML
    PASS SMS.T62_t025.CMOM.cheyenne_intel SETUP
    PASS SMS.T62_t025.CMOM.cheyenne_intel SHAREDLIB_BUILD time=310
    PASS SMS.T62_t025.CMOM.cheyenne_intel NLCOMP
    PASS SMS.T62_t025.CMOM.cheyenne_intel MODEL_BUILD time=522
    PASS SMS.T62_t025.CMOM.cheyenne_intel SUBMIT
    PASS SMS.T62_t025.CMOM.cheyenne_intel RUN time=923
    PASS SMS.T62_t025.CMOM.cheyenne_intel BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom:
    PASS SMS.T62_t025.CMOM.cheyenne_intel MEMLEAK insuffiencient data for memleak test
    PASS SMS.T62_t025.CMOM.cheyenne_intel SHORT_TERM_ARCHIVER
  SMS_Vmct.T62_t061.GMOM.cheyenne_gnu (Overall: DIFF) details:
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu CREATE_NEWCASE
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu XML
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu SETUP
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu SHAREDLIB_BUILD time=220
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu NLCOMP
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu MODEL_BUILD time=217
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu SUBMIT
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu RUN time=362
    FAIL SMS_Vmct.T62_t061.GMOM.cheyenne_gnu BASELINE /glade/scratch/gmarques/cesm.baselines/cheyenne/aux_mom: DIFF
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu MEMCOMP
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu TPUTCOMP
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu MEMLEAK
    PASS SMS_Vmct.T62_t061.GMOM.cheyenne_gnu SHORT_TERM_ARCHIVER