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.

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

dev_doeclim: a bug fix, const parameters, updated references #211

Merged
merged 3 commits into from
Jan 5, 2018

Conversation

bvegawe
Copy link
Contributor

@bvegawe bvegawe commented Jan 3, 2018

Bug fix in total heat flux calculation. Improved DOECLIM references. Made some parameters const and moved their assignment to the header.

Forgot to add the factor for the slightly smaller surface area of the
interior ocean
includes full citations and the fact that we have permission.
set hard-coded DOECLIM parameters to const; moved their initializations
to the header. if these initializations are static I get a warning, so
just const for now.
@bvegawe bvegawe changed the title a bug fix, const parameters, updated references dev_doeclim: a bug fix, const parameters, updated references Jan 3, 2018
@cahartin cahartin added this to To Do in checklist for v2.0 Jan 5, 2018
@@ -7,9 +7,6 @@
objects = {
Copy link
Contributor

Choose a reason for hiding this comment

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

@bpbond and @rplzzz do we want to commit the xcode project file?

Copy link
Contributor

Choose a reason for hiding this comment

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

You probably should. Windows users will need it in order to build the code, so it's best if it comes in the package.

@cahartin cahartin merged commit 448e65a into JGCRI:dev_doeclim Jan 5, 2018
@bvegawe bvegawe deleted the dev_doeclim branch January 5, 2018 20:46
@cahartin cahartin moved this from To Do to Done in checklist for v2.0 Jan 8, 2018
@bvegawe
Copy link
Contributor Author

bvegawe commented Jan 8, 2018

@cahartin Hmm, actually I was previously testing this on my mac using xcode. When I now try to build on linux (using make hector), I get the following for all of these header initializations: error: ISO C++ forbids initialization of member...trying to figure out a solution where we keep them as const.

@cahartin
Copy link
Contributor

cahartin commented Jan 8, 2018

@bvegawe let me tag @pralitp and @rplzzz to see if they know what the issue is.

@cahartin
Copy link
Contributor

cahartin commented Jan 8, 2018

@bvegawe did you try make clean? and then what compiler are you using? did that change?

@bvegawe
Copy link
Contributor Author

bvegawe commented Jan 8, 2018

I guess the error depends on the version of gcc. My local cluster default is 4.4.7. When I switch to 6.1.0, the error goes away.

Do you think that version sensitivity is a problem?

@cahartin
Copy link
Contributor

cahartin commented Jan 8, 2018

Yea, we make sure to always load 6.1.0 when running GCAM/Hector. I don't know why but I think it might have to do with the libraries etc.

@bvegawe
Copy link
Contributor Author

bvegawe commented Jan 8, 2018

Ah ok; I'll do the same from now on.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants