Small doc updates

OGGM · Jan 5, 2023 · f8aed56 · f8aed56
1 parent 2ee472f
commit f8aed56
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 7 deletions.
diff --git a/docs/_code/prepare_climate.py b/docs/_code/prepare_climate.py
@@ -39,6 +39,7 @@
 cfg.PARAMS['use_winter_prcp_factor'] = False
 cfg.PARAMS['hydro_month_nh'] = 10
 cfg.PARAMS['hydro_month_sh'] = 4
+cfg.PARAMS['prcp_scaling_factor'] = 2.5
 tasks.process_histalp_data(gdir)
 with warnings.catch_warnings():
     warnings.filterwarnings("ignore", category=FutureWarning)

diff --git a/docs/_static/logos/logo.png b/docs/_static/logos/logo.png
diff --git a/docs/_static/logos/logo_bck.png b/docs/_static/logos/logo_bck.png
diff --git a/docs/_static/logos/logo_shop.png b/docs/_static/logos/logo_shop.png
diff --git a/docs/_static/logos/oggm_dark_l_alpha.png b/docs/_static/logos/oggm_dark_l_alpha.png
diff --git a/docs/_static/logos/oggm_dark_s_alpha.png b/docs/_static/logos/oggm_dark_s_alpha.png
diff --git a/docs/_static/logos/oggm_icon_alpha.png b/docs/_static/logos/oggm_icon_alpha.png
diff --git a/docs/_static/logos/oggm_icon_alpha_all.png b/docs/_static/logos/oggm_icon_alpha_all.png
diff --git a/docs/_static/logos/oggm_icon_alpha_out.png b/docs/_static/logos/oggm_icon_alpha_out.png
diff --git a/docs/_static/logos/oggm_l.png b/docs/_static/logos/oggm_l.png
diff --git a/docs/_static/logos/oggm_l_alpha.png b/docs/_static/logos/oggm_l_alpha.png
diff --git a/docs/_static/logos/oggm_l_alpha_all.png b/docs/_static/logos/oggm_l_alpha_all.png
diff --git a/docs/_static/logos/oggm_night_l_alpha.png b/docs/_static/logos/oggm_night_l_alpha.png
diff --git a/docs/_static/logos/oggm_night_s_alpha.png b/docs/_static/logos/oggm_night_s_alpha.png
diff --git a/docs/_static/logos/oggm_pride_l_alpha.png b/docs/_static/logos/oggm_pride_l_alpha.png
diff --git a/docs/_static/logos/oggm_pride_s_alpha.png b/docs/_static/logos/oggm_pride_s_alpha.png
diff --git a/docs/_static/logos/oggm_rainbow_l_alpha.png b/docs/_static/logos/oggm_rainbow_l_alpha.png
diff --git a/docs/_static/logos/oggm_rainbow_s_alpha.png b/docs/_static/logos/oggm_rainbow_s_alpha.png
diff --git a/docs/_static/logos/oggm_s.png b/docs/_static/logos/oggm_s.png
diff --git a/docs/_static/logos/oggm_s_alpha.png b/docs/_static/logos/oggm_s_alpha.png
diff --git a/docs/_static/logos/oggm_s_alpha_all.png b/docs/_static/logos/oggm_s_alpha_all.png
diff --git a/docs/_static/plot_border_size.png b/docs/_static/plot_border_size.png
diff --git a/docs/citing-oggm.rst b/docs/citing-oggm.rst
@@ -59,16 +59,39 @@ The OGGM logos are free to use!
 
 .. image:: _static/logo.png
 
-
 **full logo**:
 `pdf <_static/logos/oggm.pdf>`_,
-`large (2004x856) <_static/logos/oggm_l.png>`_,
-`large (2004x856) with alpha channel <_static/logos/oggm_l_alpha.png>`_,
-`small (502x214) <_static/logos/oggm_s.png>`_,
-`small (502x214) with alpha channel <_static/logos/oggm_s_alpha.png>`_
+`logo large (2008x858) <_static/logos/oggm_l.png>`_,
+`logo large (2008x858) with alpha channel <_static/logos/oggm_l_alpha.png>`_,
+`logo small (502x215) <_static/logos/oggm_s.png>`_,
+`logo small (502x215) with alpha channel <_static/logos/oggm_s_alpha.png>`_
 
 .. image:: _static/logos/oggm_icon.png
 
 **icon logo**:
-`small (135x157) <_static/logos/oggm_icon.png>`_,
-`small (135x157) with alpha channel <_static/logos/oggm_icon_alpha.png>`_
+`icon small (135x157) <_static/logos/oggm_icon.png>`_,
+`icon small (135x157) with alpha channel <_static/logos/oggm_icon_alpha.png>`_
+
+.. image:: _static/logos/oggm_dark_s_alpha.png
+
+**dark background logo**:
+`dark large (2008x858) with alpha channel <_static/logos/oggm_dark_l_alpha.png>`_,
+`dark small (502x215) with alpha channel <_static/logos/oggm_dark_s_alpha.png>`_
+
+.. image:: _static/logos/oggm_rainbow_s_alpha.png
+
+**OGGM rainbow**:
+`rainbow large (2004x856) with alpha channel <_static/logos/oggm_rainbow_l_alpha.png>`_,
+`rainbow small (502x215) with alpha channel <_static/logos/oggm_rainbow_s_alpha.png>`_
+
+.. image:: _static/logos/oggm_night_s_alpha.png
+
+**night dark background logo**:
+`night dark large (2008x858) with alpha channel <_static/logos/oggm_night_l_alpha.png>`_,
+`night dark small (502x215) with alpha channel <_static/logos/oggm_night_s_alpha.png>`_
+
+.. image:: _static/logos/oggm_pride_s_alpha.png
+
+**OGGM pride**:
+`pride large (2004x856) with alpha channel <_static/logos/oggm_pride_l_alpha.png>`_,
+`pride small (502x215) with alpha channel <_static/logos/oggm_pride_s_alpha.png>`_
diff --git a/oggm/core/climate.py b/oggm/core/climate.py
@@ -556,6 +556,11 @@ def mb_climate_on_height(gdir, heights, *, time_range=None, year_range=None):
             df['glacier_prcp_scaling_factor'] = prcp_fac
             gdir.write_json(df, 'local_mustar')
     else:
+        if not cfg.PARAMS['prcp_scaling_factor']:
+            msg = ("If `PARAMS['use_winter_prcp_factor']` is set to False, "
+                   "you need to set `PARAMS['prcp_scaling_factor']` "
+                   "accordingly")
+            raise InvalidWorkflowError(msg)
         prcp_fac = cfg.PARAMS['prcp_scaling_factor']
     default_grad = cfg.PARAMS['temp_default_gradient']
     g_minmax = cfg.PARAMS['temp_local_gradient_bounds']