Skip to content
This repository has been archived by the owner on Oct 23, 2020. It is now read-only.

Fixed debug messages and removed trailing white space #1349

Merged
merged 1 commit into from
Oct 3, 2017

Conversation

akturner
Copy link
Contributor

@akturner akturner commented Jun 1, 2017

Code cleanup and fixed messages in forcing module

Fixed debug messages with new logging system
Removed trailing whitespace

Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I approve, based on visual inspection. I did not test, but this is so simple, I think if @akturner tested in MPAS-sea ice that is sufficient.

@matthewhoffman
Copy link
Member

@akturner , this is clear to be merged. If you are comfortable doing so following the framework merge protocols, go ahead. If you're unsure, I can help you or do it.

@akturner
Copy link
Contributor Author

@matthewhoffman: I will merge next week when I return if thats acceptable on the schedule

@matthewhoffman
Copy link
Member

@akturner , yeah, that sounds fine. 👍

Copy link
Contributor

@mgduda mgduda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the code changes look fine. I'm only requesting a merge message (i.e., the first comment on the PR) that describes the changes and that they are specifically for the forcing module.

@@ -1021,15 +1018,15 @@ subroutine get_initial_forcing_data(&!{{{
! cycle start time is inclusive to the cycle

if (forcingTimeCycle .lt. forcingGroup % forcingCycleStart) then
do
do
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This carriage return here and on three following do's is very strange. Since you are cleaning up white space, could you change these to a single line?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what you mean. The do is a separate statement and here means loop to infinity. The infinite loop is broken by an exit statement

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha! I had no idea - somehow that slipped through the cracks of 15 years of Fortran programming. I get it now. Please disregard my comment.

@mark-petersen
Copy link
Contributor

Tested by compiling develop with the ocean and atmosphere core. Merged into ocean/develop and ran nightly test suite with gnu, then intel/debug on grizzly. Passed all tests.

@mark-petersen
Copy link
Contributor

There were several conflicts between this PR and #1417, mostly due to numerous white space corrections on both. I resolved the conflicts in the merge commit.

@mark-petersen mark-petersen merged commit 619f391 into MPAS-Dev:develop Oct 3, 2017
@mark-petersen mark-petersen deleted the framework/forcing_cleanup branch October 3, 2017 12:50
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants