Skip to content

Commit

Permalink
Merge branch 'matthewhoffman/mpas/apply_new_log_system' (PR #1442)
Browse files Browse the repository at this point in the history
This merge introduces the new MPAS log system into ACME.  With this
change, MPAS no longer hijacks stdout and stderr but instead opens its
own log file with a unit number provided by ACME.  This merge updates
the three MPAS submodules to use the new system in each component and
also updates each driver to set up and use it.

With this change, MPAS components no longer uses scratch files to dump
the unwanted output.

Fixes #1133.

[BFB]

* origin/matthewhoffman/mpas/apply_new_log_system:
  Update MPAS submodules to fix logging issues on some compilers
  Change wording on coupling interval message.
  Remove debug conditional on writing/flushing at end of run cycle
  Update ocean submodule, text reduction on ocn.log and ice.log
  Update ocn stream settings to prevent ERROR messages.
  Remove unused stream 'real_world' from mpas-o stream file
  Apply new Log Module in all MPAS components
  • Loading branch information
matthewhoffman committed May 9, 2017
2 parents 0340f1e + 8c47038 commit 32d5573
Show file tree
Hide file tree
Showing 7 changed files with 474 additions and 443 deletions.
301 changes: 155 additions & 146 deletions components/mpas-cice/driver/ice_comp_mct.F

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion components/mpas-cice/model
Submodule model updated from 05e02e to 545f58
7 changes: 5 additions & 2 deletions components/mpas-o/cime_config/buildnml
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ if ( -e "$CASEROOT/SourceMods/src.mpaso/$STREAM_NAME" ) {
print $stream_file ' output_interval="00-01-00_00:00:00">' . "\n";
print $stream_file '' . "\n";
print $stream_file ' <stream name="mesh"/>' . "\n";
print $stream_file ' <stream name="real_world"/>' . "\n";
print $stream_file ' <var_struct name="tracers"/>' . "\n";
print $stream_file ' <var name="layerThickness"/>' . "\n";
print $stream_file ' <var name="ssh"/>' . "\n";
Expand Down Expand Up @@ -659,7 +658,7 @@ if ( -e "$CASEROOT/SourceMods/src.mpaso/$STREAM_NAME" ) {
print $stream_file ' filename_interval="00-01-00_00:00:00"' . "\n";
print $stream_file ' output_interval="00-01-00_00:00:00"' . "\n";
print $stream_file ' clobber_mode="truncate"' . "\n";
print $stream_file ' packages="timeSeriesStatsMontlyAMPKG"' . "\n";
print $stream_file ' packages="timeSeriesStatsMonthlyAMPKG"' . "\n";
print $stream_file ' runtime_format="single_file">' . "\n";
print $stream_file '' . "\n";
print $stream_file ' <var name="daysSinceStartOfSim"/>' . "\n";
Expand Down Expand Up @@ -738,6 +737,7 @@ if ( -e "$CASEROOT/SourceMods/src.mpaso/$STREAM_NAME" ) {
print $stream_file ' filename_interval="output_interval"' . "\n";
print $stream_file ' clobber_mode="truncate"' . "\n";
print $stream_file ' input_interval="initial_only"' . "\n";
print $stream_file ' packages="timeSeriesStatsDailyAMPKG"' . "\n";
print $stream_file ' output_interval="stream:restart:output_interval">' . "\n";
print $stream_file '</stream>' . "\n";
print $stream_file '' . "\n";
Expand All @@ -747,6 +747,7 @@ if ( -e "$CASEROOT/SourceMods/src.mpaso/$STREAM_NAME" ) {
print $stream_file ' filename_interval="output_interval"' . "\n";
print $stream_file ' clobber_mode="truncate"' . "\n";
print $stream_file ' input_interval="initial_only"' . "\n";
print $stream_file ' packages="timeSeriesStatsMonthlyAMPKG"' . "\n";
print $stream_file ' output_interval="stream:restart:output_interval">' . "\n";
print $stream_file '</stream>' . "\n";
print $stream_file '' . "\n";
Expand All @@ -756,6 +757,7 @@ if ( -e "$CASEROOT/SourceMods/src.mpaso/$STREAM_NAME" ) {
print $stream_file ' filename_interval="output_interval"' . "\n";
print $stream_file ' clobber_mode="truncate"' . "\n";
print $stream_file ' input_interval="initial_only"' . "\n";
print $stream_file ' packages="timeSeriesStatsClimatologyAMPKG"' . "\n";
print $stream_file ' output_interval="stream:restart:output_interval">' . "\n";
print $stream_file '</stream>' . "\n";
print $stream_file '' . "\n";
Expand All @@ -765,6 +767,7 @@ if ( -e "$CASEROOT/SourceMods/src.mpaso/$STREAM_NAME" ) {
print $stream_file ' filename_interval="output_interval"' . "\n";
print $stream_file ' clobber_mode="truncate"' . "\n";
print $stream_file ' input_interval="initial_only"' . "\n";
print $stream_file ' packages="timeSeriesStatsCustomAMPKG"' . "\n";
print $stream_file ' output_interval="stream:restart:output_interval">' . "\n";
print $stream_file '</stream>' . "\n";
print $stream_file '' . "\n";
Expand Down
Loading

0 comments on commit 32d5573

Please sign in to comment.