added missing prescribed_retreat

pism · Mar 27, 2024 · 5d21da6 · 5d21da6
1 parent 0c79e98
commit 5d21da6
Show file tree

Hide file tree

Showing 3 changed files with 155 additions and 215 deletions.
diff --git a/uq/draw_ragis_samples.py b/uq/draw_ragis_samples.py
@@ -75,6 +75,7 @@
             "phi_max": 40,
             "till_effective_fraction_overburden": 0.02,
             "sliding_law": "pseudo_plastic",
+            "prescribed_retreat_file": None
         },
     },
     "stress_balance": {
@@ -88,19 +89,22 @@
             "climate_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
             "runoff_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
             "gamma_T": 1.00e-4,
-            "salinity": 34,
-            "pseudo_plastic_q": 0.6,
-            "sia_e": 1.25,
-            "ssa_n": 3.25,
             "calving.thickness_calving.threshold": 100,
-            "vcm": 0.75,
+            "pseudo_plastic_q": 0.7508221,
+            "sia_e": 2.608046,
+            "ssa_n": 3.309718,
             "fractures": "false",
-            "z_min": -700,
-            "z_max": 700,
-            "phi_min": 5,
-            "phi_max": 40,
-            "till_effective_fraction_overburden": 0.02,
+            "vcm": 1,
+            "gamma_T": 1e-4,
+            "surface.pdd.refreeze": 0.6,
+            "till_effective_fraction_overburden": 0.01845403,
             "sliding_law": "pseudo_plastic",
+            "phi_min": 7.193718,
+            "phi_max": 42.79528,
+            "z_min": -369.6359,
+            "z_max": 243.8239,
+            "sliding_law": "pseudo_plastic",
+            "prescribed_retreat_file": None
         },
     },
     "calving": {
@@ -124,6 +128,7 @@
             "calving.thickness_calving.threshold": 100,
             "fractures": "false",
             "sliding_law": "pseudo_plastic",
+            "prescribed_retreat_file": None
         },
     },
     "ocean-calving": {
@@ -140,97 +145,21 @@
             "ocean_file": "MAR3.9_CNRM-ESM2_ssp585_ocean_1960-2100_v4.nc",
             "climate_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
             "runoff_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
-            "pseudo_plastic_q": 0.6,
-            "sia_e": 1.25,
-            "ssa_n": 3.25,
-            "fractures": "false",
-            "sliding_law": "pseudo_plastic",
-            "z_min": -700,
-            "z_max": 700,
-            "phi_min": 5,
-            "phi_max": 40,
-            "till_effective_fraction_overburden": 0.02,
-            "calving.thickness_calving.threshold": 100,
-        },
-    },
-    "ocean-calving-init": {
-        "uq": {
-            "vcm": uniform(loc=0.25, scale=0.75),
-            "gamma_T": uniform(loc=1e-4, scale=0.5e-4),
-            "ocean_file": randint(0, len(gcms)),
-            "calving.thickness_calving.file": randint(0, len(tcts)),
-            "input.regrid.file": randint(0, len(initialstates)),
-        },
-        "default_values": {
-            "climate": "given_smb",
-            "hydrology": "routing",
-            "frontal_melt": "routing",
-            "ocean_file": "MAR3.9_CNRM-ESM2_ssp585_ocean_1960-2100_v4.nc",
-            "climate_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
-            "runoff_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
-            "pseudo_plastic_q": 0.6,
-            "sia_e": 1.25,
-            "ssa_n": 3.25,
-            "fractures": "false",
-            "sliding_law": "pseudo_plastic",
-            "z_min": -700,
-            "z_max": 700,
-            "phi_min": 5,
-            "phi_max": 40,
-            "till_effective_fraction_overburden": 0.02,
-        },
-    },
-    "thickness-calving": {
-        "uq": {
-            "vcm": uniform(loc=0.2, scale=0.8),
-            "gamma_T": uniform(loc=1e-4, scale=0.5e-4),
-            "ocean_file": randint(0, len(gcms)),
-            "calving.thickness_calving.threshold": uniform(loc=50, scale=450),
-        },
-        "default_values": {
-            "climate": "given_smb",
-            "hydrology": "routing",
-            "frontal_melt": "routing",
-            "ocean_file": "MAR3.9_CNRM-ESM2_ssp585_ocean_1960-2100_v4.nc",
-            "climate_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
-            "runoff_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
-            "pseudo_plastic_q": 0.6,
-            "sia_e": 1.25,
-            "ssa_n": 3.25,
-            "fractures": "false",
-            "sliding_law": "pseudo_plastic",
-            "z_min": -700,
-            "z_max": 700,
-            "phi_min": 5,
-            "phi_max": 40,
-            "till_effective_fraction_overburden": 0.02,
-        },
-    },
-    "ocean": {
-        "uq": {
-            "vcm": uniform(loc=0.2, scale=0.8),
-            "gamma_T": uniform(loc=1e-4, scale=0.5e-4),
-            "ocean_file": randint(0, len(gcms)),
-        },
-        "default_values": {
-            "climate": "given_smb",
-            "hydrology": "routing",
-            "frontal_melt": "routing",
-            "ocean_file": "MAR3.9_CNRM-ESM2_ssp585_ocean_1960-2100_v4.nc",
-            "climate_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
-            "runoff_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
-            "salinity": 34,
-            "pseudo_plastic_q": 0.6,
-            "sia_e": 1.25,
-            "ssa_n": 3.25,
+            "pseudo_plastic_q": 0.7508221,
+            "sia_e": 2.608046,
+            "ssa_n": 3.309718,
             "fractures": "false",
+            "vcm": 1,
+            "gamma_T": 1e-4,
+            "surface.pdd.refreeze": 0.6,
+            "till_effective_fraction_overburden": 0.01845403,
             "sliding_law": "pseudo_plastic",
-            "z_min": -700,
-            "z_max": 700,
-            "phi_min": 5,
-            "phi_max": 40,
-            "till_effective_fraction_overburden": 0.02,
+            "phi_min": 7.193718,
+            "phi_max": 42.79528,
+            "z_min": -369.6359,
+            "z_max": 243.8239,
             "calving.thickness_calving.threshold": 50,
+            "prescribed_retreat_file": None
         },
     },
     "ocean-simple": {
@@ -247,18 +176,23 @@
             "ocean_file": "MAR3.9_CNRM-ESM2_ssp585_ocean_1960-2100_v4.nc",
             "climate_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
             "runoff_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
+            "fractures": "false",
             "salinity": 34,
-            "pseudo_plastic_q": 0.6,
-            "sia_e": 1.25,
-            "ssa_n": 3.25,
+            "pseudo_plastic_q": 0.7508221,
+            "sia_e": 2.608046,
+            "ssa_n": 3.309718,
             "fractures": "false",
+            "vcm": 1,
+            "gamma_T": 1e-4,
+            "surface.pdd.refreeze": 0.6,
+            "till_effective_fraction_overburden": 0.01845403,
             "sliding_law": "pseudo_plastic",
-            "z_min": -700,
-            "z_max": 700,
-            "phi_min": 5,
-            "phi_max": 40,
-            "till_effective_fraction_overburden": 0.02,
+            "phi_min": 7.193718,
+            "phi_max": 42.79528,
+            "z_min": -369.6359,
+            "z_max": 243.8239,
             "calving.thickness_calving.threshold": 50,
+            "prescribed_retreat_file": None
         },
     },
     "calving-simple": {
@@ -277,16 +211,21 @@
             "climate_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
             "runoff_file": "DMI-HIRHAM5_ERA_1975_2020_EPSG3413_4500M_MM.nc",
             "salinity": 34,
-            "pseudo_plastic_q": 0.6,
-            "sia_e": 1.25,
-            "ssa_n": 3.25,
             "fractures": "false",
+            "pseudo_plastic_q": 0.7508221,
+            "sia_e": 2.608046,
+            "ssa_n": 3.309718,
+            "fractures": "false",
+            "vcm": 1,
+            "gamma_T": 1e-4,
+            "surface.pdd.refreeze": 0.6,
+            "till_effective_fraction_overburden": 0.01845403,
             "sliding_law": "pseudo_plastic",
-            "z_min": -700,
-            "z_max": 700,
-            "phi_min": 5,
-            "phi_max": 40,
-            "till_effective_fraction_overburden": 0.02,
+            "phi_min": 7.193718,
+            "phi_max": 42.79528,
+            "z_min": -369.6359,
+            "z_max": 243.8239,
+            "prescribed_retreat_file": None
         },
     },
     "dem": {
@@ -321,6 +260,7 @@
             "phi_max": 42.79528,
             "z_min": -369.6359,
             "z_max": 243.8239,
+            "prescribed_retreat_file": None
         },
     },
 }