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

Codecompare #29

Merged
merged 7 commits into from
Sep 25, 2016
Merged

Codecompare #29

merged 7 commits into from
Sep 25, 2016

Conversation

joezuntz
Copy link
Collaborator

This branch incorporates the outputs of the code comparison project and runs tests comparing the output of the CCL routines to those outputs.

@joezuntz
Copy link
Collaborator Author

This is where you put general comments.

i++;
}
}
/*
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Should remove these commented out bits if they are not useful.

@@ -297,8 +297,8 @@ void ccl_cosmology_compute_power_bbks(ccl_cosmology * cosmo, int *status){
}
gsl_spline * log_power_lin = gsl_spline_alloc(K_SPLINE_TYPE, nk);
*status = gsl_spline_init(log_power_lin, x, y, nk);
double sigma_8 = ccl_sigma8(log_power_lin, cosmo->params.h, status);
double log_sigma_8 = log(cosmo->params.sigma_8) - log(sigma_8);
double sigma_8 = ccl_sigma8(log_power_lin, cosmo->params.h, status); //this is sigma_8^2!
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we change ccl_sigma8 to return sigma_8, not sigma_8^2 to avoid confusion?

//TODO: Also, what units is k? If [k]=Mpc/h, then we should remove h from kR.
//TODO: It seems in the constants.h file thtat [k]=Mpc
//TODO: It seems in the constants.h file that [k]=Mpc
Copy link
Collaborator

Choose a reason for hiding this comment

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

Need to revisit this when checking physical units

double mu = 5*log10(DL_pc)-5;
//double DL = 1/h * ccl_luminosity_distance(cosmo, a);
//double DL_pc = DL*1e6;
//double mu = 5*log10(DL_pc)-5;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same as Joe said above - removed these if no longer useful?

double mu = 5*log10(DL_pc)-5;
//double DL = 1/h * ccl_luminosity_distance(cosmo, a);
//double DL_pc = DL*1e6;
//double mu = 5*log10(DL_pc)-5;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same as Joe said above - removed these if no longer useful?

Copy link
Collaborator

@elikrause elikrause left a comment

Choose a reason for hiding this comment

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

This looks good to me - we need to revisit sigma_8 vs. sigma_8^2 and physical units when handling issue #24 (document units)

@elikrause elikrause merged commit 78dfbd7 into master Sep 25, 2016
@elikrause elikrause deleted the codecompare branch September 25, 2016 22:27
@rmandelb
Copy link

As a matter of practice, I recommend not merging pull requests that have open questions/suggestions on the code in future. It's easier to iterate on any changes while the code remains on an unmerged branch.

@drphilmarshall
Copy link
Contributor

drphilmarshall commented Sep 26, 2016

To help a bit with this, I just went to the settings for CCL and turned on protection for the master branch: now, pull requests must be reviewed and approved before they can be merged. The admins of this repo (currently @elikrause @joachimi @damonge @elisachisari ) can change this setting as you like. (You can also add other things, like requiring status checks to pass etc. This is a good idea for when your unit tests are up and running).

BTW, I notice in the "Collaborators and Teams" section of this repo's settings that you are using the "collaborators" facility to enable write access for a large group of people. I suggest that one of you admins instead makes a team, called "CCL-developers" or something, and add these people to it before removing them as "collaborators". The reason is that you can then talk to each other better: if someone needs to say something that all developers need to hear, you can @mention the team name and they will get a "mention" notification (as opposed to a regular "watching" notification). The "collaborators" type is best reserved for people who are not members of the organization, I think - it certainly makes it easy to see who those people are!

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

Successfully merging this pull request may close these issues.

5 participants