Skip to content

Commit

Permalink
Merge branch 'mark-petersen/ocean/halo_reuse' into next (PR #2387)
Browse files Browse the repository at this point in the history 
This PR updates the mpas-source submodule for ocean halo reuse

Tested with:
* ERS_Ld3.T62_oQU240.GMPAS-IAF.cori-knl_intel
* SMS_D.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_gnu
* T62_oECv3.GMPAS-IAF.cori-knl_intel one-month runs, BFB w/ and
  w/o this update

[BFB]
  • Loading branch information
@jonbob
jonbob committed Jun 11, 2018
2 parents ce3ef13 + 64ac97e commit 990c9a9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/mpas-source
Submodule mpas-source updated 23 files
+21 −20 Makefile
+0 −3 src/core_init_atmosphere/Registry.xml
+0 −63 src/core_init_atmosphere/mpas_init_atm_static.F
+2 −2 src/core_landice/Registry.xml
+5 −5 src/core_landice/analysis_members/mpas_li_global_stats.F
+10 −10 src/core_landice/analysis_members/mpas_li_regional_stats.F
+2 −3 src/core_landice/mode_forward/Interface_velocity_solver.cpp
+6 −9 src/core_landice/mode_forward/mpas_li_advection.F
+17 −31 src/core_landice/mode_forward/mpas_li_calving.F
+3 −5 src/core_landice/mode_forward/mpas_li_core.F
+15 −29 src/core_landice/mode_forward/mpas_li_subglacial_hydro.F
+25 −42 src/core_landice/mode_forward/mpas_li_thermal.F
+3 −7 src/core_landice/mode_forward/mpas_li_time_integration_fe.F
+5 −6 src/core_landice/mode_forward/mpas_li_velocity.F
+2 −2 src/core_landice/mode_forward/mpas_li_velocity_external.F
+1 −1 src/core_landice/shared/mpas_li_mask.F
+2 −3 src/core_landice/shared/mpas_li_setup.F
+3 −3 src/core_ocean/analysis_members/mpas_ocn_lagrangian_particle_tracking.F
+7 −0 src/core_ocean/mode_forward/mpas_ocn_forward_mode.F
+11 −0 src/core_ocean/mode_forward/mpas_ocn_time_integration_rk4.F
+32 −30 src/core_ocean/mode_forward/mpas_ocn_time_integration_split.F
+3 −7 testing_and_setup/compass/landice/EISMINT2/visualize_output_EISMINT2.py
+0 −5 testing_and_setup/compass/landice/hydro-radial/plot_hydro-radial_profile.py

0 comments on commit 990c9a9

Please sign in to comment.