diff --git a/esmvaltool/config-references.yml b/esmvaltool/config-references.yml index 7a181780bb..f48ac9a6ab 100644 --- a/esmvaltool/config-references.yml +++ b/esmvaltool/config-references.yml @@ -194,6 +194,10 @@ authors: name: Frank, Franziska institute: DLR, Germany orcid: https://orcid.org/0000-0002-2406-4936 + winterstein_franziska: + name: Winterstein, Franziska + institute: DLR, Germany + orcid: https://orcid.org/0000-0002-2406-4936 fuckar_neven: name: Fuckar, Neven institute: BSC, Spain diff --git a/esmvaltool/diag_scripts/clouds/clouds_taylor.ncl b/esmvaltool/diag_scripts/clouds/clouds_taylor.ncl index e2de9117cd..794c559b2f 100644 --- a/esmvaltool/diag_scripts/clouds/clouds_taylor.ncl +++ b/esmvaltool/diag_scripts/clouds/clouds_taylor.ncl @@ -11,7 +11,7 @@ ; 1) perfmetrics_main.ncl ; 2) perfmetrics_taylor.ncl ; 3) perfmetrics_taylor_collect.ncl -; originally written by Franziska Frank (DLR, Germany). +; originally written by Franziska Winterstein (DLR, Germany). ; Note: This code requires that all data are provided on the same grid. ; ; Required diag_script_info attributes (diagnostic specific) diff --git a/esmvaltool/diag_scripts/perfmetrics/collect.ncl b/esmvaltool/diag_scripts/perfmetrics/collect.ncl index 6381912e12..0fd2efe311 100644 --- a/esmvaltool/diag_scripts/perfmetrics/collect.ncl +++ b/esmvaltool/diag_scripts/perfmetrics/collect.ncl @@ -1,6 +1,6 @@ ; ############################################################################# ; WRAPPER SCRIPT FOR COLLECTING AND PLOTTING PRECALCULATED METRICS -; Author: Franziska Frank (DLR, Germany) +; Author: Franziska Winterstein (DLR, Germany) ; ESMVal project ; ############################################################################# ; Description @@ -42,7 +42,7 @@ ; 20140620-gottschaldt_klaus-dirk: modified output file naming (variable ; plotpath) and added option for explicit ; plot title. -; 20140204-frank_franziska: written. +; 20140204-winterstein_franziska: written. ; ; ############################################################################# @@ -473,19 +473,19 @@ begin if (diag_script_info@metric.eq."RMSD") then caption = "RMSD performance metric" statistics = (/"rmsd"/) - authors = (/"frank_franziska", "righi_mattia", "eyring_veronika"/) + authors = (/"winterstein_franziska", "righi_mattia", "eyring_veronika"/) plottype = "portrait" references = (/"righi15gmd", "gleckler08jgr"/) elseif (diag_script_info@metric.eq."BIAS") then caption = "Bias performance metric" statistics = (/"diff"/) - authors = (/"frank_franziska", "righi_mattia", "eyring_veronika"/) + authors = (/"winterstein_franziska", "righi_mattia", "eyring_veronika"/) plottype = "portrait" references = (/"righi15gmd", "gleckler08jgr"/) elseif (diag_script_info@metric.eq."taylor") then caption = "Taylor diagram" statistics = (/"rmsd", "corr"/) - authors = (/"frank_franziska", "righi_mattia", "eyring_veronika"/) + authors = (/"winterstein_franziska", "righi_mattia", "eyring_veronika"/) plottype = "taylor" references = (/"righi15gmd", "gleckler08jgr"/) elseif (diag_script_info@metric.eq."SMPI") then diff --git a/esmvaltool/diag_scripts/perfmetrics/cycle.ncl b/esmvaltool/diag_scripts/perfmetrics/cycle.ncl index d18ca3f565..5d6f25e945 100644 --- a/esmvaltool/diag_scripts/perfmetrics/cycle.ncl +++ b/esmvaltool/diag_scripts/perfmetrics/cycle.ncl @@ -1,6 +1,6 @@ ; ############################################################################# ; PROCEDURE FOR THE ANNUAL CYCLE PLOT OF THE PERFORMANCE METRICS -; Authors: Mattia Righi (DLR, Germany) and Franziska Frank (DLR, Germany) +; Authors: Mattia Righi (DLR, Germany) and Franziska Winterstein (DLR, Germany) ; ESMVal project ; ############################################################################# @@ -133,7 +133,8 @@ begin (/"mean", "stddev"/), \ diag_script_info@region, \ "seas", \ - (/"frank_franziska", "righi_mattia", "eyring_veronika"/), \ + (/"winterstein_franziska", "righi_mattia", \ + "eyring_veronika"/), \ (/"righi15gmd", "gleckler08jgr"/), \ metadata_att_as_array(info_items, "filename")) diff --git a/esmvaltool/diag_scripts/perfmetrics/cycle_latlon.ncl b/esmvaltool/diag_scripts/perfmetrics/cycle_latlon.ncl index da420f85c7..e54176b34f 100644 --- a/esmvaltool/diag_scripts/perfmetrics/cycle_latlon.ncl +++ b/esmvaltool/diag_scripts/perfmetrics/cycle_latlon.ncl @@ -1,6 +1,6 @@ ; ############################################################################# ; PROCEDURE FOR THE CYCLE-LATLON PLOT OF THE PERFORMANCE METRICS -; Authors: Mattia Righi (DLR, Germany) and Franziska Frank (DLR, Germany) +; Authors: Mattia Righi (DLR, Germany) and Franziska Winterstein (DLR, Germany) ; ESMVal project ; ############################################################################# @@ -120,7 +120,8 @@ begin (/"mean", "stddev"/), \ diag_script_info@region, \ "other", \ - (/"frank_franziska", "righi_mattia", "eyring_veronika"/), \ + (/"winterstein_franziska", "righi_mattia", \ + "eyring_veronika"/), \ (/"righi15gmd", "gleckler08jgr"/), \ info_items[imod]@filename) diff --git a/esmvaltool/diag_scripts/perfmetrics/cycle_zonal.ncl b/esmvaltool/diag_scripts/perfmetrics/cycle_zonal.ncl index 62bcff1966..9b86ebf0d5 100644 --- a/esmvaltool/diag_scripts/perfmetrics/cycle_zonal.ncl +++ b/esmvaltool/diag_scripts/perfmetrics/cycle_zonal.ncl @@ -92,7 +92,8 @@ begin (/"mean", "rmsd"/), \ diag_script_info@region, \ "other", \ - (/"frank_franziska", "righi_mattia", "eyring_veronika"/), \ + (/"winterstein_franziska", "righi_mattia", \ + "eyring_veronika"/), \ (/"righi15gmd", "gleckler08jgr"/), \ info_items[imod]@filename) diff --git a/esmvaltool/diag_scripts/perfmetrics/latlon.ncl b/esmvaltool/diag_scripts/perfmetrics/latlon.ncl index d5b65e8b6e..10bbaa242f 100644 --- a/esmvaltool/diag_scripts/perfmetrics/latlon.ncl +++ b/esmvaltool/diag_scripts/perfmetrics/latlon.ncl @@ -1,6 +1,6 @@ ; ############################################################################# ; PROCEDURE FOR THE LATLON PLOT OF THE PERFORMANCE METRICS -; Authors: Mattia Righi (DLR, Germany) and Franziska Frank (DLR, Germany) +; Authors: Mattia Righi (DLR, Germany) and Franziska Winterstein (DLR, Germany) ; ESMVal project ; ############################################################################# @@ -129,7 +129,8 @@ begin (/"mean", "rmsd"/), \ diag_script_info@region, \ "geo", \ - (/"frank_franziska", "righi_mattia", "eyring_veronika"/), \ + (/"winterstein_franziska", "righi_mattia", \ + "eyring_veronika"/), \ (/"righi15gmd", "gleckler08jgr"/), \ info_items[imod]@filename) @@ -211,7 +212,8 @@ begin (/"mean", "rmsd", "diff"/), \ diag_script_info@region, \ "zonal", \ - (/"frank_franziska", "righi_mattia", "eyring_veronika"/), \ + (/"winterstein_franziska", "righi_mattia", \ + "eyring_veronika"/), \ (/"righi15gmd", "gleckler08jgr"/), \ info_items[imod]@filename) diff --git a/esmvaltool/diag_scripts/perfmetrics/main.ncl b/esmvaltool/diag_scripts/perfmetrics/main.ncl index 0d683d6ef7..3789709b79 100644 --- a/esmvaltool/diag_scripts/perfmetrics/main.ncl +++ b/esmvaltool/diag_scripts/perfmetrics/main.ncl @@ -1,6 +1,6 @@ ; ############################################################################# ; MAIN SCRIPT FOR PERFORMANCE METRICS -; Authors: Mattia Righi (DLR, Germany) and Franziska Frank (DLR, Germany) +; Authors: Mattia Righi (DLR, Germany) and Franziska Winterstein (DLR, Germany) ; ESMVal project ; ############################################################################# ; @@ -92,7 +92,7 @@ ; 20140905-righi_mattia: consistent regridding and missing values mask. ; 20140701-gottschaldt_klaus-dirk: Adapted for T1M. ; 20140630-gottschaldt_klaus-dirk: Adapted for T0Ms. -; 20131203-frank_franziska: written. +; 20131203-winterstein_franziska: written. ; ; ############################################################################# @@ -353,7 +353,8 @@ begin ; Provenance information statistics = (/"rmsd"/) - authors = (/"frank_franziska", "righi_mattia", "eyring_veronika"/) + authors = (/"winterstein_franziska", "righi_mattia", \ + "eyring_veronika"/) references = (/"righi15gmd", "gleckler08jgr"/) elseif (diag_script_info@metric(met).eq."BIAS") then @@ -379,7 +380,8 @@ begin ; Provenance information statistics = (/"diff"/) - authors = (/"frank_franziska", "righi_mattia", "eyring_veronika"/) + authors = (/"winterstein_franziska", "righi_mattia", \ + "eyring_veronika"/) references = (/"righi15gmd", "gleckler08jgr"/) elseif (diag_script_info@metric(met).eq."taylor") then @@ -392,7 +394,8 @@ begin ; Provenance information statistics = (/"rmsd", "corr"/) - authors = (/"frank_franziska", "righi_mattia", "eyring_veronika"/) + authors = (/"winterstein_franziska", "righi_mattia", \ + "eyring_veronika"/) references = (/"righi15gmd", "gleckler08jgr"/) elseif (diag_script_info@metric(met).eq."SMPI") then diff --git a/esmvaltool/diag_scripts/perfmetrics/zonal.ncl b/esmvaltool/diag_scripts/perfmetrics/zonal.ncl index 788c465625..2f8b96f34c 100644 --- a/esmvaltool/diag_scripts/perfmetrics/zonal.ncl +++ b/esmvaltool/diag_scripts/perfmetrics/zonal.ncl @@ -1,6 +1,6 @@ ; ############################################################################# ; PROCEDURE FOR THE ZONAL PLOT OF THE PERFORMANCE METRICS -; Authors: Mattia Righi (DLR, Germany) and Franziska Frank (DLR, Germany) +; Authors: Mattia Righi (DLR, Germany) and Franziska Winterstein (DLR, Germany) ; ESMVal project ; ############################################################################# @@ -134,7 +134,8 @@ begin (/"mean", "stddev"/), \ diag_script_info@region, \ "zonal", \ - (/"frank_franziska", "righi_mattia", "eyring_veronika"/), \ + (/"winterstein_franziska", "righi_mattia", \ + "eyring_veronika"/), \ (/"righi15gmd", "gleckler08jgr"/), \ info_items[imod]@filename) @@ -209,7 +210,8 @@ begin (/"mean", "stddev", "diff"/), \ diag_script_info@region, \ "zonal", \ - (/"frank_franziska", "righi_mattia", "eyring_veronika"/), \ + (/"winterstein_franziska", "righi_mattia", \ + "eyring_veronika"/), \ (/"righi15gmd", "gleckler08jgr"/), \ info_items[imod]@filename) diff --git a/esmvaltool/diag_scripts/regional_downscaling/regional_function.ncl b/esmvaltool/diag_scripts/regional_downscaling/regional_function.ncl index c2a00ad2fd..ff1fb4303c 100644 --- a/esmvaltool/diag_scripts/regional_downscaling/regional_function.ncl +++ b/esmvaltool/diag_scripts/regional_downscaling/regional_function.ncl @@ -46,6 +46,7 @@ function select_region1(region:string) ; name as an attribute. ; ; Modification history +; ; 20141205 -A_gott_kl: adjusted names to Righi et al. (2015). ; 20140410 -A_fran_fr: extended to midlat, equatorial and polar regions. ; 20140129 -A_fran_fr: written. diff --git a/esmvaltool/diag_scripts/shared/latlon.ncl b/esmvaltool/diag_scripts/shared/latlon.ncl index 6d7e4e1f1d..429e6cee60 100644 --- a/esmvaltool/diag_scripts/shared/latlon.ncl +++ b/esmvaltool/diag_scripts/shared/latlon.ncl @@ -588,8 +588,8 @@ function select_region(region:string) ; Modification history ; 20190405-righi_mattia: change region names to match provenance. ; 20141205-gottschaldt_klaus-dirk: adjusted names to Righi et al. (2015). -; 20140410-frank_franziska: extended to midlat, equatorial and polar. -; 20140129-frank_franziska: written. +; 20140410-winterstein_franziska: extended to midlat, equatorial and polar. +; 20140129-winterstein_franziska: written. ; local funcname, scriptname, region begin diff --git a/esmvaltool/diag_scripts/shared/plot/aux_plotting.ncl b/esmvaltool/diag_scripts/shared/plot/aux_plotting.ncl index 23fe72b5b0..d4b2358c49 100644 --- a/esmvaltool/diag_scripts/shared/plot/aux_plotting.ncl +++ b/esmvaltool/diag_scripts/shared/plot/aux_plotting.ncl @@ -100,7 +100,7 @@ procedure create_legend_lines(labels:string, \ ; 20150508-righi_mattia: added lines/markers option. ; 20150120-gottschaldt_klaus-dirk: remove pre-existing file type suffix ; 20140305-righi_mattia: modified to plot always as epsi format. -; 20140219-frank_franziska: written. +; 20140219-winterstein_franziska: written. ; local funcname, scriptname, region, temp, outfile, n_suff, wks_legend begin diff --git a/esmvaltool/diag_scripts/shared/plot/legends.ncl b/esmvaltool/diag_scripts/shared/plot/legends.ncl index 310b30a733..3dd979bf54 100644 --- a/esmvaltool/diag_scripts/shared/plot/legends.ncl +++ b/esmvaltool/diag_scripts/shared/plot/legends.ncl @@ -43,7 +43,8 @@ function legend_lines(wks_in[1], ; It will be saved in the outfile directory and returned as a workstation ; ; Modification history -; 20140326-gottschaldt_klaus-dirk: written based on code by frank_franziska +; 20140326-gottschaldt_klaus-dirk: written based on code by +; winterstein_franziska ; local data, defaults, var, diag_script, colors, annots, dashes, thicks begin diff --git a/esmvaltool/diag_scripts/shared/plot/portrait_plot.ncl b/esmvaltool/diag_scripts/shared/plot/portrait_plot.ncl index 903d4b51a6..8001fdc5df 100644 --- a/esmvaltool/diag_scripts/shared/plot/portrait_plot.ncl +++ b/esmvaltool/diag_scripts/shared/plot/portrait_plot.ncl @@ -49,7 +49,7 @@ function portrait_plot(wks_in[1], ; 20211014-bock_lisa: added sorting by project ; 20151027-righi_mattia: added option for displaying rankings. ; 20140605-righi_mattia: modified with flexible plot shapes. -; 20140204-frank_franziska: extended. +; 20140204-winterstein_franziska: extended. ; 20140114-righi_mattia: written. ; local funcname, scriptname, wks, wks_in, data, source, res, atts, \ diff --git a/esmvaltool/diag_scripts/shared/plot/xy_line.ncl b/esmvaltool/diag_scripts/shared/plot/xy_line.ncl index 5a6a82e53a..e6dee6be4c 100644 --- a/esmvaltool/diag_scripts/shared/plot/xy_line.ncl +++ b/esmvaltool/diag_scripts/shared/plot/xy_line.ncl @@ -2485,7 +2485,7 @@ function cycle_plot(wks_in[1], ; Caveats ; ; Modification history -; 20131206-frank_franziska: written. +; 20131206-winterstein_franziska: written. ; local funcname, scriptname, wks_out, wks_in, data, source, res, atts, base, \ varname diff --git a/esmvaltool/diag_scripts/shared/plot/zonalmean_profile.ncl b/esmvaltool/diag_scripts/shared/plot/zonalmean_profile.ncl index d1d6425109..ecfafb5755 100644 --- a/esmvaltool/diag_scripts/shared/plot/zonalmean_profile.ncl +++ b/esmvaltool/diag_scripts/shared/plot/zonalmean_profile.ncl @@ -36,7 +36,7 @@ function zonalmean_profile(wks_in[1], ; Caveats ; ; Modification history -; 20131210-frank_franziska: written. +; 20131210-winterstein_franziska: written. ; local funcname, scriptname, wks, wks_in, data, source, res, atts, base, varname begin diff --git a/esmvaltool/diag_scripts/shared/statistics.ncl b/esmvaltool/diag_scripts/shared/statistics.ncl index 93eef57d85..d8c67238f6 100644 --- a/esmvaltool/diag_scripts/shared/statistics.ncl +++ b/esmvaltool/diag_scripts/shared/statistics.ncl @@ -1281,7 +1281,7 @@ function calculate_metric(var:numeric, ; 20190312-A_bock_lisa: added calculation of RMSDxy ; 20140313-righi_mattia: implemented weights calculation within the ; function, depending on dimensionality. -; 20140120-frank_franziska: written. +; 20140120-winterstein_franziska: written. ; local funcname, scriptname, dims_var, dims_ref, ii, dim_names, mdays, sdays, \ weights, var1d, ref1d, wgt1d, avg_var, avg_ref, p1, p2, p3, var3d, wgt3d, \ @@ -1531,7 +1531,7 @@ function normalize_metric(var:numeric, ; ; Modification history ; 20140609-righi_mattia: absolute value added to "mean" normalization. -; 20140120-frank_franziska: written. +; 20140120-winterstein_franziska: written. ; local funcname, scriptname, val_var, norm, stdv, p1 begin diff --git a/esmvaltool/recipes/recipe_perfmetrics_CMIP5.yml b/esmvaltool/recipes/recipe_perfmetrics_CMIP5.yml index 8d77eb2da5..ee7c8e96e1 100644 --- a/esmvaltool/recipes/recipe_perfmetrics_CMIP5.yml +++ b/esmvaltool/recipes/recipe_perfmetrics_CMIP5.yml @@ -10,7 +10,7 @@ documentation: variables (like ozone, sea-ice, aerosol...) authors: - - frank_franziska + - winterstein_franziska - righi_mattia - eyring_veronika diff --git a/esmvaltool/recipes/recipe_perfmetrics_CMIP5_4cds.yml b/esmvaltool/recipes/recipe_perfmetrics_CMIP5_4cds.yml index a4bd08b6d8..b9e6b1ad1e 100644 --- a/esmvaltool/recipes/recipe_perfmetrics_CMIP5_4cds.yml +++ b/esmvaltool/recipes/recipe_perfmetrics_CMIP5_4cds.yml @@ -10,7 +10,7 @@ documentation: variables (like ozone, sea-ice, aerosol...) authors: - - frank_franziska + - winterstein_franziska - righi_mattia - eyring_veronika diff --git a/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml b/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml index 792988d229..834b97e158 100644 --- a/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml +++ b/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml @@ -10,7 +10,7 @@ documentation: authors: - gier_bettina - - frank_franziska + - winterstein_franziska - righi_mattia - eyring_veronika