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

Dev master candidate 2018 04 22 #912

Merged
merged 225 commits into from
Apr 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
225 commits
Select commit Hold shift + click to select a range
e1536ee
Merge pull request #3 from NOAA-GFDL/dev/gfdl
jkrasting May 3, 2018
bb7612a
Updates to idealized hurricane routine for non-SCM (full domain) simu…
Aug 17, 2018
dcdd9ae
Effort to decimate the diag output at runtime
nikizadehgfdl Sep 5, 2018
bb8fa4a
Merge branch 'dev/gfdl' into user/bgr/ideal_hurricane_config
Sep 10, 2018
7c4adcb
Diag decimation prototype, coarsening by a factor of 2
nikizadehgfdl Sep 18, 2018
b9d714b
Diag decimation prototype, works for native and _z
nikizadehgfdl Sep 19, 2018
d1b15c4
Diag decimation prototype, requesting in diag_table
nikizadehgfdl Sep 27, 2018
8802dd2
Diag decimation prototype, requesting in diag_table
nikizadehgfdl Sep 27, 2018
7e3d368
Diag decimation prototype, fixing memory leaks
nikizadehgfdl Oct 1, 2018
dfe674c
Diag decimation prototype, aggregating methods
nikizadehgfdl Oct 4, 2018
5f3949f
Diag decimation prototype, fixed masks and cleanup
nikizadehgfdl Oct 5, 2018
373c232
Diag decimation prototype, fix masks for non-native grids
nikizadehgfdl Oct 10, 2018
6ef7d1d
Numerous modifications to improve Ideal hurricane config and wave fun…
Oct 10, 2018
71a348c
Merge branch 'dev/gfdl' into user/bgr/ideal_hurricane_config
Oct 10, 2018
8e29a1b
Updates to use the new idealized_hurricane test case.
Oct 14, 2018
05359f0
Renaming SCM_idealized_hurricane.F90 to Idealized_Hurricane.F90
Oct 14, 2018
654485e
Updates to idealized hurricane code style.
Oct 14, 2018
2dd042a
Diag decimation prototype, first attemp at general algorithm
nikizadehgfdl Oct 15, 2018
e48da04
Merge branch 'dev/gfdl' into user/bgr/ideal_hurricane_config
Oct 17, 2018
4e9c9bd
Add missing logical condition for v_extensive
nikizadehgfdl Oct 17, 2018
009d00b
Trailing whitespace
Oct 17, 2018
0a3335f
Diag decimation prototype, decimation algorithm extension
nikizadehgfdl Oct 18, 2018
ad3bcc1
Merge pull request #861 from nikizadehgfdl/patch-1
Hallberg-NOAA Oct 19, 2018
9763f8b
Rescale ISOMIP MIN_THICKNESS via get_param
Hallberg-NOAA Oct 19, 2018
3f5ee77
+Changed the units of Kd_add from m2 s-1 to Z2 s-1
Hallberg-NOAA Oct 19, 2018
58a683c
+Refactored Kelvin_set_OBC_data
Hallberg-NOAA Oct 19, 2018
45d3a47
Corrected scaling in hchksum calls for Kd_int
Hallberg-NOAA Oct 21, 2018
8491305
Corrected scaling in hchksum call for g_prime
Hallberg-NOAA Oct 21, 2018
b8a9a8b
+Added handling of underflows in kappa_shear
Hallberg-NOAA Oct 21, 2018
cf6f4d9
Merge branch 'dev/gfdl' into test_depth_units
Hallberg-NOAA Oct 21, 2018
313f47a
Merge branch 'user/bgr/ideal_hurricane_config' of https://github.com/…
Hallberg-NOAA Oct 22, 2018
d6ed12f
Merge branch 'breichl-user/bgr/ideal_hurricane_config' into dev/gfdl
Hallberg-NOAA Oct 22, 2018
2ff47d3
Merge branch 'dev/gfdl' into test_depth_units
Hallberg-NOAA Oct 22, 2018
908d3a8
Fixes bug (crash) if Langmuir number output is enabled but waves CS i…
Oct 22, 2018
813f387
Corrected chksum rescaling for e in thickness_diffuse
Hallberg-NOAA Oct 22, 2018
c9813e6
Recast SCM_CVMix_tests_TS_init to work in units of Z
Hallberg-NOAA Oct 22, 2018
1dee6fd
+Recast MOM_wave_interface to work in units of Z
Hallberg-NOAA Oct 22, 2018
d748764
Diag decimation, fixed the decimated fields indices
nikizadehgfdl Oct 23, 2018
cfcf555
Merge pull request #863 from breichl/user/bgr/KPP-LToutput_bugfix
Hallberg-NOAA Oct 23, 2018
9f45cce
Fix a typo in the description of USE_LEGACY_DIABATIC_DRIVER
gustavo-marques Oct 23, 2018
c6f1ac0
Add missing register* and safe_alloc* for wd
gustavo-marques Oct 23, 2018
861397c
Merge branch 'dev/gfdl' into nikizadeh_diag_decimation
nikizadehgfdl Oct 23, 2018
9f0076a
Corrected openMP directive errors in recent commit
Hallberg-NOAA Oct 23, 2018
d3eecef
(*)Fixed dimensional scaling for Boussinesq Flather
Hallberg-NOAA Oct 24, 2018
c0ffbf0
Add missing diag_id check before post_data
nikizadehgfdl Oct 24, 2018
438f6f5
Merge pull request #868 from nikizadehgfdl/patch-2
Hallberg-NOAA Oct 24, 2018
de8f1b6
Diag decimation, check the commensurate condition
nikizadehgfdl Oct 25, 2018
8b13c3b
Merge pull request #864 from Hallberg-NOAA/test_depth_units
adcroft Oct 25, 2018
e4c3847
Merge pull request #866 from Hallberg-NOAA/fix_openMP
adcroft Oct 25, 2018
256cc84
Merge pull request #867 from Hallberg-NOAA/fix_OBC_rescaling
adcroft Oct 25, 2018
339c9d2
Merge branch 'fix_wd_register' of https://github.com/gustavo-marques/…
adcroft Oct 25, 2018
0f34206
Merge branch 'gustavo-marques-fix_wd_register' into dev/gfdl
adcroft Oct 25, 2018
09489b4
(*)Fixed bugs in EBT mode wave speed calculation
Hallberg-NOAA Oct 26, 2018
368848f
Rescale values reported by PointAccel
Hallberg-NOAA Oct 26, 2018
d3244d6
+Add conversion argument to register_static_field
Hallberg-NOAA Oct 26, 2018
fce22cb
+Rescale depth inside of MEKE_lengthScales_0d
Hallberg-NOAA Oct 26, 2018
970f440
Simplify MOM_diagnostics code
Hallberg-NOAA Oct 26, 2018
b008d92
Recast MOM_sum_output to work in units of Z
Hallberg-NOAA Oct 26, 2018
ea8ed3e
Use local variables to rescale in MOM_Point_Accel
Hallberg-NOAA Oct 26, 2018
fe0c041
Diagnostics downsampling, implement suggestions in reviews
nikizadehgfdl Oct 26, 2018
9ebce02
Merge pull request #873 from NOAA-GFDL/dev-master-candidate-2018-10-15
Hallberg-NOAA Oct 26, 2018
16fef4f
Diagnostics downsampling, fix the issue for symmetric case
nikizadehgfdl Oct 26, 2018
abcf214
+Find diapyc_energy_req column height changes in Z
Hallberg-NOAA Oct 29, 2018
3034a4c
Find energetic_PBL column height changes in Z
Hallberg-NOAA Oct 29, 2018
1cfc384
Downsample Diagnostics, fix symmetric memory case
nikizadehgfdl Oct 30, 2018
4863472
+Added m_to_Z arg to horiz_interp_and_extrap_tracer
Hallberg-NOAA Oct 30, 2018
b3e712b
+Recast MOM_ALE_sponge to work in units of Z
Hallberg-NOAA Oct 30, 2018
9015a89
+Recast MOM_diag_to_Z to work in units of Z
Hallberg-NOAA Nov 1, 2018
7037258
Clarified comments in Idealized_Hurricane
Hallberg-NOAA Nov 1, 2018
618c475
Combined scaling factors in build_adapt_column
Hallberg-NOAA Nov 2, 2018
7853e83
Corrected comments in build_sigma_column
Hallberg-NOAA Nov 2, 2018
c98fb73
Diagnostics Downsample, implement Hallberg's suggestion
nikizadehgfdl Nov 2, 2018
ac5ff38
+Pass max_depth to initialize_regridding in Z
Hallberg-NOAA Nov 2, 2018
989b12c
Corrected comments in build_zlike_column
Hallberg-NOAA Nov 2, 2018
0948407
Set coord_adapt and coord_slight parameters in H
Hallberg-NOAA Nov 2, 2018
284591f
Calculate height-related diagnostics in Z
Hallberg-NOAA Nov 2, 2018
bfa9f84
Merge branch 'dev/gfdl' into test_depth_units
Hallberg-NOAA Nov 2, 2018
9b542c3
+Add MOM_unit_scaling module
Hallberg-NOAA Nov 6, 2018
533d495
+Replace GV%m_to_Z with US%m_to_Z
Hallberg-NOAA Nov 6, 2018
f8384ef
+Replace GV%Z_to_m with US%Z_to_m
Hallberg-NOAA Nov 6, 2018
04069b7
+Pass unit_scale_type argument to step_MOM_thermo
Hallberg-NOAA Nov 6, 2018
fa04b52
Corrected openMP directives
Hallberg-NOAA Nov 6, 2018
e1136e0
Rescale HMIX_SFC_PROP via get_param
Hallberg-NOAA Nov 6, 2018
2dd1d6b
Update cache dir for /lustre/f2
adcroft Nov 6, 2018
b05820d
Merge branch 'dev/master' into dev/gfdl
adcroft Nov 6, 2018
a6d0146
Added parameter in Neverland_initialization which allows to remove co…
MFJansen Nov 6, 2018
e4f19a9
Merge branch 'fix_EBT_wave_speed' of https://github.com/Hallberg-NOAA…
adcroft Nov 6, 2018
4fb9c26
Merge branch 'Hallberg-NOAA-fix_EBT_wave_speed' into dev/gfdl
adcroft Nov 6, 2018
720bb7a
Merge branch 'test_depth_units' of https://github.com/Hallberg-NOAA/M…
adcroft Nov 6, 2018
3b04fb2
Merge branch 'Hallberg-NOAA-test_depth_units' into dev/gfdl
adcroft Nov 6, 2018
8bfe0af
Merge branch 'dev/master' of https://github.com/NOAA-GFDL/MOM6 into d…
MFJansen Nov 6, 2018
fa1a762
+Added run-time parameters for benchmark test case
Hallberg-NOAA Nov 6, 2018
6ccb6b6
+Added a run-time parameter for circle_obcs
Hallberg-NOAA Nov 6, 2018
0874ac4
+Added the INTERFACE_IC_QUANTA runtime parameter
Hallberg-NOAA Nov 6, 2018
9259ba1
+Added run-time parameters for sloshing test case
Hallberg-NOAA Nov 6, 2018
0ace776
Added a comment in USER_initialize_thickness
Hallberg-NOAA Nov 6, 2018
4be6a21
Merge branch 'dev/gfdl' of https://github.com/MFJansen/MOM6 into MFJa…
adcroft Nov 7, 2018
48207cf
Merge branch 'dev/gfdl' into use_unit_scaling_type
Hallberg-NOAA Nov 7, 2018
4765084
Merge branch 'use_unit_scaling_type' into document_user_params
Hallberg-NOAA Nov 7, 2018
1db3fda
Merge branch 'MFJansen-dev/gfdl' into dev/gfdl
adcroft Nov 7, 2018
af5ce97
Merge branch 'use_unit_scaling_type' of https://github.com/Hallberg-N…
adcroft Nov 7, 2018
fe2736f
Merge branch 'Hallberg-NOAA-use_unit_scaling_type' into dev/gfdl
adcroft Nov 7, 2018
386aa80
Merge branch 'dev/gfdl' into document_user_params
Hallberg-NOAA Nov 7, 2018
fbf529a
Merge branch 'Hallberg-NOAA-document_user_params' into dev/gfdl
adcroft Nov 8, 2018
dfb9d9f
Corrected an openMP directive
Hallberg-NOAA Nov 8, 2018
718e1d9
+Recast ice_shelf code to work in units of Z
Hallberg-NOAA Nov 8, 2018
c8eeaab
+Changed units of ustar from m/s to Z/s
Hallberg-NOAA Nov 9, 2018
a4fcbd3
Split excessively long lines
Hallberg-NOAA Nov 9, 2018
d4b0276
Merge pull request #877 from Hallberg-NOAA/document_user_params
adcroft Nov 12, 2018
4605c86
modified: src/parameterizations/lateral/MOM_MEKE.F90
hlkong Nov 12, 2018
3e67206
+Changed units of fluxes%ustar_shelf to Z/s
Hallberg-NOAA Nov 13, 2018
fba65d2
Merge branch 'dev/gfdl' into rescale_ustar
Hallberg-NOAA Nov 13, 2018
9e81fb5
modified: src/parameterizations/lateral/MOM_MEKE.F90
hlkong Nov 13, 2018
639cfbf
modified: src/parameterizations/lateral/MOM_MEKE.F90
hlkong Nov 13, 2018
ae07097
modified: src/parameterizations/lateral/MOM_MEKE.F90
hlkong Nov 13, 2018
cbb5480
modified: src/parameterizations/lateral/MOM_MEKE.F90
hlkong Nov 14, 2018
8f62d18
Corrected 8 comments
Hallberg-NOAA Nov 14, 2018
dcdc509
+Add US arg to set_up_ALE_sponge_vel_field_varying
Hallberg-NOAA Nov 14, 2018
375bab5
+Rescaled variables in MOM_internal_tides
Hallberg-NOAA Nov 14, 2018
967e470
+Rescaled variables in MOM_tidal_mixing
Hallberg-NOAA Nov 14, 2018
9ac67cc
+Add unit_scale_type argument to tracer_Z_init
Hallberg-NOAA Nov 14, 2018
47909a1
Added perturbations to initial layer thicknesses in Neverland
MFJansen Nov 14, 2018
d2bfd73
+Add unit_scale_type argument to diag_remap_update
Hallberg-NOAA Nov 14, 2018
366efc8
+Add unit_scale_type arg to MOM_initialize_fixed
Hallberg-NOAA Nov 15, 2018
6c47801
+Add unit_scale_type arg to MOM_sum_output_init
Hallberg-NOAA Nov 15, 2018
3d4c891
+Add optional unit_scale_type arg to initialize_masks
Hallberg-NOAA Nov 15, 2018
fac1464
+Eliminated Zd_to_m from grid types
Hallberg-NOAA Nov 15, 2018
5810cf0
Recast internal MOM_barotropic variables into Z
Hallberg-NOAA Nov 15, 2018
a39bc70
Merge pull request #880 from Hallberg-NOAA/rescale_ustar
adcroft Nov 15, 2018
525e047
Merge pull request #881 from Hallberg-NOAA/correct_comments
adcroft Nov 15, 2018
2b815fb
Merge branch 'topoMEKE' of https://github.com/hlkong/MOM6 into hlkong…
adcroft Nov 15, 2018
4491b84
Corrected soma comment/doxygen syntax
adcroft Nov 15, 2018
7f73764
+Recast ustar_gustless into Z/s
Hallberg-NOAA Nov 15, 2018
f909e93
Merge branch 'dev/gfdl' into eliminate_Zd_to_m
Hallberg-NOAA Nov 15, 2018
1297ebf
Fixed line wrap in new parameter documentation
adcroft Nov 16, 2018
2a0b4f9
Merge branch 'hlkong-topoMEKE' into dev/gfdl
adcroft Nov 16, 2018
a1653f6
+Rescale depth in DOME_initialize_topography
Hallberg-NOAA Nov 16, 2018
771e44f
+Rescale depth in ISOMIP_initialize_topography
Hallberg-NOAA Nov 16, 2018
f272edc
+Rescale depth in Kelvin_initialize_topography
Hallberg-NOAA Nov 16, 2018
e543439
+Rescale depth in Phillips_initialize_topography
Hallberg-NOAA Nov 16, 2018
c40b482
+Rescale depth in benchmark_initialize_topography
Hallberg-NOAA Nov 16, 2018
8560c62
+Rescale depth in shelfwave_initialize_topography
Hallberg-NOAA Nov 16, 2018
c9517fe
+Rescale depth in USER_initialize_topography
Hallberg-NOAA Nov 16, 2018
74014e7
Better comments in initialize_topography routines
Hallberg-NOAA Nov 16, 2018
bc808be
+Rescale topography in MOM_shared_initialization
Hallberg-NOAA Nov 16, 2018
604a716
Rescale topography during initialization
Hallberg-NOAA Nov 16, 2018
de69ac0
Merge branch 'dev/gfdl' of https://github.com/MFJansen/MOM6 into MFJa…
adcroft Nov 19, 2018
45a6400
Added run-time parameter for Neverland perturbation
adcroft Nov 19, 2018
5e5e315
Adds random noise option for Neverland IC
adcroft Nov 19, 2018
2925a58
Merge branch 'MFJansen-dev/gfdl' into dev/gfdl
adcroft Nov 19, 2018
50d1aeb
Merge branch 'eliminate_Zd_to_m' of https://github.com/Hallberg-NOAA/…
adcroft Nov 19, 2018
378eb63
Merge branch 'Hallberg-NOAA-eliminate_Zd_to_m' into dev/gfdl
adcroft Nov 19, 2018
27e3a1d
Merge branch 'rescale_topography' of https://github.com/Hallberg-NOAA…
adcroft Nov 19, 2018
28a83f1
Merge branch 'Hallberg-NOAA-rescale_topography' into dev/gfdl
adcroft Nov 19, 2018
16d0745
This update fixes compilation issues of ESM
nikizadehgfdl Nov 21, 2018
9d7099f
Merge branch 'dev/gfdl' into nikizadeh_diag_decimation
nikizadehgfdl Nov 26, 2018
48a4915
Merge branch 'nikizadehgfdl/fix_compile_generics' into nikizadeh_diag…
nikizadehgfdl Nov 26, 2018
47a3574
Merge pull request #885 from nikizadehgfdl/nikizadehgfdl/fix_compile_…
Hallberg-NOAA Nov 26, 2018
62709d7
Extended comments to clarify Z units
Hallberg-NOAA Dec 3, 2018
83b410d
Added comments explaining the '~>' notation
Hallberg-NOAA Dec 15, 2018
f8ee1e6
Renamed internal variables in EF4
Hallberg-NOAA Dec 17, 2018
80b7ba9
Extended comments to clarify H units
Hallberg-NOAA Dec 17, 2018
53f947c
Reduced use of square brackets in comments
Hallberg-NOAA Dec 17, 2018
c2d6ff1
Further reduced use of square brackets in comments
Hallberg-NOAA Dec 17, 2018
0e2066d
Use square-bracket syntax in unit documentation
Hallberg-NOAA Dec 19, 2018
7dab975
Updated comments explaining the '~>' notation
Hallberg-NOAA Dec 19, 2018
ad18eaf
Use square-brackets in height documentation
Hallberg-NOAA Dec 19, 2018
9df0655
Use square-brackets in thickness documentation
Hallberg-NOAA Dec 19, 2018
e424e0b
Document additional thickness variable units
Hallberg-NOAA Dec 20, 2018
23eea80
Document more variable units with square brackets
Hallberg-NOAA Dec 20, 2018
dd34d00
Document velocity units with square brackets
Hallberg-NOAA Dec 20, 2018
17c4608
Document frequency units with square brackets
Hallberg-NOAA Dec 21, 2018
00a8cdc
dOxyGenize ice_solo_driver/MOM_surface_forcing.F90
Hallberg-NOAA Dec 21, 2018
78e9659
Documented miscellaneous variable units
Hallberg-NOAA Dec 21, 2018
6976ac6
Documented density variable units
Hallberg-NOAA Dec 21, 2018
e0c3d49
Documented temperature variable units
Hallberg-NOAA Dec 21, 2018
3d0c946
Documented units of 280 more variables
Hallberg-NOAA Dec 22, 2018
00b3289
Documented units of 110 core variables
Hallberg-NOAA Dec 22, 2018
026f7d8
Documented units of 50 grid variables
Hallberg-NOAA Dec 22, 2018
c2473a7
Documented 300 miscellaneous variable units
Hallberg-NOAA Jan 29, 2019
bf1fa4b
Documented 288 parameterization variable units
Hallberg-NOAA Jan 29, 2019
ea5c097
Documented 116 tracer variable units
Hallberg-NOAA Jan 29, 2019
dea748a
Documented 170 variable units
Hallberg-NOAA Jan 29, 2019
06631bd
Documented 93 thermodynamic variable units
Hallberg-NOAA Jan 30, 2019
c401055
Merge pull request #886 from Hallberg-NOAA/unit_rescale_comments
adcroft Jan 31, 2019
6d77f39
Merge branch 'dev/gfdl' into nikizadeh_diag_decimation
nikizadehgfdl Jan 31, 2019
8233da2
Diagnostics downsampling, shorten line more than 120 chars long
nikizadehgfdl Jan 31, 2019
6dd6f52
Merge branch 'dev/master' into dev/gfdl
adcroft Feb 7, 2019
9b7b127
+New variants of safe_alloc_ptr & safe_alloc_alloc
Hallberg-NOAA Feb 27, 2019
0ff4c5b
Trap or deal with instances when dt=0 in diabatic
Hallberg-NOAA Feb 27, 2019
b6fa342
+Opt args to step_MOM can override DIABATIC_FIRST
Hallberg-NOAA Feb 27, 2019
1603ed9
Fix bug causing openmp answers change
nikizadehgfdl Mar 1, 2019
0a1a313
Correct thermo clock with update_ocean_model calls
Hallberg-NOAA Mar 11, 2019
c19640b
changes vector notation and fixes typos
navidcy Mar 12, 2019
b8cdd7c
fixes typo and adds Angus link
navidcy Mar 12, 2019
d263de4
some more typos and a few nablas that were left unbolded
navidcy Mar 12, 2019
37378cf
adds parentheses in general-coordinate versions of temp and sal
navidcy Mar 12, 2019
319ed39
adds parentheses in general-coordinate versions of temp and sal
navidcy Mar 12, 2019
8256a11
fixes notation in mom_hor_visc module documentation
navidcy Mar 12, 2019
9997f41
Merge pull request #897 from nikizadehgfdl/nikizadehgfdl/fix_openmp_a…
Hallberg-NOAA Mar 13, 2019
3ebcb68
Merge pull request #896 from Hallberg-NOAA/coupling_options
adcroft Mar 18, 2019
8a979c3
fixes geopotential gradient term in governing eqs.
navidcy Mar 18, 2019
b42683d
fixes geopotential gradient term in eqs and typo in \nabla def in not…
navidcy Mar 18, 2019
f9f0327
undo changes in MOM_hor_visc.F90 doc
navidcy Mar 18, 2019
00f634b
Merge pull request #869 from nikizadehgfdl/nikizadeh_diag_decimation
Hallberg-NOAA Mar 26, 2019
d93b047
Merge pull request #901 from navidcy/UpdatesDocEquations
adcroft Apr 1, 2019
d3a57bc
+Added dimensional rescaling of Coriolis parameter
Hallberg-NOAA Apr 9, 2019
dc2e629
Travis: switch to mpich2
adcroft Apr 9, 2019
aceda8f
Merge pull request #906 from adcroft/travis-switch-to-mpich2
Hallberg-NOAA Apr 9, 2019
833d9ae
Merge branch 'dev/gfdl' into rescale_Coriolis
Hallberg-NOAA Apr 9, 2019
2d4161c
Fix doxygen typos
adcroft Apr 10, 2019
f3e4d7b
Doxygenized down sampling routine in diag_mediator
adcroft Apr 10, 2019
8bf6c9e
Merge pull request #5 from NOAA-GFDL/dev/gfdl
jkrasting Apr 11, 2019
dd7607d
Merge pull request #905 from Hallberg-NOAA/rescale_Coriolis
adcroft Apr 11, 2019
f7f3286
Logic to flag obsolete restart fields
jkrasting Apr 11, 2019
a298880
Registering Kd_turb and Kv_turb as obsolete restart fields
jkrasting Apr 11, 2019
63bcf5b
Merge pull request #907 from adcroft/doxy-down-sampling
Hallberg-NOAA Apr 11, 2019
d821a67
Merge branch 'dev/master' into dev/gfdl
adcroft Apr 12, 2019
2c89df5
dOxygenize for obsolete restarts, tweak to FATAL message
jkrasting Apr 12, 2019
317f91b
Merge pull request #908 from jkrasting/user/jpk/trap-kd-turb
Hallberg-NOAA Apr 12, 2019
69e6d30
Re-factor of Travis-CI usage
adcroft Apr 16, 2019
265d01b
Set ca13csed to zero at k>1
jkrasting Apr 11, 2019
8ade0a6
Merge pull request #910 from jkrasting/zero_out_13C_cased
adcroft Apr 17, 2019
91c8083
Merge pull request #909 from adcroft/travis-stages
marshallward Apr 17, 2019
8d92e78
+Added missing US arguments to nuopc_cap code
Hallberg-NOAA Apr 23, 2019
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
77 changes: 77 additions & 0 deletions .testing/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Makefile steps to run on Travis-CI
# e.g. make MEMORY_SHAPE=dynamic_symmetric REPRO=1 OPENMP=1

