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.

Sign up for GitHub

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

Jump to bottom

Fix performance and segfault issues for MPAS components #700

Merged
merged 2 commits into from
Feb 11, 2016
Merged

Fix performance and segfault issues for MPAS components #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30aecbc
Update MPAS-CICE to include points analysis member
douglasjacobsen Feb 11, 2016
a641793
Update MPAS-O to fix some performance / loop issues
douglasjacobsen Feb 11, 2016
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
11 changes: 11 additions & 0 deletions components/mpas-cice/bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
#################################
Expand Down Expand Up @@ -875,6 +885,7 @@ my @groups = qw(cice_model
am_miscellaneous
am_areavariables
am_ponddiagnostics
am_pointwisestats
am_icepresent
am_timeseriesstatsdaily
am_timeseriesstatsmonthly
Expand Down
1 change: 1 addition & 0 deletions components/mpas-cice/bld/build-namelist-group-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ my @groups = qw(cice_model
am_miscellaneous
am_areavariables
am_ponddiagnostics
am_pointwisestats
am_icepresent
am_timeseriesstatsdaily
am_timeseriesstatsmonthly
Expand Down
10 changes: 10 additions & 0 deletions components/mpas-cice/bld/build-namelist-section
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
#################################
Expand Down
11 changes: 9 additions & 2 deletions components/mpas-cice/bld/namelist_files/namelist_defaults_mpas-cice.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
43 changes: 43 additions & 0 deletions components/mpas-cice/bld/namelist_files/namelist_definition_mpas-cice.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion components/mpas-cice/model
Open in desktop
Submodule model updated from 71dc73 to 403012
2 changes: 1 addition & 1 deletion components/mpas-o/model
Open in desktop
Submodule model updated from e52009 to c3b787