• R/O
  • SSH

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revisión30739cf3253656d1aa3ac958117f7f083cc3d660 (tree)
Tiempo2007-08-06 08:53:30
Autoriselllo
Commiteriselllo

Log Message

I fixed a bug in 3D_R_plotting.R: since V_list is already the volume of
solid in each bin, it has to be multiplied by the primary (NOT the
effective) density to provide the mass in each bin.

Cambiar Resumen

Diferencia incremental

diff -r c22ec535b2ff -r 30739cf32536 R-codes/3D_R_plotting.R
--- a/R-codes/3D_R_plotting.R Sun Aug 05 17:25:06 2007 +0000
+++ b/R-codes/3D_R_plotting.R Sun Aug 05 23:53:30 2007 +0000
@@ -198,11 +198,14 @@
198198 V_150<-read.table("V_list", header=FALSE)
199199 V_150<-as.matrix(V_150)
200200
201-eff_dens<-read.table("./binning-plots/effective_density_bin",header=FALSE)
202-eff_dens<-as.matrix(eff_dens)
201+# eff_dens<-read.table("./binning-plots/effective_density_bin",header=FALSE)
202+# eff_dens<-as.matrix(eff_dens)
203203
204-mass_fitting<-eff_dens*V_150*final_fit*log_factor*log(10) #since final fit is dN/dlogd
205-mass_simu<-eff_dens*V_150*data_150[number_distr, ]*log_factor*log(10)
204+
205+rho_0<-1.3
206+
207+mass_fitting<-rho_0*V_150*final_fit*log_factor*log(10) #since final fit is dN/dlogd
208+mass_simu<-rho_0*V_150*data_150[number_distr, ]*log_factor*log(10)
206209
207210 my_error_mass<-sum((mass_fitting-mass_simu)^2)
208211
@@ -214,12 +217,13 @@
214217
215218 #initial mass distribution
216219
217-mass_ini<-mass_simu<-eff_dens*V_150*data_150[1, ]*log_factor*log(10)
220+mass_ini<-rho_0*V_150*data_150[1, ]*log_factor*log(10)
218221
219222 pdf("2D-mass_fitting.pdf")
220223 plot(D_mean,mass_ini,type="l",lty=2,lwd=2,col="black", log="x",
221224 ylab = list(expression(paste(mass," ["*cm^-3*"]"))),
222-xlab = expression(paste(D[agg]," [nm]"))
225+xlab = expression(paste(D[agg]," [nm]")),
226+ylim=range(0,max(mass_fitting,mass_ini,mass_simu))
223227 )
224228 lines(D_mean,mass_fitting,type="b",lty=1,pch=4,lwd=2,col="blue")
225229 lines(D_mean,mass_simu,lwd=2,col="brown")