# Versions to use
FMS_COMMIT ?= xanadu
MKMF_COMMIT ?= master

# Where to clone from
FMS_URL ?= https://github.com/NOAA-GFDL/FMS.git
MKMF_URL ?= https://github.com/NOAA-GFDL/mkmf.git
CONFIGS_URL ?= https://github.com/NOAA-GFDL/MOM6-examples.git
REGRESSIONS_URL ?= https://github.com/adcroft/Gaea-stats-MOM6-examples

# Experiments to run
ifeq ($(MEMORY_SHAPE),"dynamic_symmetric")
EXPERIMENTS ?= unit_tests double_gyre flow_downslope/z CVmix_SCM_tests/cooling_only/EPBL circle_obcs
else
EXPERIMENTS ?= unit_tests double_gyre flow_downslope/z CVmix_SCM_tests/cooling_only/EPBL
endif

FMS_PACKAGES ?= platform,include,memutils,constants,mpp,fms,time_manager,diag_manager,data_override,coupler/ensemble_manager.F90,axis_utils,horiz_interp,time_interp,astronomy,mosaic,random_numbers
TEMPLATE ?= .testing/linux-ubuntu-xenial-gnu.mk
MPIRUN ?= mpirun

# MEMORY_SHAPE must be defined for this Makefile to work
MEMORY_SHAPE ?= dynamic_symmetric

