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.

Sign up for GitHub

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/update-to-GFDL-20200515 #28

Closed
wants to merge 397 commits into from
Closed

feature/update-to-GFDL-20200515 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
397 commits
Select commit Hold shift + click to select a range
ed51bcd
Modify remapping of vertically extensive diagnostics
Mar 6, 2020
988f8f2
Merge branch 'dev/gfdl' into remap_v_extensive
Mar 6, 2020
080fa25
FMS and mkmf moved to deps directory
marshallward Mar 6, 2020
bfc2b6f
Travis environment updated to bionic
marshallward Mar 6, 2020
751616b
FMS version updated to 2019.01.01 tag
marshallward Mar 6, 2020
65b95e4
Enable aggressive initialization
marshallward Mar 6, 2020
79c86c3
Merge pull request #1071 from marshallward/travis_bionic_test
adcroft Mar 6, 2020
d09534a
Doxygen 1.8.17 documentation fixes
marshallward Mar 10, 2020
b3ea602
Fix "no lib" builds
adcroft Mar 10, 2020
87e199e
Merge branch 'dev/gfdl' into fix-nolib-builds
marshallward Mar 10, 2020
f04a3a9
Merge pull request #1073 from adcroft/fix-nolib-builds
marshallward Mar 11, 2020
7e449f4
Merge branch 'dev/gfdl' into doxygen_1p8_fixes
marshallward Mar 11, 2020
d5e3866
Merge pull request #1072 from marshallward/doxygen_1p8_fixes
adcroft Mar 11, 2020
9abcb10
Set target diagnostic grid based on boolean
Mar 11, 2020
3477bbe
Revert "Set target diagnostic grid based on boolean"
Mar 11, 2020
46ce21e
Store h_extensive for both native and remapped coordinates
ashao Mar 13, 2020
e8d47dc
+Corrected diagnostics and diagnostic units
Hallberg-NOAA Mar 16, 2020
3c08cef
+Corrected doc_param_time
Hallberg-NOAA Mar 16, 2020
3a3a102
Merge branch 'remap_v_extensive' of github.com:ashao/MOM6 into remap_…
Mar 17, 2020
e23f03c
Fix compilation errors
Mar 17, 2020
9a330fa
Loop over recreation of diagnostic grid explicitly
Mar 17, 2020
22ddb98
Corrected the units in ALE variable documentation
Hallberg-NOAA Mar 17, 2020
24782fa
Move allocation of diagnostic arrays
Mar 17, 2020
6760d1e
Corrected documented units in comments
Hallberg-NOAA Mar 19, 2020
2c2cf56
Rescaled diagnostic calculations
Hallberg-NOAA Mar 19, 2020
43ba3bc
+Rescaled density derivatives in full_convection
Hallberg-NOAA Mar 19, 2020
5b76e07
+Converted find_interfaces from a function to a subroutine
Hallberg-NOAA Mar 19, 2020
7a7488f
Removed an unneeded halo update
Hallberg-NOAA Mar 19, 2020
38024df
Merge pull request #1074 from Hallberg-NOAA/fix_diag_units
marshallward Mar 19, 2020
dcc4dac
Merge branch 'dev/gfdl' into fix_doc_param_time
marshallward Mar 19, 2020
0bb6d7b
Merge pull request #1075 from Hallberg-NOAA/fix_doc_param_time
marshallward Mar 19, 2020
90eb25b
Merge branch 'dev/gfdl' into document_ALE_vars
marshallward Mar 19, 2020
9603f69
Merge pull request #1076 from Hallberg-NOAA/document_ALE_vars
marshallward Mar 19, 2020
1cd6bae
Merge branch 'dev/gfdl' into misc_cleanup
marshallward Mar 19, 2020
b8afb90
Merge pull request #1077 from Hallberg-NOAA/misc_cleanup
marshallward Mar 19, 2020
3be0470
+Rescaled units in area_shelf_h
Hallberg-NOAA Mar 20, 2020
a99e444
Corrected more documented units in comments
Hallberg-NOAA Mar 20, 2020
02f257b
Merge pull request #1078 from Hallberg-NOAA/more_cleanup
marshallward Mar 20, 2020
c46d97c
+Rescaled ISS%area_shelf_h to [L2]
Hallberg-NOAA Mar 21, 2020
1160c6b
+Rescaled forcing%ice_shelf_melt and ice_shelf variables
Hallberg-NOAA Mar 21, 2020
16a48e5
Rescaled internal MOM_ice_shelf variables units
Hallberg-NOAA Mar 22, 2020
e1fcb3b
Changed the sign of ISS%tflux_ocn and rescaled it
Hallberg-NOAA Mar 22, 2020
27bffdb
+Rescaled ISS%shelf_mass to [R Z]
Hallberg-NOAA Mar 22, 2020
81974e1
+Changed units of forcing%ice_shelf_melt
Hallberg-NOAA Mar 24, 2020
f3177f4
+Rescaled lengths in MOM_ice_shelf_dynamics.F90
Hallberg-NOAA Mar 24, 2020
d77c803
+Rescaled velocities in MOM_ice_shelf_dynamics.F90
Hallberg-NOAA Mar 26, 2020
185b42e
+Renamed solo_time_step to solo_step_ice_shelf
Hallberg-NOAA Mar 26, 2020
e45326b
(*)+Fix grid length use in MOM_ice_shelf_dynamics.F90
Hallberg-NOAA Mar 26, 2020
6fd0edf
(*)Fixed spatial index errors in ice_shelf_advect
Hallberg-NOAA Mar 26, 2020
5fb71b1
+Revised routines in ice_shelf_advect
Hallberg-NOAA Mar 27, 2020
f2a668a
Fixed minor syntax errors in 4 dOyxgen comments
Hallberg-NOAA Mar 27, 2020
82c6dc2
Merge pull request #1080 from Hallberg-NOAA/rescale_ice_shelf
adcroft Mar 30, 2020
7fb8f55
Flipped the sign convention for wT_flux
Hallberg-NOAA Mar 30, 2020
63fd8e1
+Added optional arg area to global_area_integral
Hallberg-NOAA Mar 30, 2020
7121619
(*)Use global_area_integral in add_shelf_flux
Hallberg-NOAA Mar 30, 2020
3c3f721
(*+)Corrected bugs in 3-eqn ice shelf skin salinity
Hallberg-NOAA Mar 31, 2020
880da80
(*+)Corrected a bug in setting ustar_shelf
Hallberg-NOAA Mar 31, 2020
1a8c75a
(*+)Set ice shelf latent heat consistently
Hallberg-NOAA Apr 1, 2020
7e70820
+Added units for 13 runtime parameters
Hallberg-NOAA Apr 1, 2020
e88732c
(*)Do not use Hml>0 as an ice shelf melt filter
Hallberg-NOAA Apr 1, 2020
e87c664
(*)Removed rescaling from mean_melt_flux to vprec
Hallberg-NOAA Apr 1, 2020
fcb1e92
+Add optional arg to ice_shelf_min_thickness_calve
Hallberg-NOAA Apr 1, 2020
04d5a83
(*)Use a blend of ice-shelf and open water fluxes
Hallberg-NOAA Apr 1, 2020
03bc97a
Merge pull request #1082 from Hallberg-NOAA/add_param_units
adcroft Apr 1, 2020
684681b
+Ice shelf code cleanup
Hallberg-NOAA Apr 1, 2020
7cdffb1
(*)Use state%taux_shelf to set state%ustar_shelf
Hallberg-NOAA Apr 1, 2020
bcc3f5e
Merge branch 'dev/gfdl' into fix_iceshelf_problems
Hallberg-NOAA Apr 2, 2020
5ec169e
Merge branch 'dev/master' into dev/gfdl
adcroft Apr 2, 2020
4693962
Merge branch 'dev/gfdl' into fix_iceshelf_problems
Hallberg-NOAA Apr 2, 2020
43ebd34
Removed spaces from a blank line
Hallberg-NOAA Apr 2, 2020
1a4c2ec
+Rescaled units of forces%rigidity_u and mass_berg
Hallberg-NOAA Apr 2, 2020
f75edd9
Added a ramp option for SSH OBCs.
kshedstrom Apr 3, 2020
5a56df7
+Add optional pres_scale arguments to EOS routines
Hallberg-NOAA Apr 4, 2020
63c4510
+Rescaled Boussinesq pressure force calculations
Hallberg-NOAA Apr 4, 2020
7632abe
+Add optional SV_scale arg to int_specific_vol_dp
Hallberg-NOAA Apr 5, 2020
3b3c34a
+Rescaled non-Boussinesq pressure force calcs
Hallberg-NOAA Apr 5, 2020
94f94ed
Rescaled pressure in find_eta routines
Hallberg-NOAA Apr 6, 2020
f29e32a
Rescaled pressure in calc_isoneutral_slopes
Hallberg-NOAA Apr 6, 2020
efbbd31
Rescaled pressures in calculate_vertical_integrals
Hallberg-NOAA Apr 6, 2020
f9b63f3
+Added RL2_T2_to_Pa element to unit_scale_type
Hallberg-NOAA Apr 7, 2020
6d7dde4
Use combined scaling factors
Hallberg-NOAA Apr 7, 2020
7e64432
Merge branch 'Hallberg-NOAA-fix_iceshelf_problems' into dev/gfdl
adcroft Apr 8, 2020
27e7a1f
Merge branch 'dev/esmg' of https://github.com/ESMG/MOM6 into ESMG-dev…
adcroft Apr 8, 2020
fc9dfd0
Merge branch 'ESMG-dev/esmg' into dev/gfdl
adcroft Apr 8, 2020
6af725f
+Rescaled the units of fluxes%p_surf
Hallberg-NOAA Apr 8, 2020
20ae74d
Merge branch 'dev/gfdl' into rescale_pressure
Hallberg-NOAA Apr 8, 2020
978d772
Moved vkernel unit tests to stdout
adcroft Dec 6, 2018
3006337
Write test fails to both stderr and stdout
adcroft Apr 8, 2020
916be3c
Rescaled ice_shelf_CS%g_Earth like GV%g_Earth
Hallberg-NOAA Apr 8, 2020
3767883
Replaced 0,6 with stderr,stdout
adcroft Apr 8, 2020
3e9c645
Merge pull request #1087 from adcroft/vkernal-tests-to-stdout
marshallward Apr 8, 2020
5e16458
+Add optional pres_scale arg to calculate_TFreeze
Hallberg-NOAA Apr 9, 2020
1252e3b
Pass rescaled pressures to calculate_TFreeze
Hallberg-NOAA Apr 9, 2020
ce0905e
+Add hor_index_type variants of EOS routines
Hallberg-NOAA Apr 10, 2020
2fc1c2e
Use new HI_1d forms of calculate_density calls
Hallberg-NOAA Apr 11, 2020
3223eb6
+Rescaled the units of tv%P_Ref to [R L2 T-2]
Hallberg-NOAA Apr 11, 2020
fb820c1
+Rescaled pressure arguments to multiple routines
Hallberg-NOAA Apr 12, 2020
6948cb7
+Replaced optional pres_scale args with US args
Hallberg-NOAA Apr 12, 2020
1e8c501
Corrected pressure units in comments
Hallberg-NOAA Apr 13, 2020
8df34f4
Rescaled internal MOM_diapyc_energy_req variables
Hallberg-NOAA Apr 13, 2020
500c9e3
Rescaled pressures in 17 calculate_density calls
Hallberg-NOAA Apr 13, 2020
00db8d5
Corrected a bug in calculate_spec_vol_derivs_H1_1d
Hallberg-NOAA Apr 13, 2020
2a951e7
Redirected various EOS interfaces to common code
Hallberg-NOAA Apr 13, 2020
04fcfd4
+Rescaled args to find_depth_of_pressure_in_cell
Hallberg-NOAA Apr 14, 2020
22215cb
Internal field index rotation
marshallward Apr 14, 2020
b72afce
+Made arguments to unit_scaling_init optional
Hallberg-NOAA Apr 14, 2020
a7836f0
+Rescaled variables in MOM_neutral_diffusion.F90
Hallberg-NOAA Apr 14, 2020
7643bce
Simpler calculate_density in ISOMIP_initialization
Hallberg-NOAA Apr 14, 2020
030a636
Nullify a pointer in neutral diffusion unit tests
Hallberg-NOAA Apr 15, 2020
ad0c70e
Rescaled three diagnosed densities
Hallberg-NOAA Apr 15, 2020
608d210
Rescaled pressures in wave speed calculations
Hallberg-NOAA Apr 15, 2020
a01dae5
Corrected 3 openMP declarations
Hallberg-NOAA Apr 15, 2020
bb73bb8
+(*)Rescaled pressures used to build coordinates
Hallberg-NOAA Apr 15, 2020
4182ad2
+Add optional US arg to calculate_compress
Hallberg-NOAA Apr 15, 2020
b84b2d3
Rescaled variables in convert_thickness
Hallberg-NOAA Apr 15, 2020
da12012
Minor cleanup related to pressure rescaling
Hallberg-NOAA Apr 15, 2020
ae944c2
Merge branch 'dev/gfdl' into rescale_pressure
Hallberg-NOAA Apr 15, 2020
87054b4
Added an omitted dOxygen comment
Hallberg-NOAA Apr 15, 2020
77b6b74
(*)Set loop bounds in calculate_density calls
Hallberg-NOAA Apr 15, 2020
a00c327
(*)Reordered setting calculate_density loop bounds
Hallberg-NOAA Apr 15, 2020
f632ffc
Explicit array rotation index; modulo chksum turns
marshallward Apr 15, 2020
c325f9c
Removes G_EARTH from OBCs
adcroft Apr 15, 2020
e8dba19
Merge branch 'index_rotation' into dev/gfdl
Hallberg-NOAA Apr 15, 2020
71d1c73
Merge branch 'dev/gfdl' into rm-gearth-from-obcs
marshallward Apr 16, 2020
b4c4f28
Resolve conflict with NOAA-GFDL/MOM6#1088
adcroft Apr 16, 2020
6c0e58b
Merge pull request #1090 from adcroft/rm-gearth-from-obcs
marshallward Apr 16, 2020
620a97c
Merge branch 'dev/gfdl' into rescale_pressure
Hallberg-NOAA Apr 16, 2020
68c53e9
Removes missing_value argument from APIs in MOM_diag_remap
adcroft Apr 16, 2020
ab9d8e9
+Added dom interface to calculate_density
Hallberg-NOAA Apr 17, 2020
415a6bc
Adds unit conversions to EOS type
adcroft Apr 17, 2020
c309289
Add doxygen comments for h_begin in diag_ctrl
Apr 16, 2020
acf23a4
Use the 'dom=' interface to calculate_density
Hallberg-NOAA Apr 17, 2020
18d520e
Remove optional US from most MOM_EOS functions
adcroft Apr 17, 2020
4f42d72
Fixed the spelling in an openMP directive
Hallberg-NOAA Apr 17, 2020
abecf02
Merge branch 'Hallberg-NOAA-rescale_pressure' into rescale_pressure
adcroft Apr 17, 2020
353f441
Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into rem…
Apr 17, 2020
0caf9cc
Missed a conflict resolution
adcroft Apr 17, 2020
371ed85
Initialize scaling params without EOS_init()
adcroft Apr 17, 2020
64901d1
Add optional limiter and fix unit tests
gustavo-marques Apr 17, 2020
2431416
Fix string continuation syntax
gustavo-marques Apr 17, 2020
9b53927
Rescaled internal MOM_CVMix variables
Hallberg-NOAA Apr 17, 2020
760dc39
+Rescaled variables in coord_adapt
Hallberg-NOAA Apr 17, 2020
cdeda16
Switched versions of calculate_density in 22 calls
Hallberg-NOAA Apr 19, 2020
7282956
Merge branch 'rescale_pressure' of git://github.com/adcroft/MOM6 into…
Hallberg-NOAA Apr 19, 2020
f0f894c
Merge branch 'Adcroft_rescale_pressure' into rescale_pressure
Hallberg-NOAA Apr 19, 2020
9c5239e
Corrected MOM_EOS dimensional rescaling problem
Hallberg-NOAA Apr 19, 2020
718c3ab
Removed US argument to find_depth_of_pressure_in_cell
Hallberg-NOAA Apr 19, 2020
e3c434e
Store return values from EOS_domain
Hallberg-NOAA Apr 19, 2020
3a817ef
Fixed a diagnostic halo extent
Hallberg-NOAA Apr 20, 2020
37d30b5
Eliminated the use of GV%mks_g_Earth
Hallberg-NOAA Apr 20, 2020
18b2193
Fixed compile time bugs in mom_surface_forcing_mct
Hallberg-NOAA Apr 20, 2020
f5eb171
Eliminated some US args in MOM_neutral_diffusion
Hallberg-NOAA Apr 20, 2020
59d2537
Merge pull request #1070 from ashao/remap_v_extensive
marshallward Apr 21, 2020
8cddc68
Merge branch 'dev/gfdl' into rescale_pressure
marshallward Apr 21, 2020
8a1e9b5
New option TEMP_SALT_INIT_VERTICAL_REMAP_ONLY
MJHarrison-GFDL Apr 21, 2020
8bb6b33
Merge remote-tracking branch 'origin' into TS_initial_ongrid
MJHarrison-GFDL Apr 21, 2020
e0d7acc
Improve performance of TS ongrid initialization
MJHarrison-GFDL Apr 21, 2020
c745c5b
Merge pull request #1089 from Hallberg-NOAA/rescale_pressure
marshallward Apr 21, 2020
d93ea73
Merge remote-tracking branch 'origin' into TS_initial_ongrid
MJHarrison-GFDL Apr 21, 2020
c88c818
Merge branch 'dev/gfdl' into rm-missing-value-from-diag-remap
marshallward Apr 21, 2020
156ae31
Merge branch 'dev/gfdl' into rescale_rigidity
Hallberg-NOAA Apr 21, 2020
c505ad3
Merge pull request #1091 from adcroft/rm-missing-value-from-diag-remap
marshallward Apr 21, 2020
6e2f334
Merge branch 'dev/gfdl' into fix_LBD_tests
marshallward Apr 21, 2020
dc69372
Fix parameter description for TEMP_SALT_INIT_VERTICAL_REMAP_ONLY
MJHarrison-GFDL Apr 22, 2020
178d429
Merge pull request #1092 from gustavo-marques/fix_LBD_tests
marshallward Apr 22, 2020
6a2c6d7
Merge branch 'dev/gfdl' into TS_initial_ongrid
MJHarrison-GFDL Apr 22, 2020
fb93ef4
Merge branch 'dev/gfdl' into rescale_rigidity
marshallward Apr 22, 2020
6bd6e02
Merge pull request #1094 from Hallberg-NOAA/rescale_rigidity
marshallward Apr 22, 2020
66ae905
+Add p_surf to pressures used to calculate density
Hallberg-NOAA Apr 23, 2020
1b2f7b4
Merge branch 'dev/gfdl' into TS_initial_ongrid
MJHarrison-GFDL Apr 23, 2020
21c655c
+Make wave speed calcs more robust via new options
Hallberg-NOAA Apr 23, 2020
760e41b
+Added reproducing_sum_EFP and EFP_sum_across_PEs
Hallberg-NOAA Apr 28, 2020
4a9650f
ROTATE_INDEX, INDEX_TURNS moved to debug params
marshallward Apr 28, 2020
40162d1
Merge pull request #1095 from Hallberg-NOAA/add_p_surf
marshallward Apr 28, 2020
4b992e0
Merge branch 'dev/gfdl' into better_wave_speeds
marshallward Apr 28, 2020
9cab5ef
Use deferred sums in MOM_sum_output
Hallberg-NOAA Apr 29, 2020
60a5f88
Merge branch 'dev/gfdl' into nuanced_repro_sums
Hallberg-NOAA Apr 29, 2020
130970e
Fix remapped diagnostic documentation
angus-g Apr 29, 2020
6493182
+Added EFP_lay_sums argument to reproducing_sum_3d
Hallberg-NOAA Apr 29, 2020
18d8f90
Do sums for write_energy on computational domain
Hallberg-NOAA Apr 29, 2020
9cb4b39
Use reproducing_sums in 3 diagnostic subroutines
Hallberg-NOAA Apr 29, 2020
7936f8e
Merge global sums for diagnostics
Hallberg-NOAA Apr 29, 2020
c4ae4b9
Merge branch 'dev/gfdl' into cp_dims
Hallberg-NOAA Apr 29, 2020
33c5c51
Merge pull request #1096 from Hallberg-NOAA/better_wave_speeds
marshallward Apr 29, 2020
ae525aa
Merge branch 'dev/gfdl' into cp_dims
Hallberg-NOAA Apr 29, 2020
c74416e
Merge branch 'dev/gfdl' into patch-1
marshallward Apr 29, 2020
dee0420
Merge pull request #1097 from marshallward/cp_dims
Hallberg-NOAA Apr 29, 2020
0c1646f
Merge branch 'dev/gfdl' into nuanced_repro_sums
Hallberg-NOAA Apr 29, 2020
2b09787
Merge branch 'dev/gfdl' into patch-1
marshallward Apr 29, 2020
12853fa
Merge pull request #1098 from angus-g/patch-1
marshallward Apr 29, 2020
e9d5065
Merge branch 'dev/gfdl' into nuanced_repro_sums
marshallward Apr 29, 2020
3c3167a
Merge pull request #1099 from Hallberg-NOAA/nuanced_repro_sums
marshallward Apr 30, 2020
3b0a2a6
Renamed all type(surface) variables to sfc_state
Hallberg-NOAA Apr 30, 2020
c6321d6
+Rescaled sfc_state%u and sfc_state%v
Hallberg-NOAA Apr 30, 2020
4b8fffc
+Rescaled sfc_state%sfc_density and sfc_state%Hml
Hallberg-NOAA Apr 30, 2020
897e0d3
Removes module MOM_PressureForce_blk_AFV.F90
adcroft Apr 30, 2020
5f7ce52
(*)Rescale frazil and p_surf_prev after restarts
Hallberg-NOAA Apr 30, 2020
a90a65e
+(*)Added US and m_to_BLD_units args to KPP_get_BLD
Hallberg-NOAA Apr 30, 2020
d820561
+Rescaled visc%MLD and Hml in diabatic to [Z]
Hallberg-NOAA May 1, 2020
bee6be7
+Rescaled sfc_state%frazil and other variables
Hallberg-NOAA May 1, 2020
6603451
Merge pull request #1101 from adcroft/rm-blocked-dens-integrals
Hallberg-NOAA May 1, 2020
2c2ce38
Merge branch 'dev/gfdl' into rescale_sfc_state
Hallberg-NOAA May 1, 2020
be2bd3e
Merge branch 'dev/gfdl' into TS_initial_ongrid
Hallberg-NOAA May 1, 2020
eb679d9
Merge branch 'Harrison_TS_initial_ongrid' into dev/gfdl
Hallberg-NOAA May 3, 2020
3bf6675
Merge branch 'dev/gfdl' into rescale_sfc_state
Hallberg-NOAA May 4, 2020
1c44924
Merge pull request #1102 from Hallberg-NOAA/rescale_sfc_state
marshallward May 4, 2020
3a04ca5
Scalar diag conversion; Q and R dimension scaling
marshallward May 4, 2020
2b6d7c6
Merge pull request #1103 from marshallward/q_r_scaling
Hallberg-NOAA May 4, 2020
e05054e
+Fix units in comments and parameter descriptions
Hallberg-NOAA May 7, 2020
a041a95
(*)Corrected loop bounds in build_adapt_column
Hallberg-NOAA May 7, 2020
3e28d61
Corrected rescaling with CONST_SEA_LEVEL
Hallberg-NOAA May 7, 2020
b7e3776
(*)Fix dimensional inconsistency in calc_CVMix_shear
Hallberg-NOAA May 7, 2020
450e954
fix out of bounds when nrows == 1
raphaeldussin May 7, 2020
70cfd64
Merge pull request #1104 from raphaeldussin/tridiag_det_fix
Hallberg-NOAA May 7, 2020
e16d7ec
Reduced the halo size in an update for eta
Hallberg-NOAA May 7, 2020
ce3df02
+Optionally correct timesteps in unsplit viscosity
Hallberg-NOAA May 7, 2020
c39ab9e
+Use time types to manage offline tracers
Hallberg-NOAA May 7, 2020
ea17a97
Corrected units in comments in coord_rho
Hallberg-NOAA May 7, 2020
0d983b5
(*)Fixed dimensionally inconsistent diagnostic remap
Hallberg-NOAA May 7, 2020
38077a7
Merge branch 'dev/gfdl' into units_cleanup
Hallberg-NOAA May 7, 2020
949b04f
dOxygenized a comment in MOM_dyn_unsplit_CS
Hallberg-NOAA May 7, 2020
6ed79a4
+Added FIX_UNSPLIT_DT_VISC_BUG to unsplit_RK2
Hallberg-NOAA May 8, 2020
b8c3570
+Add false position iteration for MLD to ePBL
Hallberg-NOAA May 9, 2020
f90a415
Corrected dOxygenization of two comments
Hallberg-NOAA May 10, 2020
6ca3184
Replaced array syntax additions in MOM_ice_shelf
Hallberg-NOAA May 11, 2020
9f7587a
Replaced array syntax in MOM_internal_tides
Hallberg-NOAA May 11, 2020
34196a2
Added array-syntax notation for full-array copies
Hallberg-NOAA May 11, 2020
e68a664
Removed duplicate dimension declarations
Hallberg-NOAA May 11, 2020
21c33b1
Merge scaling factors when reading Nikurashin input
Hallberg-NOAA May 11, 2020
a6445be
+Fixed pointer indexing in update_ALE_sponge_field
Hallberg-NOAA May 11, 2020
b2453e4
Added array-syntax notation for a full-array copy
Hallberg-NOAA May 11, 2020
aeac463
Initialized dMLD_min and dMLD_max in ePBL_column
Hallberg-NOAA May 11, 2020
3e7766a
Merge pull request #1108 from Hallberg-NOAA/array_syntax_cleanup
marshallward May 12, 2020
4b33dd0
(*)Corrected PPM_angular_advect
Hallberg-NOAA May 13, 2020
435fa9b
Makefile: reduced logging, -k support
marshallward May 14, 2020
663799d
Travis: remove test folding
marshallward May 14, 2020
a4cc8ca
Merge branch 'dev/gfdl' into small_log
marshallward May 14, 2020
3567d83
Makefile: codecov reporting
marshallward May 14, 2020
94ba945
Merge branch 'small_log' of https://github.com/marshallward/mom6 into…
marshallward May 14, 2020
c233e02
Makefile: copy codecov output to work, not results.
marshallward May 15, 2020
a289d85
Merge branch 'units_cleanup' of https://github.com/Hallberg-NOAA/MOM6…
adcroft May 15, 2020
f28a32a
Merge branch 'Hallberg-NOAA-units_cleanup' into dev/gfdl
adcroft May 15, 2020
36fde5d
Merge branch 'improved_ePBL_iterations' of https://github.com/Hallber…
adcroft May 15, 2020
514f875
Merge branch 'Hallberg-NOAA-improved_ePBL_iterations' into dev/gfdl
adcroft May 15, 2020
4eb0dbb
Merge branch 'fix_angular_advect' of https://github.com/Hallberg-NOAA…
adcroft May 15, 2020
4d7aeaf
Merge branch 'Hallberg-NOAA-fix_angular_advect' into dev/gfdl
adcroft May 15, 2020
8f57abf
Merge pull request #1110 from marshallward/small_log
adcroft May 15, 2020
634991d
Fixes an integer-kind mismatch in MOM_random, seed_from_time() (#1113)
adcroft May 19, 2020
48d208d
Merge branch 'dev-master-candidate-2020-05-15' into dev/master
adcroft May 29, 2020
3850530
merge GFDL dev/master May 29, 2020 commit (hash # 48d208d), which ref…
jiandewang Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ gnu:ocean-only-nolibs:
- make -f MRS/Makefile.build build/gnu/env && cd build/gnu
# mkdir -p build/gnu/repro/symmetric_dynamic/ocean_only && cd build/gnu/repro/symmetric_dynamic/ocean_only
- ../../MOM6-examples/src/mkmf/bin/list_paths -l ../../../config_src/{solo_driver,dynamic_symmetric} ../../../src ../../MOM6-examples/src/FMS
- sed -i '/FMS\/.*\/test_/d' path_names
- ../../MOM6-examples/src/mkmf/bin/mkmf -t ../../MOM6-examples/src/mkmf/templates/ncrc-gnu.mk -p MOM6 -c"-Duse_libMPI -Duse_netCDF" path_names
- time (source ./env ; make NETCDF=3 REPRO=1 MOM6 -s -j)

Expand All @@ -75,6 +76,7 @@ gnu:ice-ocean-nolibs:
- make -f MRS/Makefile.build build/gnu/env && cd build/gnu
# mkdir -p build/gnu/repro/symmetric_dynamic/ocean_only && cd build/gnu/repro/symmetric_dynamic/ocean_only
- ../../MOM6-examples/src/mkmf/bin/list_paths -l ../../../config_src/{coupled_driver,dynamic} ../../../src ../../MOM6-examples/src/{FMS,coupler,SIS2,icebergs,ice_param,land_null,atmos_null}
- sed -i '/FMS\/.*\/test_/d' path_names
- ../../MOM6-examples/src/mkmf/bin/mkmf -t ../../MOM6-examples/src/mkmf/templates/ncrc-gnu.mk -p MOM6 -c"-Duse_libMPI -Duse_netCDF -D_USE_LEGACY_LAND_ -Duse_AM3_physics" path_names
- time (source ./env ; make NETCDF=3 REPRO=1 MOM6 -s -j)

Expand Down
Loading