search

bkloppenborg / simtoi

The SImulation and Modeling Tool for Optical Interferometry
GNU General Public License v3.0
7 stars 6 forks source link

Added Alpha Disk (1973) #133

Closed therob762 closed 9 years ago

therob762 commented 9 years ago

Added Alpha Disk (1973) Changed height variable in Andrews and Pascucci to eliminate small angle approximation.

bkloppenborg commented 9 years ago

@therob762 , could you please re-open this pull request against the develop branch rather than master? Thanks.

therob762 commented 9 years ago

I believe that I have not requested against the develop branch. Also, as Fabien has not weighed in, I have changed the height to the z position, although I left the atan2 equations in but commented out. :)

Peace, Rob

On Wednesday, July 01, 2015 03:37:57 PM Brian Kloppenborg wrote:

@therob762 , could you please re-open this pull request against the develop branch rather than master? Thanks.

Reply to this email directly or view it on GitHub:

https://github.com/bkloppenborg/simtoi/pull/133#issuecomment-117842873

J. Robert Parks Sponsored Funded Professional Astronomer Department of Physics & Astronomy Georgia State University 25 Park Place South Room# 615 Atlanta, GA 30303 404-413-6081

bkloppenborg commented 9 years ago

@therob762 the pull request indicates it is against "bkloppenborg:master" rather than "bkloppenborg:develop" at the top of the page. Merging the pull request into master as proposed would pull in all changes from the develop branch... something we aren't quite ready to do. Please re-open the request against the develop branch.

therob762 commented 9 years ago

Sorry Brian, I thought that I had done that. I will be more careful on Monday.

Happy 4th!

Sent from my iPhone

On Jul 4, 2015, at 10:38 AM, Brian Kloppenborg notifications@github.com wrote:

@therob762 the pull request indicates it is against "bkloppenborg:master" rather than "bkloppenborg:develop" at the top of the page. Merging the pull request into master as proposed would pull in all changes from the develop branch... something we aren't quite ready to do. Please re-open the request against the develop branch.

— Reply to this email directly or view it on GitHub.

bkloppenborg commented 9 years ago

Awesome! Have a great holiday weekend!

therob762 commented 9 years ago

Okay I made a pull request to merge bkloppenborg:develop with therob762:alpha_disk. Hopefully I did that correctly.

Peace, Rob

On Saturday, July 04, 2015 07:38:34 AM Brian Kloppenborg wrote:

@therob762 the pull request indicates it is against "bkloppenborg:master" rather than "bkloppenborg:develop" at the top of the page. Merging the pull request into master as proposed would pull in all changes from the develop branch... something we aren't quite ready to do. Please re-open the request against the develop branch.

Reply to this email directly or view it on GitHub:

https://github.com/bkloppenborg/simtoi/pull/133#issuecomment-118517138

J. Robert Parks Sponsored Funded Professional Astronomer Department of Physics & Astronomy Georgia State University 25 Park Place South Room# 615 Atlanta, GA 30303 404-413-6081