# Everything above is above is "configurable" with environment variables
SHELL = bash

# Path where executable will be built
BUILD_PATH = build
###/$(MEMORY_SHAPE)-$(EXEC_MODE)
# Root of configurations (MOM6-examples)
EXPERIMENTS_ROOT = experiments
# Regression results
REGRESSIONS_ROOT = answers

.PRECIOUS: %/ocean.stats

run: $(foreach e,$(EXPERIMENTS),$(EXPERIMENTS_ROOT)/ocean_only/$(e)/ocean.stats)

test: $(foreach e,$(EXPERIMENTS),$(REGRESSIONS_ROOT)/regressions/ocean_only/$(e)/ocean.stats.gnu)

compile: $(BUILD_PATH)/MOM6

$(BUILD_PATH)/MOM6: FMS mkmf
mkdir -p $(@D)
cd $(@D); \
../mkmf/bin/list_paths -l ../FMS/{$(FMS_PACKAGES)} ../config_src/{$(MEMORY_SHAPE),solo_driver} ../src \
&& ../mkmf/bin/mkmf -t ../$(TEMPLATE) -c '-Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -DMAXFIELDMETHODS_=500' -p $(@F) path_names \
&& make -j NETCDF=3 $(@F)

$(EXPERIMENTS_ROOT)/%/ocean.stats: $(EXPERIMENTS_ROOT)
mkdir -p $(@D)/RESTART
cd $(@D) ; $(MPIRUN) -n 1 $(PWD)/$(BUILD_PATH)/MOM6

