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

Fix bad gotm path in ocean build #862

Closed
wants to merge 1,146 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
1146 commits
Select commit Hold shift + click to select a range
328ab12
Update halos to 3; set thermal thickness min to 0
matthewhoffman Dec 15, 2020
7806216
Merge branch 'landice/increase_halo' into landice/develop
matthewhoffman Dec 15, 2020
2167f8b
Update with bug fix to add ocean_coupling
proteanplanet Dec 16, 2020
41b46a0
Switch to blackbody coupling for sea ice
Dec 16, 2020
60b2c88
Merge branch 'proteanplanet/proteanplanet/tocnfrz' into master
akturner Dec 17, 2020
0347e8b
Fixed bug with high frequency coupling
akturner Dec 17, 2020
18390d4
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Dec 17, 2020
6cf5a73
Merge branch 'akturner/seaice/high_freq_coupling_bug' into seaice/dev…
akturner Dec 18, 2020
8163f34
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Dec 21, 2020
424be1a
Added square test case
akturner Dec 21, 2020
8cca37d
Merge branch 'proteanplanet/proteanplanet/seaiceemis' into seaice/dev…
akturner Dec 21, 2020
2168ab6
Merge pull request #1 from akturner/seaice/square_testcase
akturner Dec 21, 2020
a7505ce
correct scratch var definition and change sigma type to persistent fo…
Dec 22, 2020
ccb0b28
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Dec 22, 2020
3fcd73d
Add basalTemperature as restart variable
matthewhoffman Dec 23, 2020
bcc5907
In interface, only use temperatures where MPAS calculates them
matthewhoffman Dec 23, 2020
5e22960
Merge branch 'landice/thermal_consistency' into landice/develop
matthewhoffman Dec 23, 2020
d7a6b48
Merge branch 'njeffery/seaice/njeffery_algalGraze' into seaice/develop
akturner Jan 5, 2021
6e1f0ed
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Jan 5, 2021
e59622a
Added one dimensional velocity testcase
akturner Jan 7, 2021
5658945
Merge pull request #2 from akturner/seaice/one_dimensional_velocity_t…
akturner Jan 7, 2021
ff3717e
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Jan 11, 2021
5c8b841
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Jan 13, 2021
1fbe32b
Added one dimensional velocity hex test case
akturner Jan 13, 2021
e831003
Merge pull request #3 from akturner/seaice/one_dimensional_hex
akturner Jan 13, 2021
eef1795
Correct scaling of thermal thickness limit
matthewhoffman Jan 14, 2021
e33e8a5
Merge branch 'landice/fix_thermal_thickness_scaling_bug' into landice…
matthewhoffman Jan 14, 2021
bcebf2a
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Jan 15, 2021
c4783b0
Merge PR #772 'pwjones/ocean/gpuvel1' into ocean/develop
mattdturner Jan 19, 2021
37e93e4
Merge branch 'ocean/develop' into e3sm/develop
mattdturner Jan 19, 2021
77dfb3b
Move all stress calcs. to velocity module.
stephenprice Jan 19, 2021
c3ea5ef
Improvements to square test case
akturner Jan 20, 2021
6823610
Merge pull request #4 from akturner/seaice/two_dimensional_hex_square…
akturner Jan 20, 2021
cc509ea
Added ridging island test case
akturner Jan 20, 2021
b6e2fde
Merge pull request #5 from akturner/seaice/ridging_island_testcase
akturner Jan 21, 2021
ac73718
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Jan 21, 2021
f994f29
Modifications to square test case
akturner Jan 22, 2021
ec17590
Merge branch 'akturner/seaice/square_testcase_mods' into akturner/sea…
akturner Jan 23, 2021
1c09fa1
Added strain stress divergence test case
akturner Jan 23, 2021
e10e5dc
Merge pull request #7 from akturner/seaice/strain_stress_divergence_t…
akturner Jan 23, 2021
d98c1b1
Fixed bug with threading in column messages
akturner Jan 25, 2021
9eeb540
Merge branch 'akturner/seaice/column_messages_threading_bug' into sea…
akturner Jan 25, 2021
4695cc9
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Jan 26, 2021
8153a8d
Add missing err initialization
xylar Jan 27, 2021
12b23f6
Merge branch 'ocean/develop' into e3sm/develop
mattdturner Jan 28, 2021
482672d
Added spherical strain operator test case
akturner Jan 28, 2021
ffd864e
Merge branch 'akturner/seaice/strain_testcase' into seaice/standalone…
akturner Jan 28, 2021
858544d
Velocity solver refactor
akturner Jan 29, 2021
cfe1c99
Merge branch 'akturner/seaice/refactor_strain_stress_div_operators' i…
akturner Jan 29, 2021
13f5bee
Add stress divergence test case
akturner Jan 29, 2021
e4765f1
Merge branch 'akturner/seaice/stress_divergence_testcase' into seaice…
akturner Jan 29, 2021
6d90a54
Added option for weak strain and variational stress divergence
akturner Jan 30, 2021
2eb463b
Merge branch 'akturner/seaice/mixed_velocity_schemes' into seaice/sta…
akturner Jan 31, 2021
f834da9
Added alternate method of calculating variational denominator
akturner Jan 31, 2021
7ad9946
Merge branch 'akturner/seaice/alternate_area_denominator_vel_solver' …
akturner Jan 31, 2021
73efc88
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Feb 1, 2021
3098d82
Added improved error messages for failure of vertical thermodynamics
akturner Feb 1, 2021
46e2ad9
Improved messages from Picard non-convergence in vertical thermo
akturner Feb 1, 2021
3587768
Improved error messages when zTin < Tmin
akturner Feb 2, 2021
306813e
Clean up and refactor
akturner Feb 2, 2021
9bc1f71
Merge pull request #13 from akturner/seaice/testcases_cleanup
akturner Feb 2, 2021
66a95bc
Merge branch 'ocean/develop' into e3sm/develop
mattdturner Feb 2, 2021
5b9beff
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Feb 3, 2021
d5201db
Merge branch 'MPAS-Dev/develop' into MPAS-Dev/seaice/develop
akturner Feb 4, 2021
8d13f58
Corrected and added missing calls needed for damage calcs. to work
stephenprice Feb 4, 2021
0bcfa85
Remove redundant and no longer needed code between vel and calving mo…
stephenprice Feb 4, 2021
7136183
Clean up commented out / commented sections of Registry from devel cycle
stephenprice Feb 4, 2021
007f37d
Additional clean up of comments and removal of redundant code
stephenprice Feb 4, 2021
6efb76d
Merge branch 'landice/fix_unitialized_err' into landice/develop
matthewhoffman Feb 5, 2021
fa7d6fe
Minor clean-up of comments
stephenprice Feb 5, 2021
5d53840
Merge branch 'akturner/seaice/improved_error_messages' into seaice/de…
akturner Feb 9, 2021
bd74667
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Feb 9, 2021
0038452
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Feb 10, 2021
da1a129
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Feb 10, 2021
7ca5546
Address matthewhoffman's requested changes to PR #810
trhille Feb 10, 2021
4351f3f
Remove subroutine calls involving unused 'requiredCalvingVolumeRate' …
stephenprice Feb 11, 2021
ab1eed4
Remove a few more instances of 'requiredCalvingVolumeRate'
stephenprice Feb 11, 2021
d1dd845
Added more operator testcases
akturner Feb 12, 2021
f659012
Merge branch 'akturner/seaice/square_set_velocities' into seaice/stan…
akturner Feb 12, 2021
190eefe
change gl damage setting 'extra' to 'extrapolate'
Feb 14, 2021
0b73f24
calculate stiffness for non-dynamic floating cells
Feb 15, 2021
48e7468
remove groundedMarineMarginMask condition in threshold damage calving…
Feb 15, 2021
e6295e7
revise the calvingThickness calculation; add TODO for possible flood …
Feb 15, 2021
b05ca83
Add 'uniform' option to config_front_mass_bal_grounded
trhille Feb 16, 2021
7c3d87f
Enable eigencalving for grounded ice
trhille Feb 16, 2021
9ce3897
Remove dependence on config_front_mass_bal_grounded for floating
trhille Feb 16, 2021
52cb6f2
Change config_use_Albany_flowA_eqn to config_use_Albany_flowA_eqn_for_vM
trhille Feb 16, 2021
c34dc76
Merge branch 'landice/ismip6_calving_melting_phase1' into landice/dev…
matthewhoffman Feb 16, 2021
c7f1953
Remove package designation for groundedMarineMarginMask
trhille Aug 26, 2020
afdaae9
Generalize apply_calving_velocity
trhille Aug 28, 2020
8cd54d4
Call apply_front_ablation_velocity from grounded_face_melt_ismip6
trhille Aug 28, 2020
b0d490c
Remove extra err statement that caused crash
trhille Aug 31, 2020
6456bb6
Remove masking from grounded face melt routine
trhille Sep 1, 2020
859f8db
Use only dynamic floating ice for VM + floatkill
trhille Nov 22, 2020
f106d34
Allow for negative adjustment to thermal forcing in iceshelf_melt.F
trhille Nov 22, 2020
2c8d29c
Correct reference to uncalvedVolume in front ablation routine
trhille Jan 14, 2021
43a461a
Apply ismip6 face melting to grounding line
trhille Feb 2, 2021
73e7031
Calculate oceanEdgeLength from grounding line mask
trhille Feb 2, 2021
0d1e268
Fixed bug with regional stats
akturner Feb 17, 2021
0ac874a
Fix float-kill implementation in von Mises calving
trhille Feb 17, 2021
6b2f8f8
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Feb 17, 2021
ce2757d
Clean up after matthewhoffman's initial review of PR #814
trhille Feb 17, 2021
792566d
Clean up li_apply_front_ablation_velocity
trhille Feb 17, 2021
ea701af
use 'config_flowLawExponent' in place of hard coded n value of 3
stephenprice Feb 18, 2021
57e8c17
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Feb 18, 2021
b300ff1
change all deviatoric stress variable names from 'sigma' to 'tau'
stephenprice Feb 18, 2021
64e77ba
Merge branch 'akturner/seaice/regional_stats_bug' into master
akturner Feb 18, 2021
d4dd9e8
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Feb 18, 2021
1651191
Added vertex averaging of variational strain scheme
akturner Feb 19, 2021
51b5ee9
Merge branch 'akturner/seaice/vertex_strain' into seaice/standalone_dev
akturner Feb 19, 2021
3594d2d
Update li_apply_front_ablation_velocity to use passed arrays
trhille Feb 18, 2021
e6b87e9
Restore previous margin-identifying logic in li_apply_front_ablation_…
trhille Feb 19, 2021
f26653d
Extend ablationVelocity from dynamic to non-dynamic cells
trhille Feb 19, 2021
66b3b9a
Add separate driver routine for grounded face melting
trhille Feb 19, 2021
1333ac4
Use a frontAblationMask that is a union of masks set by calling routines
trhille Feb 19, 2021
921d7bb
Update mask usage in li_apply_front_ablation_velocity
matthewhoffman Feb 19, 2021
1a69da3
Rewrite masks for apply_ablation
matthewhoffman Feb 19, 2021
60ae17d
Fix bmb restart issue
matthewhoffman Feb 19, 2021
f02483f
Add error if unknown option for temperature solver is specified
matthewhoffman Feb 19, 2021
289e3f4
Treat non-dynamic cells in von Mises float-kill implementation
trhille Feb 19, 2021
ebb0b6c
Merge branch 'landice/fix_bmb_restart' into landice/develop
matthewhoffman Feb 19, 2021
0b59780
Add treatment for config_front_mass_bal_grounded = 'none'
trhille Feb 19, 2021
d59f7f8
Remove package designation for faceMeltSpeed
trhille Feb 20, 2021
93074ef
change description for config_damagecalvingParameter in Registry.xml
Feb 22, 2021
e8faec9
Merge branch 'landice/add-damage-calving'
Feb 22, 2021
f44ea97
Fix bug in edge length scaling function for calving
trhille Feb 22, 2021
b76b683
Fixes to snow-aerosol code to allow multiple snow layers and snicar-ad
njeffery Feb 23, 2021
a11ba0e
update to aerosol testing configuration
njeffery Feb 23, 2021
7011e06
Returns snow_tracer_physics test to original configuration
njeffery Feb 23, 2021
dfce9e4
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Feb 23, 2021
6025313
Added DATA/get_data.py which was accidentally deleted
njeffery Feb 23, 2021
2e4780c
Use upstream flow velocities for calving from non-dynamic cells
trhille Feb 23, 2021
8e15ce0
Merge branch 'ocean/develop' into e3sm/develop
mattdturner Feb 24, 2021
1c320c5
Merge remote-tracking branch 'vanroekel/ocean/removeShortwaveEnergyCo…
mark-petersen Feb 25, 2021
460ccc3
Correct edge length scaling and velocity propagation in calving
trhille Feb 25, 2021
b3a1af1
Adjust thickness used in calving scheme at grounded marine margins
matthewhoffman Feb 26, 2021
0106963
Merge remote-tracking branch 'origin/ocean/develop' into e3sm/develop
mark-petersen Feb 26, 2021
ac44aec
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Feb 26, 2021
3d3e249
Fix loops to work correctly on multiple procs
matthewhoffman Mar 1, 2021
7d82543
Number of critical bug fixes for previous changes
matthewhoffman Mar 1, 2021
0d2dbb1
Merge branch 'develop' into e3sm/develop
mark-petersen Mar 1, 2021
1875540
Fix identification of standed non-dynamic cells
trhille Mar 2, 2021
087b370
Merge remote-tracking branch 'origin/develop' into e3sm/develop
mark-petersen Mar 2, 2021
6eac8dc
Update margin definitions in mask module
matthewhoffman Mar 2, 2021
8dff5df
Make the mask check use an integer
matthewhoffman Mar 2, 2021
ab36b62
Merge branch 'landice/ismip6_calving_melting_phase2' into landice/dev…
matthewhoffman Mar 3, 2021
19ee27e
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Mar 3, 2021
f03eb7b
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Mar 4, 2021
0ab419d
Added integration of errors across cells
akturner Mar 4, 2021
b4d6e46
Merge pull request #16 from akturner/seaice/error_analysis
akturner Mar 4, 2021
5ca9a36
Taylor series error analysis
akturner Mar 4, 2021
b878a84
Merge branch 'akturner/seaice/error_analyis_taylor_series' into seaic…
akturner Mar 4, 2021
e72f9e3
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Mar 5, 2021
ca57000
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Mar 5, 2021
e34abd5
This commit fixes an error recently introduced in package names
matthewhoffman Mar 5, 2021
454e0fc
Merge branch 'landice/fix_ismip6_package_error' into landice/develop
matthewhoffman Mar 5, 2021
5ac2f84
Add more complete description for config_damage_gl_setting Registry o…
matthewhoffman Mar 8, 2021
e5d2d32
Set default value of damage-based calving to 'threshold' method.
stephenprice Mar 8, 2021
58e9c8b
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Mar 9, 2021
b94eba6
Change default flag for finalize damage after advection to true; add
stephenprice Mar 10, 2021
bfd6ffd
Minor udpate to registry comment.
stephenprice Mar 10, 2021
3505441
Update description for 'config_calculate_damage' option.
stephenprice Mar 10, 2021
67ec269
Clean up commenting in damage calc. module, including deleting commen…
stephenprice Mar 10, 2021
382b432
Merge branch 'njeffery/seaice/njeffery_aerosolConcFix' into seaice/de…
akturner Mar 10, 2021
f97ef86
Add explicit equation numbers from Bassis and Ma (2015) to calculations
stephenprice Mar 10, 2021
424abba
Adds comments around equation for evolving damage from source term.
stephenprice Mar 10, 2021
94472d7
Added advection test case
akturner Mar 11, 2021
36effc3
Merge branch 'akturner/seaice/advection_testcase' into seaice/standal…
akturner Mar 11, 2021
10bddd9
Cleaned up test cases
akturner Mar 11, 2021
bb24802
Merge branch 'akturner/seaice/cleaned_up_testcases' into seaice/stand…
akturner Mar 11, 2021
95daa3f
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Mar 11, 2021
fad7843
Treat non-dynamic cells along grounded calving margin
trhille Mar 12, 2021
761b2e3
Use li_mask_is_ice to define oneCellBackList
trhille Mar 15, 2021
1e01eb5
Fix asymmetry in calving at grounded margins
trhille Mar 15, 2021
271a47e
Use grounding line instead of dynamic cell mask
trhille Mar 15, 2021
be87b1e
Move nstar calculation into where loop to avoid divide by zero
matthewhoffman Mar 15, 2021
000d212
Update Registry description of tauMin/Max to indicate they are deviat…
matthewhoffman Mar 16, 2021
744b230
Remove unneeded code from damage routines
matthewhoffman Mar 16, 2021
9a4a6ca
Correct usage of calvingFrontMask in damage_calving routine
matthewhoffman Mar 16, 2021
219b6f3
Make damage summary stats work on multiple procs
matthewhoffman Mar 16, 2021
5c1aaae
Remove trailing whitespace
matthewhoffman Mar 16, 2021
b4ed056
Merge branch 'ocean/develop' into e3sm/develop
mattdturner Mar 16, 2021
e79fff5
Add additional comments about 2-back scheme for posterity
matthewhoffman Mar 16, 2021
97a48b8
Merge branch 'landice/ismip6_calving_melting_phase3' into landice/dev…
matthewhoffman Mar 16, 2021
03ab947
Cleanup related to config_damage_calving_method option
matthewhoffman Mar 16, 2021
66242d5
Undo eigencalving hijack that was made for testing
matthewhoffman Mar 16, 2021
eb196be
General cleanup
matthewhoffman Mar 16, 2021
bfcd4d9
Rename alpha to principalStrainRateRatio
matthewhoffman Mar 16, 2021
0c11895
Make calving_rate option use the damage threshold for calving to init…
matthewhoffman Mar 16, 2021
bc6a85f
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Mar 18, 2021
855a202
Merge branch 'landice/add-damage-calving' into landice/develop
matthewhoffman Mar 16, 2021
3fc0818
Minor modifications to plots for paper
akturner Mar 19, 2021
a3b40e3
Merge 'akturner/seaice/square_strain_avg' into seaice/standalone_dev
akturner Mar 19, 2021
5f097c8
Merge branch 'akturner/seaice/standalone_dev' into seaice/develop
akturner Mar 19, 2021
945c3ec
Call subroutine specified_calving_velocity
trhille Mar 19, 2021
f0a87e3
Merge branch 'landice/specified_calving_velocity' into landice/develop
matthewhoffman Mar 19, 2021
8408b2c
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Mar 22, 2021
46ebf5b
Plotting scripts for paper
akturner Mar 24, 2021
3b33309
Threading bugfix in column_itd_thermodynamics
mattdturner Mar 25, 2021
a0a92db
Generalized seaice executable run command
akturner Mar 26, 2021
146cedf
Merge pull request #832 from akturner/seaice/mpas_seaice_paper
akturner Mar 26, 2021
88e1742
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Mar 26, 2021
6415369
Corrections for running on E3SM
akturner Mar 30, 2021
fc4e197
Merge branch 'akturner/seaice/e3sm_build_issues' into seaice/develop
akturner Mar 30, 2021
4d3277e
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Mar 30, 2021
3d932c8
Fixed missing _RKIND bug
akturner Apr 1, 2021
1997544
Merge branch 'akturner/seaice/missing_kind_bug' into seaice/develop
akturner Apr 1, 2021
ba7eb12
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Apr 1, 2021
cc70bb9
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Apr 2, 2021
4dfd049
Added area analysis to seaice conservation check
akturner Apr 5, 2021
601eb49
Merge branch 'akturner/seaice/area_in_conservation_check' into seaice…
akturner Apr 7, 2021
b276f08
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Apr 7, 2021
f26a7d7
Merge branch 'MPAS-Dev/develop' into landice/develop
matthewhoffman Apr 12, 2021
f953e60
Merge branch 'mattdturner/seaice/threading_bugfix' into seaice/develop
akturner Apr 13, 2021
1f573d4
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Apr 13, 2021
c54c9b9
Changed flux definition in conservation check AM
akturner Apr 14, 2021
6e41dd5
Added all heat flux terms to output
akturner Apr 14, 2021
fb27550
Refactor of variational code
akturner Apr 14, 2021
dd80f4b
Merge branch 'akturner/seaice/refactor_variational' into seaice/develop
akturner Apr 14, 2021
cc11612
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner Apr 15, 2021
1ccaa7d
Change sign of variables so all same sign in net flux values
akturner Apr 15, 2021
fddac40
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Apr 20, 2021
20f89be
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Apr 21, 2021
65055b1
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen Apr 22, 2021
6af0a6e
Merge branch 'ocean/develop' into e3sm/develop
mattdturner Apr 23, 2021
3b8902f
Added restart stream to conservation am
akturner Apr 26, 2021
36562e6
Fix quotation mark issue in Registry
matthewhoffman Apr 27, 2021
8772b52
Delint MALI files
matthewhoffman Apr 27, 2021
7994b76
Merge branch 'landice/delint' into landice/develop
matthewhoffman Apr 27, 2021
d4bd130
Minor fix to use of blocklist in conservation am
akturner Apr 27, 2021
f22612a
Add missing (kind=RKIND) in variable declarations
matthewhoffman Apr 27, 2021
3fcd92d
Add missing mpas_li_bedtopo.F to cmake build
matthewhoffman Apr 27, 2021
7ee44d5
Merge branch 'landice/intel_errors' into landice/develop
matthewhoffman Apr 28, 2021
f46d0f3
Add error checks for required number of halos (3)
matthewhoffman Apr 29, 2021
7c7dbb5
Merge branch 'landice/halo_check' into landice/develop
matthewhoffman Apr 29, 2021
4b36381
Merge branch 'landice/develop' into e3sm/develop
matthewhoffman Apr 29, 2021
4a48e91
Remove isnan() from calving routine
matthewhoffman Apr 30, 2021
c001b5b
Switch ieee_isnan
matthewhoffman Apr 30, 2021
4bddcea
Merge branch 'landice/remove_isnan' into landice/develop
matthewhoffman Apr 30, 2021
bc3851a
Merge branch 'landice/develop' into e3sm/develop
matthewhoffman Apr 30, 2021
83b74e7
Merge branch 'ocean/develop' into e3sm/develop
mark-petersen May 3, 2021
cd42058
fixed bug with precompute calculated every time step
akturner May 6, 2021
5873b45
Zero out very small negative masses generated by IR
akturner May 6, 2021
ffafff5
Add latentHeatFlux to energy conservation am output
akturner May 11, 2021
a456772
Merge branch 'akturner/seaice/small_negative_IR_error' into seaice/de…
akturner May 11, 2021
5930e46
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner May 11, 2021
f6505f7
Corrected latent heat flux used in net calculation for conservation am
akturner May 12, 2021
71d0930
Merge branch 'akturner/seaice/hemispheric_conservation_check' into se…
akturner May 13, 2021
617fbf8
Merge branch 'MPAS-Dev/seaice/develop' into e3sm/develop
akturner May 13, 2021
57af447
fixed incorrect include path for gotm package
philipwjones May 4, 2021
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
Prev Previous commit
Next Next commit
Merge PR #772 'pwjones/ocean/gpuvel1' into ocean/develop
This is the first phase of a GPU implementation of all the baroclinic velocity tendencies. It contains a subset of the necessary changes for running on the GPU that retain bit-for-bit accuracy with the current version when running on the CPU
mattdturner committed Jan 19, 2021
commit c4783b0de84c3a2260443f143b894405efc17052

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.