Directory [root]

Directory Created:
2009-03-10 13:43
Total Files:
79
Deleted Files:
3
Lines of Code:
5973

[root]

Lines of Code

Lines of Code

Developers

Author Changes Lines of Code Lines per Change
axs 354 (100.0%) 9432 (100.0%) 26.6

Most Recent Commits

axs 2011-04-15 17:29 Rev.: 310

Some changes to files so that they'll work outside of the grand big loop.

258 lines of code changed in 8 files:

  • MOFlowEarthCMB.m (+1 -1), all_oceans.m (+6 -2), finallayercalculations.m (+5 -5), graphsdeep.m (+202 -190), kd_perovskite.dat (+2 -2), monteLoop.m (+1 -1), perovskite.m (+36 -20), plotMonte.m (+5 -5)
axs 2011-03-28 19:11 Rev.: 297

Running overnight!

33 lines of code changed in 2 files:

  • all_oceans.m (+3), monteLoop.m (+30 -18)
axs 2011-03-27 23:32 Rev.: 296

Got scatter plots and color change working.

79 lines of code changed in 3 files:

  • colorTest.m (new 8), monteLoop.m (+1 -13), plotMonte.m (new 70)
axs 2011-03-21 22:58 Rev.: 282

The Monte Carlo simulation works! It now will print out a final plot. Turned off a lot of the disp and fprintfs in Ddoubleprime, sortandinvertperovskite, and all_oceans.

22 lines of code changed in 4 files:

  • Ddoubleprime.m (+4 -4), all_oceans.m (+2 -2), monteLoop.m (+15 -4), sortandinvertperovskite.m (+1 -1)
axs 2011-03-20 01:39 Rev.: 279

Monte Carlo method should be implemented. Will continue testing in the morning to make sure that Kds for perovskite are actually getting the correct values.

153 lines of code changed in 6 files:

  • Ddoubleprime.m (+11 -10), epNd.m (+9 -5), finallayercalculations.m (+14 -5), magnesiowustite.m (+14 -14), monteLoop.m (+103 -100), sortandinvertperovskite.m (+2 -2)
axs 2011-03-20 00:54 Rev.: 278

Monte Carlo methoding for magnesiowustite and perovskite partition coefficients.

401 lines of code changed in 10 files:

  • MOFlowEarthCMB.m (+3 -3), epNd.m (+1 -1), fractionatedeepEarth.m (+2 -2), gammaolivine.m (new 55), globals.m (+2 -3), kd_magnesiowustite.dat (+6 -11), magnesiowustite.m (+22 -15), monteLoop.m (new 251), perovskite.m (+28 -19), testMonte.m (new 31)
axs 2011-03-17 22:52 Rev.: 276

Bug: using incorrect constant for multiplication in epNd. epNd now recreates values from Carlson's spreadsheet faithfully. Time for Monte Carlo simulations!

107 lines of code changed in 2 files:

  • all_oceans.m (+14 -6), epNd.m (+93 -65)
axs 2011-03-17 16:21 Rev.: 275

Trying to get spreadsheet behaviors into MATLAB.

158 lines of code changed in 4 files:

  • epNd.m (+144 -55), graphsdeep.m (+3 -3), kd_perovskite.dat (+4 -4), perovskite.m (+7 -3)
axs 2011-03-14 00:18 Rev.: 266

Aaaaaand now it compiles and runs. Takes about twice as long, but now it'll be more modular.

39 lines of code changed in 15 files:

  • beta.m (+1 -1), clinopyroxene.m (+1 -1), fractionatedeepEarth.m (+25 -25), gamma_mineral.m (+1 -1), gammamin.m (+1 -1), garnet.m (+1 -1), globals.m (+1 -1), magnesiowustite.m (+1 -1), majorite.m (+1 -1), olivine.m (+1 -1), orthopyroxene.m (+1 -1), perovskite.m (+1 -1), plagioclase.m (+1 -1), postperovskite.m (+1 -1), spinel.m (+1 -1)
axs 2011-03-14 00:09 Rev.: 265

Created three .dat files containing partition coefficient information for post-perovskite, perovskite, and magnesiowustite. Their formatting specifics are in README_KD. Changes should no longer be made to the relevant mineral files.
This is all per a conversation with R. Carlson in which he said that the partition coefficients for Sm, Nd, U, and Th in certain mantle minerals are not well constrained; thus, I wanted to make it easier to change the values of these minerals without having to edit the m files directly.

