Merge branch 'douglasjacobsen/mpas/fix-perf-issues' into next (PR #700)

This merge fixes some performance related issues in MPAS-O, as well as
some segfault issues.

Additionally, this merge adds the pointwise stats analysis member to
MPAS-CICE to help with debugging coupled simulations.

OG-569

* douglasjacobsen/mpas/fix_perf_issues:
  Update MPAS-O to fix some performance / loop issues
  Update MPAS-CICE to include points analysis member

components/mpas-cice/bld/build-namelist

@@ -777,6 +777,16 @@ add_default($nl, 'config_AM_pondDiagnostics_output_stream');
 add_default($nl, 'config_AM_pondDiagnostics_compute_on_startup');
 add_default($nl, 'config_AM_pondDiagnostics_write_on_startup');
 
+#####################################
+# Namelist group: AM_pointwiseStats #
+#####################################
+
+add_default($nl, 'config_AM_pointwiseStats_enable');
+add_default($nl, 'config_AM_pointwiseStats_compute_interval');
+add_default($nl, 'config_AM_pointwiseStats_output_stream');
+add_default($nl, 'config_AM_pointwiseStats_compute_on_startup');
+add_default($nl, 'config_AM_pointwiseStats_write_on_startup');
+
 #################################
 # Namelist group: AM_icePresent #
 #################################
@@ -875,6 +885,7 @@ my @groups = qw(cice_model
                 am_miscellaneous
                 am_areavariables
                 am_ponddiagnostics
+                am_pointwisestats
                 am_icepresent
                 am_timeseriesstatsdaily
                 am_timeseriesstatsmonthly

components/mpas-cice/bld/build-namelist-group-list

@@ -29,6 +29,7 @@ my @groups = qw(cice_model
                 am_miscellaneous
                 am_areavariables
                 am_ponddiagnostics
+                am_pointwisestats
                 am_icepresent
                 am_timeseriesstatsdaily
                 am_timeseriesstatsmonthly

components/mpas-cice/bld/build-namelist-section

@@ -372,6 +372,16 @@ add_default($nl, 'config_AM_pondDiagnostics_output_stream');
 add_default($nl, 'config_AM_pondDiagnostics_compute_on_startup');
 add_default($nl, 'config_AM_pondDiagnostics_write_on_startup');
 
+#####################################
+# Namelist group: AM_pointwiseStats #
+#####################################
+
+add_default($nl, 'config_AM_pointwiseStats_enable');
+add_default($nl, 'config_AM_pointwiseStats_compute_interval');
+add_default($nl, 'config_AM_pointwiseStats_output_stream');
+add_default($nl, 'config_AM_pointwiseStats_compute_on_startup');
+add_default($nl, 'config_AM_pointwiseStats_write_on_startup');
+
 #################################
 # Namelist group: AM_icePresent #
 #################################

components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml

@@ -75,8 +75,8 @@
 <config_revised_evp>false</config_revised_evp>
 <config_use_air_stress>true</config_use_air_stress>
 <config_use_ocean_stress>true</config_use_ocean_stress>
-<config_use_surface_tilt>true</config_use_surface_tilt>
-<config_geostrophic_surface_tilt>true</config_geostrophic_surface_tilt>
+<config_use_surface_tilt>false</config_use_surface_tilt>
+<config_geostrophic_surface_tilt>false</config_geostrophic_surface_tilt>
 
 <!-- advection -->
 <config_advection_type>'incremental_remap'</config_advection_type>
@@ -272,6 +272,13 @@
 <config_AM_pondDiagnostics_compute_on_startup>.false.</config_AM_pondDiagnostics_compute_on_startup>
 <config_AM_pondDiagnostics_write_on_startup>.false.</config_AM_pondDiagnostics_write_on_startup>
 
+<!-- AM_pointwiseStats -->
+<config_AM_pointwiseStats_enable>.false.</config_AM_pointwiseStats_enable>
+<config_AM_pointwiseStats_compute_interval>'dt'</config_AM_pointwiseStats_compute_interval>
+<config_AM_pointwiseStats_output_stream>'pointwiseStatsOutput'</config_AM_pointwiseStats_output_stream>
+<config_AM_pointwiseStats_compute_on_startup>.false.</config_AM_pointwiseStats_compute_on_startup>
+<config_AM_pointwiseStats_write_on_startup>.false.</config_AM_pointwiseStats_write_on_startup>
+
 <!-- AM_icePresent -->
 <config_AM_icePresent_enable>.true.</config_AM_icePresent_enable>
 <config_AM_icePresent_compute_interval>'dt'</config_AM_icePresent_compute_interval>

components/mpas-cice/bld/namelist_files/namelist_definition_mpas-cice.xml

@@ -1783,6 +1783,49 @@ Default: Defined in namelist_defaults.xml
 </entry>
 
 
+<!-- AM_pointwiseStats -->
+
+<entry id="config_AM_pointwiseStats_enable" type="logical"
+	category="AM_pointwiseStats" group="AM_pointwiseStats">
+If true, ocean analysis member pointwiseStats is called.
+
+Valid values: .true. or .false.
+Default: Defined in namelist_defaults.xml
+</entry>
+
+<entry id="config_AM_pointwiseStats_compute_interval" type="char*1024"
+	category="AM_pointwiseStats" group="AM_pointwiseStats">
+Timestamp determining how often analysis member computation should be performed.
+
+Valid values: Any valid time stamp, 'dt', or 'output_interval'
+Default: Defined in namelist_defaults.xml
+</entry>
+
+<entry id="config_AM_pointwiseStats_output_stream" type="char*1024"
+	category="AM_pointwiseStats" group="AM_pointwiseStats">
+Name of the stream that the pointwiseStats analysis member should be tied to.
+
+Valid values: Any existing stream name or 'none'
+Default: Defined in namelist_defaults.xml
+</entry>
+
+<entry id="config_AM_pointwiseStats_compute_on_startup" type="logical"
+	category="AM_pointwiseStats" group="AM_pointwiseStats">
+Logical flag determining if an analysis member computation occurs on start-up.
+
+Valid values: .true. or .false.
+Default: Defined in namelist_defaults.xml
+</entry>
+
+<entry id="config_AM_pointwiseStats_write_on_startup" type="logical"
+	category="AM_pointwiseStats" group="AM_pointwiseStats">
+Logical flag determining if an analysis member write occurs on start-up.
+
+Valid values: .true. or .false.
+Default: Defined in namelist_defaults.xml
+</entry>
+
+
 <!-- AM_icePresent -->
 
 <entry id="config_AM_icePresent_enable" type="logical"