$(REGRESSIONS_ROOT)/regressions/%/ocean.stats.gnu: $(EXPERIMENTS_ROOT)/%/ocean.stats $(REGRESSIONS_ROOT)
cp $< $@
cd $(@D) ; git status --porcelain $(@F)

# Targets to clone repositories needed to build
FMS:
git clone -q $(FMS_URL)
cd $@ ; git checkout -q $(FMS_COMMIT)

mkmf:
git clone -q $(MKMF_URL)
cd $@ ; git checkout -q $(MKMF_COMMIT)

$(EXPERIMENTS_ROOT):
mkdir -p $(@D)
cd $(@D) ; git clone --depth 1 $(CONFIGS_URL) experiments

$(REGRESSIONS_ROOT):
mkdir -p $(@D)
cd $(@D) ; git clone --depth 1 $(REGRESSIONS_URL) answers
3 changes: 3 additions & 0 deletions .testing/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# .testing

This directory contains scripts used when evaluating commits on Travis-CI
4 changes: 4 additions & 0 deletions .testing/configure
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash

echo "Configured!" $MAKEARGS
touch build/test_${MAKEARGS//\ /_}
273 changes: 273 additions & 0 deletions .testing/linux-ubuntu-xenial-gnu.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,273 @@
# Template for the GNU Compiler Collection on Xenial version of Ubuntu Linux systems (used by Travis-CI)
#
# Typical use with mkmf
# mkmf -t linux-ubuntu-xenial-gnu.mk -c"-Duse_libMPI -Duse_netCDF" path_names /usr/local/include

############
# Commands Macors
FC = mpif90
CC = mpicc
LD = mpif90 $(MAIN_PROGRAM)

#######################
# Build target macros
#
# Macros that modify compiler flags used in the build. Target
# macrose are usually set on the call to make:
#
# make REPRO=on NETCDF=3
#
# Most target macros are activated when their value is non-blank.
# Some have a single value that is checked. Others will use the
# value of the macro in the compile command.

DEBUG = # If non-blank, perform a debug build (Cannot be
# mixed with REPRO or TEST)

REPRO = # If non-blank, erform a build that guarentees
# reprodicuibilty from run to run. Cannot be used
# with DEBUG or TEST

TEST = # If non-blank, use the compiler options defined in
# the FFLAGS_TEST and CFLAGS_TEST macros. Cannot be
# use with REPRO or DEBUG

VERBOSE = # If non-blank, add additional verbosity compiler
# options

OPENMP = # If non-blank, compile with openmp enabled

NO_OVERRIDE_LIMITS = # If non-blank, do not use the -qoverride-limits
# compiler option. Default behavior is to compile
# with -qoverride-limits.

NETCDF = # If value is '3' and CPPDEFS contains
# '-Duse_netCDF', then the additional cpp macro
# '-Duse_LARGEFILE' is added to the CPPDEFS macro.

INCLUDES = # A list of -I Include directories to be added to the
# the compile command.

SSE = # The SSE options to be used to compile. If blank,
# than use the default SSE settings for the host.
# Current default is to use SSE2.

COVERAGE = # Add the code coverage compile options.

# Need to use at least GNU Make version 3.81
need := 3.81
ok := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
ifneq ($(need),$(ok))
$(error Need at least make version $(need). Load module gmake/3.81)
endif

# REPRO, DEBUG and TEST need to be mutually exclusive of each other.
# Make sure the user hasn't supplied two at the same time
ifdef REPRO
ifneq ($(DEBUG),)
$(error Options REPRO and DEBUG cannot be used together)
else ifneq ($(TEST),)
$(error Options REPRO and TEST cannot be used together)
endif
else ifdef DEBUG
ifneq ($(TEST),)
$(error Options DEBUG and TEST cannot be used together)
endif
endif

MAKEFLAGS += --jobs=$(shell grep '^processor' /proc/cpuinfo | wc -l)

# Macro for Fortran preprocessor
FPPFLAGS := $(INCLUDES)
# Fortran Compiler flags for the NetCDF library
FPPFLAGS += $(shell nf-config --fflags)

# Base set of Fortran compiler flags
FFLAGS := -fcray-pointer -fdefault-double-8 -fdefault-real-8 -Waliasing -ffree-line-length-none -fno-range-check

# Flags based on perforance target (production (OPT), reproduction (REPRO), or debug (DEBUG)
FFLAGS_OPT = -O3
FFLAGS_REPRO = -O2 -fbounds-check
FFLAGS_DEBUG = -O0 -g -W -fbounds-check -fbacktrace -ffpe-trap=invalid,zero,overflow

# Flags to add additional build options
FFLAGS_OPENMP = -fopenmp
FFLAGS_VERBOSE =
FFLAGS_COVERAGE =

# Macro for C preprocessor
CPPFLAGS = $(INCLUDES)
# C Compiler flags for the NetCDF library
CPPFLAGS += $(shell nf-config --cflags)

# Base set of C compiler flags
CFLAGS := -D__IFC

# Flags based on perforance target (production (OPT), reproduction (REPRO), or debug (DEBUG)
CFLAGS_OPT = -O2
CFLAGS_REPRO = -O2
CFLAGS_DEBUG = -O0 -g

# Flags to add additional build options
CFLAGS_OPENMP = -fopenmp
CFLAGS_VERBOSE =
CFLAGS_COVERAGE =

# Optional Testing compile flags. Mutually exclusive from DEBUG, REPRO, and OPT
# *_TEST will match the production if no new option(s) is(are) to be tested.
FFLAGS_TEST = $(FFLAGS_OPT)
CFLAGS_TEST = $(CFLAGS_OPT)

# Linking flags
LDFLAGS :=
LDFLAGS_OPENMP := -fopenmp
LDFLAGS_VERBOSE :=
LDFLAGS_COVERAGE :=

# Start with a blank LIBS
LIBS =
# NetCDF library flags
LIBS += $(shell nf-config --flibs)

# Get compile flags based on target macros.
ifdef REPRO
CFLAGS += $(CFLAGS_REPRO)
FFLAGS += $(FFLAGS_REPRO)
else ifdef DEBUG
CFLAGS += $(CFLAGS_DEBUG)
FFLAGS += $(FFLAGS_DEBUG)
else ifdef TEST
CFLAGS += $(CFLAGS_TEST)
FFLAGS += $(FFLAGS_TEST)
else
CFLAGS += $(CFLAGS_OPT)
FFLAGS += $(FFLAGS_OPT)
endif

ifdef OPENMP
CFLAGS += $(CFLAGS_OPENMP)
FFLAGS += $(FFLAGS_OPENMP)
LDFLAGS += $(LDFLAGS_OPENMP)
endif

ifdef SSE
CFLAGS += $(SSE)
FFLAGS += $(SSE)
endif

ifdef NO_OVERRIDE_LIMITS
FFLAGS += $(FFLAGS_OVERRIDE_LIMITS)
endif

ifdef VERBOSE
CFLAGS += $(CFLAGS_VERBOSE)
FFLAGS += $(FFLAGS_VERBOSE)
LDFLAGS += $(LDFLAGS_VERBOSE)
endif

ifeq ($(NETCDF),3)
# add the use_LARGEFILE cppdef
ifneq ($(findstring -Duse_netCDF,$(CPPDEFS)),)
CPPDEFS += -Duse_LARGEFILE
endif
endif

ifdef COVERAGE
ifdef BUILDROOT
PROF_DIR=-prof-dir=$(BUILDROOT)
endif
CFLAGS += $(CFLAGS_COVERAGE) $(PROF_DIR)
FFLAGS += $(FFLAGS_COVERAGE) $(PROF_DIR)
LDFLAGS += $(LDFLAGS_COVERAGE) $(PROF_DIR)
endif

LDFLAGS += $(LIBS)

#---------------------------------------------------------------------------
# you should never need to change any lines below.

# see the MIPSPro F90 manual for more details on some of the file extensions
# discussed here.
# this makefile template recognizes fortran sourcefiles with extensions
# .f, .f90, .F, .F90. Given a sourcefile <file>.<ext>, where <ext> is one of
# the above, this provides a number of default actions:

# make <file>.opt create an optimization report
# make <file>.o create an object file
# make <file>.s create an assembly listing
# make <file>.x create an executable file, assuming standalone
# source
# make <file>.i create a preprocessed file (for .F)
# make <file>.i90 create a preprocessed file (for .F90)

# The macro TMPFILES is provided to slate files like the above for removal.

RM = rm -f
TMPFILES = .*.m *.B *.L *.i *.i90 *.l *.s *.mod *.opt

.SUFFIXES: .F .F90 .H .L .T .f .f90 .h .i .i90 .l .o .s .opt .x

.f.L:
$(FC) $(FFLAGS) -c -listing $*.f
.f.opt:
$(FC) $(FFLAGS) -c -opt_report_level max -opt_report_phase all -opt_report_file $*.opt $*.f
.f.l:
$(FC) $(FFLAGS) -c $(LIST) $*.f
.f.T:
$(FC) $(FFLAGS) -c -cif $*.f
.f.o:
$(FC) $(FFLAGS) -c $*.f
.f.s:
$(FC) $(FFLAGS) -S $*.f
.f.x:
$(FC) $(FFLAGS) -o $*.x $*.f *.o $(LDFLAGS)
.f90.L:
$(FC) $(FFLAGS) -c -listing $*.f90
.f90.opt:
$(FC) $(FFLAGS) -c -opt_report_level max -opt_report_phase all -opt_report_file $*.opt $*.f90
.f90.l:
$(FC) $(FFLAGS) -c $(LIST) $*.f90
.f90.T:
$(FC) $(FFLAGS) -c -cif $*.f90
.f90.o:
$(FC) $(FFLAGS) -c $*.f90
.f90.s:
$(FC) $(FFLAGS) -c -S $*.f90
.f90.x:
$(FC) $(FFLAGS) -o $*.x $*.f90 *.o $(LDFLAGS)
.F.L:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -listing $*.F
.F.opt:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -opt_report_level max -opt_report_phase all -opt_report_file $*.opt $*.F
.F.l:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c $(LIST) $*.F
.F.T:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -cif $*.F
.F.f:
$(FC) $(CPPDEFS) $(FPPFLAGS) -EP $*.F > $*.f
.F.i:
$(FC) $(CPPDEFS) $(FPPFLAGS) -P $*.F
.F.o:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c $*.F
.F.s:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -S $*.F
.F.x:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -o $*.x $*.F *.o $(LDFLAGS)
.F90.L:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -listing $*.F90
.F90.opt:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -opt_report_level max -opt_report_phase all -opt_report_file $*.opt $*.F90
.F90.l:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c $(LIST) $*.F90
.F90.T:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -cif $*.F90
.F90.f90:
$(FC) $(CPPDEFS) $(FPPFLAGS) -EP $*.F90 > $*.f90
.F90.i90:
$(FC) $(CPPDEFS) $(FPPFLAGS) -P $*.F90
.F90.o:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c $*.F90
.F90.s:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -c -S $*.F90
.F90.x:
$(FC) $(CPPDEFS) $(FPPFLAGS) $(FFLAGS) -o $*.x $*.F90 *.o $(LDFLAGS)
Loading