For future reference, magnesiowustitedensity has human-readable parameters, but I'm unsure if all of them are getting used in the density/volume calculations.

98 lines of code changed in 7 files:

  • README_KD (new 40), kd_magnesiowustite.dat (new 11), kd_perovskite.dat (new 7), kd_postperovskite.dat (new 11), magnesiowustite.m (+9 -6), perovskite.m (+11 -8), postperovskite.m (+9 -6)
axs 2011-03-13 23:29 Rev.: 264

Removed MWs from each mineral so they can be changed from only MOFlow.

Contemplating putting perovskite and postperovskite coefficients in one file for easier editing.

27 lines of code changed in 16 files:

  • MOFlowEarthCMB.m (+19 -1), beta.m (+2 -19), clinopyroxene.m (-16), gamma_mineral.m (-16), gammamin.m (-16), garnet.m (-15), magnesiowustite.m (-15), majorite.m (-16), makeSolidus.m (+1 -1), olivine.m (+1 -17), orthopyroxene.m (-16), perovskite.m (+1 -18), plagioclase.m (-16), postperovskite.m (-15), spinel.m (-15), surfacemeltdensity.m (+3 -2)
axs 2011-03-04 16:56 Rev.: 262

Got graphs in order to hand to Lindy.

153 lines of code changed in 6 files:

  • MOFlowEarthCMB.m (+32 -4), all_oceans.m (+1 -1), finallayercalculations.m (+43 -14), graphsdeep.m (+46 -16), leanGraphs.m (+13), makeSolidus.m (+18 -8)
axs 2011-02-23 12:52 Rev.: 259

Some recent tweaks. Graphs still aren't doing what they ought.

346 lines of code changed in 13 files:

  • BirchMurnsolidClino.m (new 64), BirchMurnsolidOlivine.m (new 56), Ddoubleprime.m (new 80), MOFlowEarthCMB.m (+7 -5), all_oceans.m (+2 -2), clinopyroxenedensity.m (+3 -3), epNd.m (+13 -5), fractionatedeepEarth.m (+1 -1), gammamin.m (new 71), graphsdeep.m (+29 -28), leanGraphs.m (+1 -1), test_liq_comp.m (new 11), testpcolor.m (new 8)
axs 2011-02-11 12:12 Rev.: 257

Changes from Lindy.

321 lines of code changed in 7 files:

  • MOFlowEarthCMB.m (+86 -188), NewBirchMurnliquid.m (+1 -1), finallayercalculations.m (+16 -101), fractionatedeepEarth.m (+6 -4), graphsdeep.m (+144 -285), makeSolidus.m (+67 -84), surfacemeltdensity.m (+1 -1)
axs 2011-01-31 18:34 Rev.: 256

Sending this copy to Lindy for review.

29 lines of code changed in 5 files:

  • MOFlowEarthCMB.m (+2 -2), epNd.m (+13 -15), finallayercalculations.m (+11 -9), graphsdeep.m (+3 -3), massBalance.m (del)
axs 2011-01-09 12:49 Rev.: 251

Final version from Friday before submitting!

38 lines of code changed in 5 files:

  • MOFlowEarthCMB.m (+7 -7), epNd.m (+2 -1), graphsdeep.m (+10 -10), makeSolidus.m (+12 -12), massDdoubleprime.m (+7)
axs 2011-01-06 17:54 Rev.: 241

Changes to epNd until 2 am :<

51 lines of code changed in 2 files:

  • MOFlowEarthCMB.m (+4 -2), epNd.m (+47 -14)
axs 2011-01-05 20:06 Rev.: 238

Getting 220 for \ep^142 Nd. Ah well....

38 lines of code changed in 4 files:

  • EER_Sm_Nd.m (changed), epNd.m (+27 -7), leanGraphs.m (+1 -1), massDdoubleprime.m (+10 -4)
axs 2011-01-05 04:38 Rev.: 237

I can has results? epNd.m now calculates \epsilon^142 Nd for the \Dpp with residual liquids added in. Need to fiddle with percentages in the morning. Until then, bed. Lots of writing tomorrow.

83 lines of code changed in 5 files:

  • EER_Sm_Nd.m (changed), MOFlowEarthCMB.m (+1), epNd.m (+26 -6), finallayercalculations.m (-1), massDdoubleprime.m (+56 -1)
axs 2011-01-05 01:46 Rev.: 236

Trying to calculate \epsilon^142 Nd.

