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

Feature/main ecbuild candidate 20220111 #29

Merged
merged 1,504 commits into from
Jan 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1504 commits
Select commit Hold shift + click to select a range
a874d6d
Don't need inout for ADp anymore
NoraLoose Aug 4, 2021
7ebf3b0
bringing in vr12ma ww3 coupling changes to the latest dev/ncar and re…
alperaltuntas Aug 5, 2021
508fbf4
Merge branch 'dev/gfdl' into codecov_io_path_fix
adcroft Aug 5, 2021
cf46bc9
Update MOM_oda_incupd.F90
pjpegion Aug 5, 2021
3fb3a4c
Merge pull request #5 from pjpegion/patch-1
jiandewang Aug 5, 2021
1412771
Minor fixes for the WW3 coupling option VR12-MA
alperaltuntas Aug 5, 2021
2d385a0
Introduce changes needed for CVMix KPP module for the VR12-MA wave co…
alperaltuntas Aug 5, 2021
20d91da
Merge branch 'dev/gfdl' into fix-topoinit_2
marshallward Aug 5, 2021
ffe1900
Merge pull request #1460 from marshallward/codecov_io_path_fix
adcroft Aug 5, 2021
a77817d
Merge branch 'dev/gfdl' into fix-topoinit_2
marshallward Aug 5, 2021
ee198de
Merge pull request #10 from NoraLoose/cpt_visc_rem_diags
gustavo-marques Aug 5, 2021
3a0725d
Merge pull request #1457 from herrwang0/fix-topoinit_2
marshallward Aug 5, 2021
40895ba
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
kshedstrom Aug 5, 2021
9fe68ac
fix doxygen error: add comments for wave method strings
alperaltuntas Aug 5, 2021
80e1e2e
fix omp error in KPP module: add lamult to shared clauses
alperaltuntas Aug 5, 2021
bf34a57
Merge branch 'dev/gfdl' into sigma_shelf_zstar
marshallward Aug 5, 2021
13b01e5
Merge pull request #11 from gustavo-marques/meke_damping
gustavo-marques Aug 5, 2021
e28f74d
Merge branch 'dev/gfdl' into dev/cpt
gustavo-marques Aug 5, 2021
7b3dd02
Merge pull request #12 from gustavo-marques/merge_dev_gfdl_5Aug2021
gustavo-marques Aug 5, 2021
bc99ba2
Merge pull request #1459 from MJHarrison-GFDL/sigma_shelf_zstar
marshallward Aug 6, 2021
717076b
Merge branch 'dev/gfdl' into diag_d2_ptr_fix
Hallberg-NOAA Aug 6, 2021
e794c41
Merge pull request #1454 from jiandewang/EMC-IAU-candidate-20210727
marshallward Aug 6, 2021
2ef3a11
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
kshedstrom Aug 6, 2021
580db49
Merge branch 'main' into dev/gfdl
marshallward Aug 7, 2021
5cdc20d
Merge branch 'dev/gfdl' into diag_d2_ptr_fix
marshallward Aug 7, 2021
7883f63
Merge pull request #1456 from marshallward/diag_d2_ptr_fix
marshallward Aug 7, 2021
83954c2
Merge branch 'dev/gfdl' into dev/cpt
gustavo-marques Aug 7, 2021
8edc472
logging/bulletproofing
raphaeldussin Aug 9, 2021
268f467
fix indexing and potential division by small number
raphaeldussin Aug 9, 2021
9b97495
replace denominator of dlnCn_dxy with a more solid schme
raphaeldussin Aug 9, 2021
ff89804
add complementary test
raphaeldussin Aug 9, 2021
aabd67e
Merge branch 'dev/gfdl' into fix_1149
Hallberg-NOAA Aug 9, 2021
c108379
Restrict printing warning message to root pe
nikizadehgfdl Aug 10, 2021
906f8af
Merge branch 'dev/gfdl' into bugfix_ifRootPe
nikizadehgfdl Aug 10, 2021
77175fe
Merge pull request #1448 from raphaeldussin/fix_1149
marshallward Aug 11, 2021
3223bba
Merge branch 'dev/gfdl' into bugfix_ifRootPe
Hallberg-NOAA Aug 11, 2021
66a7584
Fix pointer initialization and other cleanup
MJHarrison-GFDL Aug 11, 2021
5ba918a
Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into SPEAR_ECDA
MJHarrison-GFDL Aug 11, 2021
e88cdaa
Merge pull request #1462 from nikizadehgfdl/bugfix_ifRootPe
marshallward Aug 11, 2021
76a6bbf
Merge branch 'dev/gfdl' into fix_refraction_tides
raphaeldussin Aug 11, 2021
6f1a191
+Add optional dZref argument to find_eta
Hallberg-NOAA Aug 15, 2021
a2df3b7
Code cleanup in MOM_regridding
Hallberg-NOAA Aug 15, 2021
db43b35
Longer error string in get_polynomial_coordinate
Hallberg-NOAA Aug 15, 2021
4d8d7af
+Add optional Z_0p argument to int_density_dz
Hallberg-NOAA Aug 15, 2021
e4ffa76
Corrects the routine indicated in 2 error messages
Hallberg-NOAA Aug 15, 2021
7cc0582
Prep initialization for reference height changes
Hallberg-NOAA Aug 15, 2021
62446ec
Cleanup of comments in MOM_ALE_sponge.F90
Hallberg-NOAA Aug 15, 2021
c72d441
(*)Fix dimensionally inconsistent MEKE beta calcs
Hallberg-NOAA Aug 15, 2021
5017bf6
Added comments highlighting bugs
Hallberg-NOAA Aug 15, 2021
f6ab01d
more elegant formulation for cn_u/cn_v
Aug 16, 2021
c703d22
better definition of cnmask
Aug 16, 2021
bcbf43c
cosmetics
Aug 16, 2021
3cda6fd
+Pass depth_tot to initialization routines
Hallberg-NOAA Aug 17, 2021
8a0ae94
+Pass depth_tot around within MOM_MEKE
Hallberg-NOAA Aug 17, 2021
734e537
change VR12-MA wave_method string to EFACTOR
alperaltuntas Aug 17, 2021
d734536
Refactor the way Langmuir entrainment and enhancement factor are comp…
alperaltuntas Aug 17, 2021
a29bff9
Merge pull request #1458 from raphaeldussin/fix_refraction_tides
marshallward Aug 17, 2021
23d0076
Merge branch 'dev/gfdl' into Z_ref_prelude
Hallberg-NOAA Aug 17, 2021
3150c9f
Merge branch 'Z_ref_prelude' into Z_ref_prep2
Hallberg-NOAA Aug 17, 2021
00ea6c7
(*)Use summed thicknesses in OBC wave speed
Hallberg-NOAA Aug 18, 2021
03d0345
Testing: Replace bc with awk; framework support
marshallward Aug 18, 2021
6044c8b
Merge branch 'make_profile' into make_prof_merge
marshallward Aug 18, 2021
7e9fd3d
Tiny typo.
kshedstrom Aug 18, 2021
c20c771
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
kshedstrom Aug 18, 2021
b41d75a
Merge remote-tracking branch 'hallberg/OBC_cg_depth_fix' into dev/esmg
kshedstrom Aug 18, 2021
dabf8ea
Documented internal tidal mixing.
kshedstrom Aug 19, 2021
6b6debf
Merge branch 'dev/esmg' of github.com:ESMG/MOM6 into dev/esmg
kshedstrom Aug 19, 2021
91b0f90
Merge branch 'dev/esmg' of github.com:ESMG/MOM6 into dev/esmg
kshedstrom Aug 19, 2021
c9c4cc9
Fixed the \cite arguments?
kshedstrom Aug 20, 2021
37465ec
Tiny typo.
kshedstrom Aug 18, 2021
1cd9ea5
Documented internal tidal mixing.
kshedstrom Aug 19, 2021
1e80385
Fixed the \cite arguments?
kshedstrom Aug 20, 2021
cf67c92
Merge pull request #1467 from Hallberg-NOAA/Z_ref_prelude
marshallward Aug 22, 2021
7766f3b
Merge pull request #1469 from Hallberg-NOAA/Z_ref_prep2
marshallward Aug 23, 2021
9011801
Various dimension rescaling fixes
klindsay28 Aug 23, 2021
817217e
Merge pull request #1470 from Hallberg-NOAA/OBC_cg_depth_fix
marshallward Aug 23, 2021
e87adb8
dimension rescaling fixes for MOM_CFC_cap tracers
klindsay28 Aug 23, 2021
bc19819
let register_tracer handle flux_units for MOM_CFC_cap tracers
klindsay28 Aug 23, 2021
fa96ae3
correct prepending inputdir to CFC_BC_file
klindsay28 Aug 23, 2021
8ee65a6
Fix units of *_visc_rem terms
gustavo-marques Aug 23, 2021
ac316f0
Merge remote-tracking branch 'gustavo/fix_units_visc_rem_terms' into …
gustavo-marques Aug 23, 2021
f6524ad
Add run-time parameters CFC11_IC_VAL and CFC12_IC_VAL.
klindsay28 Aug 24, 2021
197cd18
MOM_CFC_cap cleanup
klindsay28 Aug 24, 2021
3ce2efe
changes to ice_velocity_mask_update, initialization of ice velocity a…
OlgaSergienko Aug 25, 2021
a5caf2e
removed tab from MOM_ice_shelf_initialize.F90
OlgaSergienko Aug 25, 2021
dc205c3
(*)Fix discretization issues with USE_GME=True
Hallberg-NOAA Aug 26, 2021
1256905
(*)Use depths in DOME and dye tracer initialization
Hallberg-NOAA Aug 26, 2021
90af3cb
Merge branch 'pr/1473' into dev/gfdl
marshallward Aug 26, 2021
88b3642
Restore Vt2 diagnostic calculation when requested and retain the func…
alperaltuntas Aug 27, 2021
8cd4330
(*+)New internal tide bathymetric parameters
Hallberg-NOAA Aug 27, 2021
6979c29
+(*)Add option for MEKE to calculate total depth
Hallberg-NOAA Aug 27, 2021
60ad2ed
Merge branch 'dev/gfdl' into SPEAR_ECDA
Hallberg-NOAA Aug 27, 2021
380615d
Merge pull request #194 from NCAR/merge_ww3_coupling_vr12ma
gustavo-marques Aug 27, 2021
e24a58f
Merge branch 'dev/gfdl' into test_bc_framework_fixes
Hallberg-NOAA Aug 27, 2021
f347b10
Testing: Disable 2018 answer flags
marshallward Aug 27, 2021
c2b2fd1
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
kshedstrom Aug 27, 2021
e0e70e3
Merge pull request #1471 from marshallward/test_bc_framework_fixes
Hallberg-NOAA Aug 27, 2021
e85f291
Merge branch 'dev/gfdl' into make_prof_merge
Hallberg-NOAA Aug 27, 2021
bdba2d2
Merge pull request #195 from klindsay28/dimension_rescaling_fixes
gustavo-marques Aug 27, 2021
79fcdfb
Merge pull request #1472 from marshallward/make_prof_merge
Hallberg-NOAA Aug 27, 2021
72a525a
Go back to gfdl verison of MOM_boundary_update
kshedstrom Aug 28, 2021
710b087
More documentation - Jackson start.
kshedstrom Aug 28, 2021
7faf3fd
Merge branch 'dev/esmg' of github.com:ESMG/MOM6 into dev/esmg
kshedstrom Aug 28, 2021
ddec6f9
Testing: Rotation support for MOM_read_data
marshallward Aug 28, 2021
7ab8f12
Merge branch 'dev/gfdl' into hor_visc_GME_fix
marshallward Aug 29, 2021
5666854
Merge pull request #1481 from Hallberg-NOAA/hor_visc_GME_fix
marshallward Aug 30, 2021
72a084e
Merge branch 'dev/gfdl' into DOME_tracer_init_depth
marshallward Aug 30, 2021
13fdbf0
Merge pull request #1482 from Hallberg-NOAA/DOME_tracer_init_depth
marshallward Aug 30, 2021
2fbdf35
Merge branch 'dev/gfdl' into internal_tide_bathy_params
marshallward Aug 30, 2021
62909e6
Merge pull request #1483 from Hallberg-NOAA/internal_tide_bathy_params
marshallward Aug 30, 2021
d03a2b2
Merge branch 'dev/gfdl' into better_MEKE_total_depth
marshallward Aug 30, 2021
868c11a
Always initialize drag_rate
gustavo-marques Aug 30, 2021
21fffff
Merge pull request #1484 from Hallberg-NOAA/better_MEKE_total_depth
marshallward Aug 30, 2021
7cd584e
Merge branch 'dev/gfdl' into testing_no_2018
Hallberg-NOAA Aug 30, 2021
53443ae
Merge branch 'meke_damping' into cpt2gfdl_080622
gustavo-marques Aug 30, 2021
df97d4f
Merge pull request #1485 from marshallward/testing_no_2018
Hallberg-NOAA Aug 30, 2021
91ab1e5
Merge branch 'main' into dev-ncar-main-candidate-2021-08-30
gustavo-marques Aug 30, 2021
ba6f56d
Add code that was deleted unintentionally
gustavo-marques Aug 30, 2021
a253d37
init local arrays, fix to axes and logging
Aug 27, 2021
060c412
(*)Offset G%bathyT by -G%Z_ref
Hallberg-NOAA Aug 31, 2021
442ae8f
changed the block idetentation for consistency with MOM6 code style
OlgaSergienko Aug 31, 2021
e2c565c
changed identation MOM_ice_shelf_initialize.F90 to follow MOM6 conven…
OlgaSergienko Aug 31, 2021
91383e3
Testing: Set MALLOC_PERTURB_ to 1
marshallward Aug 31, 2021
7181090
Merge remote-tracking branch 'gustavo/dev-ncar-main-candidate-2021-08…
kshedstrom Aug 31, 2021
2925661
Merge branch 'dev/gfdl' into cpt2gfdl_080622
marshallward Aug 31, 2021
14aebaa
Merge branch 'dev/gfdl' into fix_diags_intwaves
raphaeldussin Aug 31, 2021
ebd0393
Merge pull request #1474 from gustavo-marques/cpt2gfdl_080622
marshallward Aug 31, 2021
7f76390
Some background diffusivity text
kshedstrom Sep 1, 2021
ccaddf1
Merge branch 'dev/gfdl' into SPEAR_ECDA
marshallward Sep 1, 2021
d37f1cf
Add documentation for correct_leap_year_inconsistency argument
MJHarrison-GFDL Sep 1, 2021
88da4c9
clearer documentation for correct_leap_year_inconsistency flag
MJHarrison-GFDL Sep 1, 2021
f46c4bc
Changed identation in MOM6_ice_shelf_initialize.F90 to follow MOM6 co…
OlgaSergienko Sep 1, 2021
f98b76d
Merge pull request #1453 from MJHarrison-GFDL/SPEAR_ECDA
marshallward Sep 1, 2021
d234258
Merge branch 'dev/gfdl' into ice_dynamics
marshallward Sep 1, 2021
a7d8e3a
Merge pull request #1479 from OlgaSergienko/ice_dynamics
marshallward Sep 1, 2021
5bea586
Merge branch 'dev/gfdl' into fix_diags_intwaves
marshallward Sep 1, 2021
5718664
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
kshedstrom Sep 1, 2021
7549fe3
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
kshedstrom Sep 1, 2021
e3949a6
Merge branch 'dev/esmg' of github.com:ESMG/MOM6 into dev/esmg
kshedstrom Sep 1, 2021
ca1c426
(*)Avoid uninitialized data use in find_interfaces
Hallberg-NOAA Sep 1, 2021
b039e62
More documentation - Jackson start.
kshedstrom Aug 28, 2021
4f707ce
Some background diffusivity text
kshedstrom Sep 1, 2021
d1c0835
Merge pull request #1487 from raphaeldussin/fix_diags_intwaves
marshallward Sep 1, 2021
11c550f
add references to KPP enhancements methods
alperaltuntas Sep 2, 2021
5f8c446
update all calls of KPP_compute_BLD and KPP_calculate to support the …
alperaltuntas Sep 2, 2021
9ee0771
More on background mixing.
kshedstrom Sep 2, 2021
db3fd1c
Fixed forgotten \f$
kshedstrom Sep 2, 2021
9c2b4e4
Fixing a citation
kshedstrom Sep 2, 2021
6d13b18
Still more syntax issues
kshedstrom Sep 2, 2021
456d4a9
ALE sponge mask_z halo fixes
marshallward Sep 2, 2021
67707e4
Merge branch 'dev/gfdl' into ale_sponge_halo_fix
marshallward Sep 2, 2021
127a221
Merge branch 'dev/gfdl' into rotate_read_data
Hallberg-NOAA Sep 2, 2021
dc6f129
Merge pull request #7 from alperaltuntas/pr1491_fixes
gustavo-marques Sep 2, 2021
41c96cc
Merge branch 'dev/gfdl' into find_interfaces_fix
marshallward Sep 3, 2021
54b4a23
Merge pull request #1493 from Hallberg-NOAA/find_interfaces_fix
marshallward Sep 3, 2021
b560b2c
Merge branch 'pr/1494' into dev/gfdl
marshallward Sep 3, 2021
b47b446
ALE sponge: Only update fields on uv over masks
marshallward Sep 4, 2021
6a7216b
Merge branch 'dev/gfdl' into rotate_read_data
Hallberg-NOAA Sep 7, 2021
e5a522b
Infra: MOM_read_data rename to read_field
marshallward Sep 8, 2021
a316416
Merge pull request #1488 from marshallward/rotate_read_data
Hallberg-NOAA Sep 9, 2021
f44b9c4
Merge branch 'dev/gfdl' into offset_bathyT_by_Z_ref
Hallberg-NOAA Sep 9, 2021
1623085
Merge pull request #1490 from Hallberg-NOAA/offset_bathyT_by_Z_ref
marshallward Sep 11, 2021
e05ceb2
Merge branch 'dev/gfdl' into ale_sponge_halo_fix
Hallberg-NOAA Sep 13, 2021
87aad26
Merge pull request #1495 from marshallward/ale_sponge_halo_fix
Hallberg-NOAA Sep 13, 2021
4749308
Merge branch 'dev/gfdl' into malloc_perturb_update
Hallberg-NOAA Sep 13, 2021
cabe0d1
Merge pull request #1492 from marshallward/malloc_perturb_update
Hallberg-NOAA Sep 13, 2021
c09e199
Merge pull request #1491 from gustavo-marques/dev-ncar-main-candidate…
marshallward Sep 14, 2021
72aabe5
Merge branch 'dev/gfdl' into main_to_dev_gfdl
marshallward Sep 14, 2021
457792a
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
kshedstrom Sep 14, 2021
233f982
Merge pull request #1497 from marshallward/main_to_dev_gfdl
Hallberg-NOAA Sep 15, 2021
73ed0dc
Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
kshedstrom Sep 15, 2021
3df34af
Fix initialize_ice_thickness_from_file for ISOMIP
Hallberg-NOAA Sep 16, 2021
d9af347
Use allocate with source to initialize arrays
Hallberg-NOAA Sep 17, 2021
95cecb6
Done with internal diffusion?
kshedstrom Sep 17, 2021
b723674
Adding information to MOM6 warning.
kshedstrom Sep 20, 2021
e368bfe
Several small things, including fix to sponge verbosity.
kshedstrom Sep 22, 2021
a3a4d8e
Changing verbosity in MOM_horizontal_regridding.F90
kshedstrom Sep 22, 2021
4bf730a
+(*)Add ALTERNATE_FIRST_DIRECTION
Hallberg-NOAA Sep 23, 2021
c937208
Merge pull request #1498 from Hallberg-NOAA/repair_ISOMIP
marshallward Sep 24, 2021
55876e8
Merge branch 'dev/gfdl' into allocate_with_source
marshallward Sep 24, 2021
2336727
Merge pull request #1499 from Hallberg-NOAA/allocate_with_source
marshallward Sep 24, 2021
3f2ebd0
Merge branch 'dev/gfdl' into dev/esmg
Hallberg-NOAA Sep 24, 2021
41947ab
Merge pull request #1500 from ESMG/dev/esmg
Hallberg-NOAA Sep 24, 2021
f57f608
Merge branch 'dev/gfdl' into alternate_first_direction
Hallberg-NOAA Sep 24, 2021
16128ef
refactoring reflection
Jul 20, 2021
d438581
Testing: Configurable list of test targets
marshallward Sep 28, 2021
482c0e5
Testing: Individual tc tests; no wildcards
marshallward Sep 28, 2021
6e6adb0
Testing: Generalized dimension testing
marshallward Sep 28, 2021
8e4b4bc
Merge pull request #1501 from Hallberg-NOAA/alternate_first_direction
marshallward Oct 1, 2021
ff3e265
Merge branch 'dev/gfdl' into test_rules_v2
Hallberg-NOAA Oct 1, 2021
bb9cb35
Merge pull request #1502 from marshallward/test_rules_v2
adcroft Oct 1, 2021
08ca2bb
fix units in variable declaration
raphaeldussin Oct 1, 2021
7fc7130
(*) N2_floor init fix when FGNV streamfn disabled
marshallward Oct 1, 2021
650fe9a
Merge branch 'dev/gfdl' into refactor_int_tide_reflection
marshallward Oct 1, 2021
43d4f16
(+*)Fix MEKE advection bug
Hallberg-NOAA Oct 1, 2021
503df0e
Merge pull request #1468 from raphaeldussin/refactor_int_tide_reflection
marshallward Oct 2, 2021
456de80
Merge branch 'dev/gfdl' into use_fgnv_flag_fix
marshallward Oct 2, 2021
4d3d10e
Merge pull request #1505 from marshallward/use_fgnv_flag_fix
marshallward Oct 2, 2021
374acc5
+Add BAROTROPIC_TIDAL_SAL_BUG to fix a tide bug
Hallberg-NOAA Oct 5, 2021
e4cdaaf
Merge branch 'dev/gfdl' into MEKE_advection_bugfix
marshallward Oct 8, 2021
a384fcc
Merge pull request #1506 from Hallberg-NOAA/MEKE_advection_bugfix
marshallward Oct 9, 2021
780919f
Merge branch 'dev/gfdl' into tidal_SAL_bugfix
marshallward Oct 9, 2021
7d808b5
Merge pull request #1508 from Hallberg-NOAA/tidal_SAL_bugfix
marshallward Oct 9, 2021
4012505
correct long_name for tracer_dfy for passive tracers when diag_form == 1
klindsay28 Oct 10, 2021
de7a771
Merge pull request #1513 from klindsay28/dev-gfdl-main-candidate-2021…
marshallward Oct 10, 2021
5c3f143
Particle API (#1504)
cspencerjones Oct 11, 2021
09a1cb9
Recover topography clipping when not specifying MINIMUM_DEPTH
adcroft Oct 12, 2021
554c8a0
Correct logical associated with NW2 tracers
adcroft Oct 12, 2021
ce5595f
adds missing _ (#1519)
navidcy Oct 12, 2021
1aa5b50
Remove alternate topo-clipping for unexpected parameter combination
adcroft Oct 12, 2021
b08efb8
Working on boundary layer docs.
kshedstrom Oct 4, 2021
5adf763
Done with EPBL docs?
kshedstrom Oct 6, 2021
b3d0088
Merge pull request #1517 from adcroft/clip-topo-patch
Hallberg-NOAA Oct 12, 2021
ecf88c6
Merge pull request #1518 from adcroft/patch-nw2-tracer-init
marshallward Oct 13, 2021
e2da693
Merge pull request #1510 from ESMG/esmg-docs
marshallward Oct 13, 2021
8e5a1b7
FMS1: Don't create IO domains for single-PE domain
marshallward Oct 13, 2021
24e48a7
User/wfc/remap scheme (#1503)
wfcooke Oct 14, 2021
393df05
+*Change defaults for 3 parameters to better values (#1509)
Hallberg-NOAA Oct 14, 2021
5bc0be3
+Add new parameter FATAL_INCONSISTENT_RESTART_TIME (#1511)
Hallberg-NOAA Oct 14, 2021
85afd24
+(*)Fix bug when RES_SCALE_MEKE_VISC = True (#1512)
Hallberg-NOAA Oct 15, 2021
4d9ed4f
+Make 37 optional arguments in src/core mandatory
Hallberg-NOAA Oct 15, 2021
39c0c34
Refactored solo_driver/MOM_driver.F90
Hallberg-NOAA Oct 13, 2021
1fb283b
Merge branch 'dev/gfdl' into opt_args_in_core
marshallward Oct 19, 2021
8d80d64
Merge pull request #1507 from NOAA-GFDL/dev-gfdl-main-candidate-2021-…
marshallward Oct 20, 2021
e291d32
Merge pull request #1523 from Hallberg-NOAA/opt_args_in_core
marshallward Oct 20, 2021
ba01cea
Merge branch 'main' into main_to_dev
marshallward Oct 20, 2021
5d82809
Merge pull request #1529 from marshallward/main_to_dev
marshallward Oct 20, 2021
c62258c
+Optional just_read_params args are now mandatory
Hallberg-NOAA Oct 17, 2021
037af8e
+Argument cleanup in vertical parameterization code
Hallberg-NOAA Oct 17, 2021
6ff0cae
Use FMS2 `file_exists`, remove domain args
marshallward Oct 22, 2021
ee3b92f
fix low mode in tidal_mixing
Oct 11, 2021
7e8d6e2
+Eliminate unused arguments in diagnostics code
Hallberg-NOAA Oct 19, 2021
2f91303
Merge branch 'dev/gfdl' into no_1pe_io_layout
Hallberg-NOAA Oct 25, 2021
1700498
Merge pull request #1522 from marshallward/no_1pe_io_layout
Hallberg-NOAA Oct 25, 2021
a2aaad6
Always create single-threaded files in 1 PE runs
Hallberg-NOAA Oct 13, 2021
6dd1d14
+Optional arg cleanup in horizontal param code
Hallberg-NOAA Oct 20, 2021
c053fdc
cpu_clock_id: synchro_flag arg changed to logical
marshallward Oct 25, 2021
0df0467
Merge branch 'dev/gfdl' into fms2_file_exist
Hallberg-NOAA Oct 26, 2021
9d0a92b
Merge pull request #1532 from marshallward/fms2_file_exist
Hallberg-NOAA Oct 26, 2021
5ffad6d
Merge branch 'dev/gfdl' into sync_clock_flag
Hallberg-NOAA Oct 26, 2021
9031683
Merge pull request #1535 from marshallward/sync_clock_flag
Hallberg-NOAA Oct 26, 2021
aad1e89
Eliminate GET_ALL_PARAMS in hor_visc_init (#1536)
Hallberg-NOAA Oct 29, 2021
1324656
Add weighted d[uv]_dt_str diagnostics (#1539)
NoraLoose Nov 5, 2021
f2e9983
+Argument cleanup in vertical diffusivity code
Hallberg-NOAA Oct 22, 2021
2e7624b
+Move rotate_dyn_horgrid to MOM_dyn_horgrid module
Hallberg-NOAA Oct 27, 2021
5a2bb8d
+Reduce use of dyn_horgrid in initialize_MOM
Hallberg-NOAA Oct 27, 2021
688bff9
(*)Fix compile-time issues with MOM_sum_driver.F90
Hallberg-NOAA Oct 27, 2021
76c4d89
Merge branch 'dev/gfdl' into main-ecbuild
guillaumevernieres Jan 11, 2022
30bd0b8
synch with gfdl
guillaumevernieres Jan 11, 2022
04b530b
makeitwork
guillaumevernieres Jan 18, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
78 changes: 78 additions & 0 deletions .github/actions/testing-setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: 'Build-.testing-prerequisites'
description: 'Build pre-requisites for .testing including FMS and a symmetric MOM6 executable'
inputs:
build_symmetric:
description: 'If true, will build the symmetric MOM6 executable'
required: false
default: 'true'
install_python:
description: 'If true, will install the local python env needed for .testing'
required: false
default: 'true'
runs:
using: 'composite'
steps:
- name: Git info
shell: bash
run: |
echo "::group::Git commit info"
echo "git log:"
git log | head -60
echo "::endgroup::"

- name: Env
shell: bash
run: |
echo "::group::Environment"
env
echo "::endgroup::"

- name: Install needed packages for compiling
shell: bash
run: |
echo "::group::Install linux packages"
sudo apt-get update
sudo apt-get install netcdf-bin libnetcdf-dev libnetcdff-dev mpich libmpich-dev
sudo apt-get install linux-tools-common
echo "::endgroup::"

- name: Compile FMS library
shell: bash
run: |
echo "::group::Compile FMS library"
cd .testing
make deps/lib/libFMS.a -s -j
echo "::endgroup::"

- name: Store compiler flags used in Makefile
shell: bash
run: |
echo "::group::config.mk"
cd .testing
echo "FCFLAGS_DEBUG=-g -O0 -Wextra -Wno-compare-reals -fbacktrace -ffpe-trap=invalid,zero,overflow -fcheck=bounds" >> config.mk
echo "FCFLAGS_REPRO=-g -O2 -fbacktrace" >> config.mk
echo "FCFLAGS_INIT=-finit-real=snan -finit-integer=2147483647 -finit-derived" >> config.mk
echo "FCFLAGS_COVERAGE=--coverage" >> config.mk
cat config.mk
echo "::endgroup::"

- name: Compile MOM6 in symmetric memory mode
shell: bash
run: |
echo "::group::Compile MOM6 in symmetric memory mode"
cd .testing
test ${{ inputs.build_symmetric }} == true && make build/symmetric/MOM6 -j
echo "::endgroup::"

- name: Install local python venv for generating input data
shell: bash
run: |
echo "::group::Create local python env for input data generation"
cd .testing
test ${{ inputs.install_python }} == true && make work/local-env
echo "::endgroup::"

- name: Set flags
shell: bash
run: |
echo "TIMEFORMAT=... completed in %lR (user: %lU, sys: %lS)" >> $GITHUB_ENV
33 changes: 33 additions & 0 deletions .github/workflows/coupled-api.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: API for coupled drivers

on: [push, pull_request]

jobs:
test-top-api:

runs-on: ubuntu-latest
defaults:
run:
working-directory: .testing

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- uses: ./.github/actions/testing-setup
with:
build_symmetric: 'false'
install_python: 'false'

- name: Compile MOM6 for the GFDL coupled driver
shell: bash
run: make check_mom6_api_coupled -j

- name: Compile MOM6 for the NUOPC driver
shell: bash
run: make check_mom6_api_nuopc -j

- name: Compile MOM6 for the MCT driver
shell: bash
run: make check_mom6_api_mct -j
24 changes: 24 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Code coverage

on: [push, pull_request]

jobs:
build-test-nans:

runs-on: ubuntu-latest
defaults:
run:
working-directory: .testing

env:
REPORT_COVERAGE: true

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- uses: ./.github/actions/testing-setup

- name: Run and post coverage
run: make run.symmetric -k -s
39 changes: 39 additions & 0 deletions .github/workflows/documentation-and-style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Doxygen and style

on: [push, pull_request]

jobs:
doxygen:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Check white space (non-blocking)
run: |
./.testing/trailer.py -e TEOS10 -l 120 src config_src 2>&1 | tee style_errors
continue-on-error: true

- name: Install packages used when generating documentation
run: |
sudo apt-get update
sudo apt-get install python3-sphinx python3-lxml perl
sudo apt-get install texlive-binaries texlive-base bibtool tex-common texlive-bibtex-extra
sudo apt-get install graphviz

- name: Build doxygen HTML
run: |
cd docs
perl -e 'print "perl version $^V" . "\n"'
mkdir _build && make nortd DOXYGEN_RELEASE=Release_1_8_13 UPDATEHTMLEQS=Y
cat _build/doxygen_warn_nortd_log.txt

- name: Report doxygen or style errors
run: |
grep "warning:" docs/_build/doxygen_warn_nortd_log.txt | grep -v "as part of a" | tee doxy_errors
cat style_errors doxy_errors > all_errors
cat all_errors
test ! -s all_errors
27 changes: 27 additions & 0 deletions .github/workflows/expression.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Expression verification

on: [push, pull_request]

jobs:
test-repro-and-dims:

runs-on: ubuntu-latest
defaults:
run:
working-directory: .testing

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- uses: ./.github/actions/testing-setup

- name: Compile MOM6 using repro optimization
run: make build/repro/MOM6 -j

- name: Create validation data
run: make run.symmetric -k -s

- name: Run tests
run: make test.repro test.dim -k -s
27 changes: 27 additions & 0 deletions .github/workflows/other.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: OpenMP and Restart verification

on: [push, pull_request]

jobs:
test-openmp-nan-restarts:

runs-on: ubuntu-latest
defaults:
run:
working-directory: .testing

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- uses: ./.github/actions/testing-setup

- name: Compile with openMP
run: make build/openmp/MOM6 -j

- name: Create validation data
run: make run.symmetric -k -s

- name: Run tests
run: make test.openmp test.nan test.restart -k -s
36 changes: 36 additions & 0 deletions .github/workflows/perfmon.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Performance Monitor

on: [pull_request]

jobs:
build-test-perfmon:

runs-on: ubuntu-latest
defaults:
run:
working-directory: .testing

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- uses: ./.github/actions/testing-setup

- name: Compile optimized models
run: >-
make -j build.prof
MOM_TARGET_SLUG=$GITHUB_REPOSITORY
MOM_TARGET_LOCAL_BRANCH=$GITHUB_BASE_REF
DO_REGRESSION_TESTS=true

- name: Generate profile data
run: >-
pip install f90nml &&
make profile
DO_REGRESSION_TESTS=true

- name: Generate perf data
run: |
sudo sysctl -w kernel.perf_event_paranoid=2
make perf DO_REGRESSION_TESTS=true
27 changes: 27 additions & 0 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Regression

on: [pull_request]

jobs:
build-test-regression:

runs-on: ubuntu-latest
defaults:
run:
working-directory: .testing

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- uses: ./.github/actions/testing-setup

- name: Compile reference model
run: make build.regressions MOM_TARGET_SLUG=$GITHUB_REPOSITORY MOM_TARGET_LOCAL_BRANCH=$GITHUB_BASE_REF DO_REGRESSION_TESTS=true -j

- name: Create validation data
run: make run.symmetric -k -s

- name: Regression test
run: make test.regression DO_REGRESSION_TESTS=true -k -s
27 changes: 27 additions & 0 deletions .github/workflows/stencil.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Stencil related verification

on: [push, pull_request]

jobs:
test-symmetric-layout-rotation:

runs-on: ubuntu-latest
defaults:
run:
working-directory: .testing

steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- uses: ./.github/actions/testing-setup

- name: Compile MOM6 in asymmetric memory mode
run: make build/asymmetric/MOM6 -j

- name: Create validation data
run: make run.symmetric -k -s

- name: Run tests
run: make test.grid test.layout test.rotate -k -s
8 changes: 1 addition & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@
html


# Build output
*.o
*.mod
MOM6


# Autoconf
# Autoconf output
aclocal.m4
autom4te.cache/
config.log
Expand Down
Loading