Merge branch 'mark-petersen/update_mpas_bfb' into next (PR #2918)

Update mpas source This PR update the mpas-source git submodule but only includes changes that will not impact E3SM. These changes include: * LIGHT update (MPAS-Ocean Lagrangian particles): MPAS-Dev/MPAS-Model#56 * clean up ice shelf melt flag: MPAS-Dev/MPAS-Model#164 * merge coastal branch: MPAS-Dev/MPAS-Model#54 * CONUS mesh update: MPAS-Dev/MPAS-Model#201 * Major COMPASS upgrade to python 3: MPAS-Dev/MPAS-Model#229 * Eliminate outdated -DUNDERSCORE flag: MPAS-Dev/MPAS-Model#156 * PIO Version Compatibility Check - PGI Compiler Bug Fix: MPAS-Dev/MPAS-Model#212 These changes do not alter E3SM standard cases or tested configurations. COMPASS is the MPAS testing infrastructure. LIGHT and coastal changes are protected by flags and not used in normal E3SM tests. [NML] [BFB]
E3SM-Project · May 22, 2019 · 0c16901 · 0c16901
2 parents fd636bc + fd97485
commit 0c16901
Show file tree

Hide file tree

Showing 5 changed files with 280 additions and 3,159 deletions.
diff --git a/components/mpas-ocean/bld/build-namelist b/components/mpas-ocean/bld/build-namelist
@@ -1202,6 +1202,17 @@ add_default($nl, 'config_AM_lagrPartTrack_reset_global_timestamp');
 add_default($nl, 'config_AM_lagrPartTrack_region_stream');
 add_default($nl, 'config_AM_lagrPartTrack_reset_if_outside_region');
 add_default($nl, 'config_AM_lagrPartTrack_reset_if_inside_region');
+add_default($nl, 'config_AM_lagrPartTrack_sample_horizontal_interp');
+add_default($nl, 'config_AM_lagrPartTrack_sample_temperature');
+add_default($nl, 'config_AM_lagrPartTrack_sample_salinity');
+add_default($nl, 'config_AM_lagrPartTrack_sample_DIC');
+add_default($nl, 'config_AM_lagrPartTrack_sample_ALK');
+add_default($nl, 'config_AM_lagrPartTrack_sample_PO4');
+add_default($nl, 'config_AM_lagrPartTrack_sample_NO3');
+add_default($nl, 'config_AM_lagrPartTrack_sample_SiO3');
+add_default($nl, 'config_AM_lagrPartTrack_sample_NH4');
+add_default($nl, 'config_AM_lagrPartTrack_sample_Fe');
+add_default($nl, 'config_AM_lagrPartTrack_sample_O2');
 
 ###################################
 # Namelist group: AM_eliassenPalm #

diff --git a/components/mpas-ocean/bld/build-namelist-section b/components/mpas-ocean/bld/build-namelist-section
@@ -677,6 +677,17 @@ add_default($nl, 'config_AM_lagrPartTrack_reset_global_timestamp');
 add_default($nl, 'config_AM_lagrPartTrack_region_stream');
 add_default($nl, 'config_AM_lagrPartTrack_reset_if_outside_region');
 add_default($nl, 'config_AM_lagrPartTrack_reset_if_inside_region');
+add_default($nl, 'config_AM_lagrPartTrack_sample_horizontal_interp');
+add_default($nl, 'config_AM_lagrPartTrack_sample_temperature');
+add_default($nl, 'config_AM_lagrPartTrack_sample_salinity');
+add_default($nl, 'config_AM_lagrPartTrack_sample_DIC');
+add_default($nl, 'config_AM_lagrPartTrack_sample_ALK');
+add_default($nl, 'config_AM_lagrPartTrack_sample_PO4');
+add_default($nl, 'config_AM_lagrPartTrack_sample_NO3');
+add_default($nl, 'config_AM_lagrPartTrack_sample_SiO3');
+add_default($nl, 'config_AM_lagrPartTrack_sample_NH4');
+add_default($nl, 'config_AM_lagrPartTrack_sample_Fe');
+add_default($nl, 'config_AM_lagrPartTrack_sample_O2');
 
 ###################################
 # Namelist group: AM_eliassenPalm #

diff --git a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
@@ -612,6 +612,17 @@
 <config_AM_lagrPartTrack_region_stream>'lagrPartTrackRegions'</config_AM_lagrPartTrack_region_stream>
 <config_AM_lagrPartTrack_reset_if_outside_region>.false.</config_AM_lagrPartTrack_reset_if_outside_region>
 <config_AM_lagrPartTrack_reset_if_inside_region>.false.</config_AM_lagrPartTrack_reset_if_inside_region>
+<config_AM_lagrPartTrack_sample_horizontal_interp>.true.</config_AM_lagrPartTrack_sample_horizontal_interp>
+<config_AM_lagrPartTrack_sample_temperature>.true.</config_AM_lagrPartTrack_sample_temperature>
+<config_AM_lagrPartTrack_sample_salinity>.true.</config_AM_lagrPartTrack_sample_salinity>
+<config_AM_lagrPartTrack_sample_DIC>.false.</config_AM_lagrPartTrack_sample_DIC>
+<config_AM_lagrPartTrack_sample_ALK>.false.</config_AM_lagrPartTrack_sample_ALK>
+<config_AM_lagrPartTrack_sample_PO4>.false.</config_AM_lagrPartTrack_sample_PO4>
+<config_AM_lagrPartTrack_sample_NO3>.false.</config_AM_lagrPartTrack_sample_NO3>
+<config_AM_lagrPartTrack_sample_SiO3>.false.</config_AM_lagrPartTrack_sample_SiO3>
+<config_AM_lagrPartTrack_sample_NH4>.false.</config_AM_lagrPartTrack_sample_NH4>
+<config_AM_lagrPartTrack_sample_Fe>.false.</config_AM_lagrPartTrack_sample_Fe>
+<config_AM_lagrPartTrack_sample_O2>.false.</config_AM_lagrPartTrack_sample_O2>
 
 <!-- AM_eliassenPalm -->
 <config_AM_eliassenPalm_enable>.false.</config_AM_eliassenPalm_enable>