23 lines of code changed in 2 files:

  • epNd.m (new 22), finallayercalculations.m (+1)
axs 2011-01-04 15:00 Rev.: 235

At this moment, this code produces a \Dpp layer. Do not feed clinopyroxenedensity.m its own version of the EOS. Olivine can probably take its own EOS, but

---everything is working for a magma ocean of 2,000 km in depth---

175 lines of code changed in 7 files:

  • BirchMurnsolid.m (+5 -2), MOFlowEarthCMB.m (+7 -1), deltaDensityTemp2.m (+11 -2), finallayercalculations.m (+9 -9), graphsdeep.m (+110 -110), leanGraphs.m (+28 -22), makeSolidus.m (+5 -8)
axs 2010-12-27 02:01 Rev.: 214

Trying to write the results section.

70 lines of code changed in 4 files:

  • leanGraphs.m (+40 -36), makeSolidus.m (+27 -8), massDdoubleprime.m (+2 -2), sortandinvert.m (+1 -1)
axs 2010-12-21 16:46 Rev.: 191

Fixed a typo in the comments regarding gamma/beta spinel.

1 lines of code changed in 1 file:

  • fractionatedeepEarth.m (+1 -1)
axs 2010-12-19 00:54 Rev.: 187

deltaDensity now uses pcolor/colormap to create the entrainment figure.

13 lines of code changed in 2 files:

  • deltaDensityTemp2.m (+10 -48), massDdoubleprime.m (+3)
axs 2010-12-09 04:09 Rev.: 171

Renamed MOFlow500 to ShallowMOFlow because I wanted tab-complete to be easier.
Changed deltaDensityTemp2 to use pcolor and colormap---much more useful display of information now.
Created leanGraphs, so I can focus on more useful graphs of density and the composition of things in liq_comp as a function of step.
Added a number of vectors to MOFlow to keep track of mass, volume, and composition.
Cleaned up globals.m and all_oceans.
Added more calculations to EER_Sm_Nd and massDdoubleprime for finding out densities.

630 lines of code changed in 13 files:

  • EER_Sm_Nd.m (changed), MOFlowEarth500.m (del), MOFlowEarthCMB.m (+34 -7), ShallowMOFlowEarth500.m (new 360), all_oceans.m (+3 -13), deltaDensityTemp.m (+4 -4), deltaDensityTemp2.m (+9 -6), finallayercalculations.m (+42 -31), globals.m (+7 -1), graphsdeep.m (+24 -1), leanGraphs.m (new 137), massDdoubleprime.m (+9 -4), sortandinvert.m (+1 -1)
axs 2010-11-20 03:57 Rev.: 169

Using Emily's version of liq_comp_calc; removed function and just calling the update directly in finallayercalculations.m. Variables should be correct; Henry's additions to finallayercalculations are important, especially regarding order of calls.

175 lines of code changed in 9 files:

  • MOFlowEarthCMB.m (+12 -4), all_oceans.m (+8 -1), finallayercalculations.m (+37 -5), graphsdeep.m (+93 -12), liq_comp_calc.m (+7 -15), liq_comp_calc_ECD.m (+5 -6), liq_comp_calc_HMH.m (+8 -4), makeSolidus.m (+3 -3), massDdoubleprime.m (+2 -2)
axs 2010-10-24 01:09 Rev.: 165

Changed the mass balance equation to be the one from Emily, which takes into account the volume ratio of the mantle properly.

99 lines of code changed in 7 files:

  • MOFlowEarthCMB.m (+3), all_oceans.m (+4 -2), eer_graph.m (new 24), finallayercalculations.m (+3 -1), liq_comp_calc.m (new 25), liq_comp_calc_ECD.m (new 27), liq_comp_calc_HMH.m (new 13)
axs 2010-10-23 02:26 Rev.: 164

Minor tweak.

1 lines of code changed in 1 file:

  • all_oceans.m (+1 -1)
axs 2010-05-23 21:41 Rev.: 160

Code solidifies oceans with depths up to 2000 km; made a change to finallayercalculations so that we run out of oxides faster.

Need to run out of oxides at the same step with all depths.

Need to look at what the density of solidified liquid would be.

17 lines of code changed in 4 files:

  • MOFlowEarthCMB.m (+8 -8), all_oceans.m (+4 -3), clinopyroxenedensity.m (+1 -1), finallayercalculations.m (+4 -4)
axs 2010-05-23 18:50 Rev.: 159

