search

LinErinG / ebtel-hxr

Routines for calculating expected HXR fluxes from EBTEL nanoflare simulations
2 stars 2 forks source link

Updated dem_aia and dem_xrt #5

Closed anjmarsh closed 7 years ago

anjmarsh commented 7 years ago

Hi Lindsay,

I'm putting in this pull request to merge the addition of a save directory keyword to dem_aia and dem_xrt into your working branch from my working branch. This is the only change I had in mind, but I notice that it will add in other files that I asked to merge (separate request) between our master branches.

Note: I actually just updated those files because I made an error in my code the first time. I think I integrated that into this pull request ... guess we will find out soon enough! I'm not 100% sure that this is a good idea in terms of how Git functions, so feel free to turn down my request.

LinErinG commented 7 years ago

@anjmarsh Ooh good -- a chance to try out the inner workings of GitHub! I'll accept the other one first and then we'll see what happens to this one. I note that Git tells me there is a conflict that must be resolved before merging, so this one may come to blows! 🗡

LinErinG commented 7 years ago

Ok, well that got a little ugly (mostly because I edited myself in circles) but I think it's resolved now. I should probably clean up my repository by reconciling any differences between my master and working branches. "Working" is really just meant as a temporary space for stuff I want to try out, but over time it became the branch I used more often!