We can now define sigma of the priors in the *-prior.txt files.

parrenin · Feb 2, 2015 · ce3a1b3 · ce3a1b3
1 parent f7bcf75
commit ce3a1b3
Show file tree

Hide file tree

Showing 33 changed files with 49,646 additions and 99,273 deletions.
diff --git a/AICC2012-VLR/EDC/LID-prior.txt b/AICC2012-VLR/EDC/LID-prior.txt
diff --git a/AICC2012-VLR/EDC/LID-sigma-prior.txt b/AICC2012-VLR/EDC/LID-sigma-prior.txt
diff --git a/AICC2012-VLR/EDC/accu-prior.txt b/AICC2012-VLR/EDC/accu-prior.txt
diff --git a/AICC2012-VLR/EDC/accu-sigma-prior.txt b/AICC2012-VLR/EDC/accu-sigma-prior.txt
diff --git a/AICC2012-VLR/EDC/thinning-prior.txt b/AICC2012-VLR/EDC/thinning-prior.txt
diff --git a/AICC2012-VLR/EDC/thinning-sigma-prior.txt b/AICC2012-VLR/EDC/thinning-sigma-prior.txt
diff --git a/AICC2012-VLR/EDML/LID-prior.txt b/AICC2012-VLR/EDML/LID-prior.txt
diff --git a/AICC2012-VLR/EDML/LID-sigma-prior.txt b/AICC2012-VLR/EDML/LID-sigma-prior.txt
diff --git a/AICC2012-VLR/EDML/accu-prior.txt b/AICC2012-VLR/EDML/accu-prior.txt
diff --git a/AICC2012-VLR/EDML/accu-sigma-prior.txt b/AICC2012-VLR/EDML/accu-sigma-prior.txt
diff --git a/AICC2012-VLR/EDML/thinning-prior.txt b/AICC2012-VLR/EDML/thinning-prior.txt
diff --git a/AICC2012-VLR/EDML/thinning-sigma-prior.txt b/AICC2012-VLR/EDML/thinning-sigma-prior.txt
diff --git a/AICC2012-VLR/NGRIP/LID-prior.txt b/AICC2012-VLR/NGRIP/LID-prior.txt
diff --git a/AICC2012-VLR/NGRIP/LID-sigma-prior.txt b/AICC2012-VLR/NGRIP/LID-sigma-prior.txt
diff --git a/AICC2012-VLR/NGRIP/accu-prior.txt b/AICC2012-VLR/NGRIP/accu-prior.txt
diff --git a/AICC2012-VLR/NGRIP/accu-sigma-prior.txt b/AICC2012-VLR/NGRIP/accu-sigma-prior.txt
diff --git a/AICC2012-VLR/NGRIP/thinning-prior.txt b/AICC2012-VLR/NGRIP/thinning-prior.txt
diff --git a/AICC2012-VLR/NGRIP/thinning-sigma-prior.txt b/AICC2012-VLR/NGRIP/thinning-sigma-prior.txt
diff --git a/AICC2012-VLR/TALDICE/LID-prior.txt b/AICC2012-VLR/TALDICE/LID-prior.txt
diff --git a/AICC2012-VLR/TALDICE/LID-sigma-prior.txt b/AICC2012-VLR/TALDICE/LID-sigma-prior.txt
diff --git a/AICC2012-VLR/TALDICE/accu-prior.txt b/AICC2012-VLR/TALDICE/accu-prior.txt
diff --git a/AICC2012-VLR/TALDICE/accu-sigma-prior.txt b/AICC2012-VLR/TALDICE/accu-sigma-prior.txt
diff --git a/AICC2012-VLR/TALDICE/thinning-prior.txt b/AICC2012-VLR/TALDICE/thinning-prior.txt
diff --git a/AICC2012-VLR/TALDICE/thinning-sigma-prior.txt b/AICC2012-VLR/TALDICE/thinning-sigma-prior.txt
diff --git a/AICC2012-VLR/VK/LID-prior.txt b/AICC2012-VLR/VK/LID-prior.txt
diff --git a/AICC2012-VLR/VK/LID-sigma-prior.txt b/AICC2012-VLR/VK/LID-sigma-prior.txt
diff --git a/AICC2012-VLR/VK/accu-prior.txt b/AICC2012-VLR/VK/accu-prior.txt
diff --git a/AICC2012-VLR/VK/accu-sigma-prior.txt b/AICC2012-VLR/VK/accu-sigma-prior.txt
diff --git a/AICC2012-VLR/VK/thinning-prior.txt b/AICC2012-VLR/VK/thinning-prior.txt
diff --git a/AICC2012-VLR/VK/thinning-sigma-prior.txt b/AICC2012-VLR/VK/thinning-sigma-prior.txt
diff --git a/AICC2012-VLR/parameters-CovariancePrior-AllDrillings-init.py b/AICC2012-VLR/parameters-CovariancePrior-AllDrillings-init.py
@@ -21,21 +21,6 @@
 
 ##Now we define the sigmas
 