Some final commits before implementing Lindy's changes. Things to note: 2000km+ oceans no longer solidify, as they're throwing errors in clinopyroxene.

38 lines of code changed in 9 files:

  • BirchMurnsolid.m (+4 -4), MOFlowEarthCMB.m (+6 -3), PtoR.m (+9 -1), RtoP.m (+8 -2), all_oceans.m (+4 -3), clinopyroxenedensity.m (+2 -1), finallayercalculations.m (+1 -1), fractionatedeepEarth.m (+2 -2), graphsdeep.m (+2 -2)
axs 2010-05-17 19:39 Rev.: 158

Fixed the problem with the CMB variable being a depth, rather than a distance from the center of the planet. Propagated this change into Mantlevolume and Mantlemass. Made some minor tweaks to the graphs, and now MOFlow prints what depth of ocean you're dealing with.

39 lines of code changed in 8 files:

  • MOFlowEarth500.m (+5 -5), MOFlowEarthCMB.m (+22 -19), all_oceans.m (+3 -2), cool2clementpartial.m (+1 -1), cool2clementwhole.m (+1 -1), graphsdeep.m (+5 -5), ocean.m (+1 -1), sortandinvertperovskite.m (+1 -1)
axs 2010-05-16 22:17 Rev.: 157

Oh rubbish. Lindy had the _depth_ to the CMB written as the _radius_ of the CMB, so now I need to fix Mantlemass as well as the pressure function.

78 lines of code changed in 5 files:

  • all_oceans.m (+4 -4), fractionate500Earth.m (+2 -2), fractionatedeepEarth.m (+1 -1), gamma.m (del), gamma_mineral.m (new 71)
axs 2010-04-12 12:57 Rev.: 151

This still doesn't work for depths greather than 2,000 km, but hey, some of these changes were necessary.

12 lines of code changed in 6 files:

  • EER_Sm_Nd.m (changed), MOFlowEarthCMB.m (+1 -1), RtoP.m (+1), all_oceans.m (+3 -2), clinopyroxenedensity.m (+6 -2), finallayercalculations.m (+1 -1)
axs 2010-03-29 00:05 Rev.: 150

Some pretty major changes occurred tonight, to whit:

BUG: MOFlowCMB only works for depths below 2500 (exclusive). It works for shallow but not deep oceans!

marker1 and marker2 are ignored for shallow oceans, since we don't run the layers they're referenced in

liq_comp or liquid composition is now calculated using the mass of the layers below the current layer, rather than a volume ratio as previously was used.

602 lines of code changed in 10 files:

  • MOFlowEarth500.m (new 360), MOFlowEarthCMB.m (+1), all_oceans.m (+1 -1), clinopyroxene.m (+3 -1), clinopyroxenedensity.m (+4), finallayercalculations.m (+54 -16), five00ocean.m (new 17), five_ocean.m (new 24), solidusfitEarthNew.m (new 44), sortandinvertperovskite.m (+94 -87)
axs 2010-03-27 19:42 Rev.: 149

Getting ready for the action date on 3/28/2010. Tried to make EER_Sm_Nd more readable; what the heck are there two rows for in the array?

1 lines of code changed in 2 files:

  • EER_Sm_Nd.m (changed), all_oceans.m (+1 -2)
axs 2009-06-17 18:02 Rev.: 142

More changes to see if the globals are working correctly

19 lines of code changed in 3 files:

  • EER_Sm_Nd.m (changed), MOFlowEarthCMB.m (+13 -3), globals.m (+6 -1)
axs 2009-06-09 22:19 Rev.: 140

added marker 50 points up from bottom on Dsolinv

3 lines of code changed in 1 file:

  • graphsdeep.m (+3)
axs 2009-06-09 22:03 Rev.: 139

COMMENTED OUT XRECORD FOR SPEEEEDDDDD

13 lines of code changed in 3 files:

  • BirchMurnsolid.m (+3 -3), all_oceans.m (+4 -3), globals.m (+6 -8)
axs 2009-06-09 21:36 Rev.: 138

I am pretty sure I have results now.

0 lines of code changed in 2 files:

  • EER_Sm_Nd.m (changed), all_oceans.m (-1)
axs 2009-06-09 21:26 Rev.: 137

More changes to EER_Sm_Nd.m to generalize and to use global variables. Probably utilize.

5 lines of code changed in 3 files:

  • EER_Sm_Nd.m (changed), all_oceans.m (+4), ocean.m (+1 -1)

(46 more)

Generated by StatSVN 0.7.0