Merge branch 'main' of github.com:pism/pism-ragis

pism · Jan 16, 2025 · dc069ad · dc069ad
2 parents a727866 + 8497e34
commit dc069ad
Show file tree

Hide file tree

Showing 6 changed files with 1,611 additions and 4 deletions.
diff --git a/analysis/analyze_spatial.py b/analysis/analyze_spatial.py
@@ -142,7 +142,7 @@
     ragis_config = toml.load(ragis_config_file)
     sampling_year = 2018
 
-    ds = load_ensemble(spatial_files, preprocess=preprocess_nc)
+    ds = load_ensemble(spatial_files, preprocess=preprocess_nc, parallel=True
     sim_ds = ds.sel({"time": str(sampling_year)}).mean(dim="time")
 
     observed = (
@@ -173,7 +173,7 @@
         simulated=sim_ds,
         log_likelihood=log_normal,
         n_samples=len(ds.exp_id),
-        fudge_factor=10,
+        fudge_factor=50,
         obs_mean_var="v",
         obs_std_var="v_err",
         sim_var="velsurf_mag",

diff --git a/uq/draw_ragis_samples.py b/uq/draw_ragis_samples.py
@@ -53,8 +53,7 @@
 dists: Dict[str, Any] = {
     "ragis": {
         "uq": {
-            "calving.vonmises_calving.sigma_max": uniform(loc=350_000, scale=300_000),
-            "calving.rate_scaling.file": randint(0, 5),
+            "calving.vonmises_calving.sigma_max": uniform(loc=300_000, scale=500_000),
             "ocean.th.gamma_T": uniform(loc=0.75e-4, scale=0.75e-4),
             "ocean_file": randint(0, len(gcms)),
             "climate_file": randint(0, len(rcms)),