-#sigmap_corr_a
-readarray=np.loadtxt(datadir+self.label+'/accu-sigma-prior.txt')
-f=interp1d(self.age_model[:-1],readarray, bounds_error=False, fill_value=readarray[-1])
-self.sigmap_corr_a=f(self.corr_a_age)
-
-#Sigmap_corr_tau
-readarray=np.loadtxt(datadir+self.label+'/thinning-sigma-prior.txt')
-f=interp1d(self.depth[:-1],readarray, bounds_error=False, fill_value=readarray[-1])
-self.sigmap_corr_tau=f(self.corr_tau_depth)
-
-#Sigmap_corr_LID
-readarray=np.loadtxt(datadir+self.label+'/LID-sigma-prior.txt')
-f=interp1d(self.age_model,readarray, bounds_error=False, fill_value=readarray[-1])
-self.sigmap_corr_LID=f(self.corr_LID_age)
-
 
 #def weighted_std(values, weights):
 #    """

diff --git a/IceChronoClasses.py b/IceChronoClasses.py
@@ -82,10 +82,12 @@ def init(self):
             readarray=np.loadtxt(datadir+self.label+'/accu-prior.txt')
             self.a_depth=readarray[:,0]
             self.a_a=readarray[:,1]
+            self.a_sigma=readarray[:,2]
             f=interp1d_stair_aver_extrap(self.a_depth, self.a_a)
             self.a_model=f(self.depth)
             self.a=self.a_model
 
+
 
         self.age=np.empty_like(self.depth)
         self.gage=np.empty_like(self.depth)
@@ -113,6 +115,7 @@ def init(self):
             readarray=np.loadtxt(datadir+self.label+'/LID-prior.txt')
             self.LID_depth=readarray[:,0]
             self.LID_LID=readarray[:,1]
+            self.LID_sigma=readarray[:,2]
         f=interp1d_extrap(self.LID_depth, self.LID_LID)
         self.LID_model=f(self.depth)
 
@@ -131,6 +134,7 @@ def init(self):
             readarray=np.loadtxt(datadir+self.label+'/thinning-prior.txt')
             self.tau_depth=readarray[:,0]
             self.tau_tau=readarray[:,1]
+            self.tau_sigma=readarray[:,2]
             f=interp1d_extrap(self.tau_depth, self.tau_tau)
             self.tau_model=f(self.depth_mid)
             self.tau=self.tau_model
@@ -155,6 +159,15 @@ def init(self):
 
 ## Definition of the covariance matrix of the background
 
+        f=interp1d(self.fct_age_model((self.a_depth[1:]+self.a_depth[:-1])/2),self.a_sigma[:-1], bounds_error=False, fill_value=self.a_sigma[-1])
+        self.sigmap_corr_a=f(self.corr_a_age)
+
+        f=interp1d(self.fct_gage_model(self.LID_depth),self.LID_sigma, bounds_error=False, fill_value=self.LID_sigma[-1])
+        self.sigmap_corr_LID=f(self.corr_LID_age)
+
+        f=interp1d(self.tau_depth,self.tau_sigma, bounds_error=False, fill_value=self.tau_sigma[-1])
+        self.sigmap_corr_tau=f(self.corr_tau_depth)
+
         self.correlation_corr_a_before=self.correlation_corr_a+0
         self.correlation_corr_LID_before=self.correlation_corr_LID+0
         self.correlation_corr_tau_before=self.correlation_corr_tau+0

diff --git a/README.md b/README.md
@@ -127,9 +127,9 @@ Then you have one directory per drilling, which contains:
 - `parameters.py`                           : all the drilling specific parameters
 - `parameters-CovarianceObservations.py`    : this file allows to define the correlation of drilling specific observations
 - `density-prior.txt`                       : depth / relative density
-- `accu-prior.txt`                          : depth / background accu (in ice-equivalent)
-- `LID-prior.txt`                           : depth / background Lock-in-Depth
-- `thinning-prior.txt`                      : depth / background thinning function
+- `accu-prior.txt`                          : depth / background accu (in ice-equivalent) / sigma (in %)
+- `LID-prior.txt`                           : depth / background Lock-in-Depth / sigma (in %)
+- `thinning-prior.txt`                      : depth / background thinning function sigma (in %)
 - `ice_age.txt`                             : depth / age / sigma for ice age observations
 - `gas_age.txt`                             : depth / age / sigma for gas age observations
 - `Ddepth.txt`                              : depth / Delta-depth / sigma for Delta-depth observations