From ef8d6ee48748945920ebcb0b8feeb56f74201283 Mon Sep 17 00:00:00 2001 From: David Landa Marban Date: Tue, 18 Jun 2024 17:22:06 +0200 Subject: [PATCH] Improving the examples and figures for the paper --- examples/newcases/Case1/basecase.txt | 9 +++--- examples/newcases/Case1/basecase_closed.txt | 9 +++--- examples/newcases/Case1/basecase_flux.txt | 9 +++--- examples/newcases/Case1/basecase_open.txt | 9 +++--- examples/newcases/Case1/basecase_porvproj.txt | 9 +++--- examples/newcases/Case2/Grid_0_40m.txt | 3 +- examples/newcases/Case2/Grid_1_120m.txt | 3 +- examples/newcases/Case2/Grid_2_200m.txt | 3 +- examples/newcases/Case2/Grid_3_600m.txt | 3 +- examples/newcases/Case2/Grid_4_1000m.txt | 3 +- examples/newcases/Case2/Grid_5_5000m.txt | 3 +- examples/newcases/Case3/Everyday.txt | 7 +++-- .../newcases/Case3/Interpolation_in_time.txt | 3 +- examples/newcases/Case3/On_report_steps.txt | 3 +- examples/newcases/Case4/complexity.txt | 3 +- .../newcases/Locations_figures/Case_1.ipe | 6 ++-- .../Locations_figures/Case_4_regional.ipe | 6 ++-- src/expreccs/visualization/maps2d.py | 28 ++++++++++------- src/expreccs/visualization/plotting.py | 30 +++++++++---------- 19 files changed, 85 insertions(+), 64 deletions(-) diff --git a/examples/newcases/Case1/basecase.txt b/examples/newcases/Case1/basecase.txt index 6a92186..35d2656 100644 --- a/examples/newcases/Case1/basecase.txt +++ b/examples/newcases/Case1/basecase.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 -180 1 1 1 1 0 1 0 1 4106776.18 -180 1 1 1 1 0 1 4106776.18 1 0 -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file + 2 1 1 0.01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 +180 1 1 1 1 0 1 0 1 4106776.18 +180 1 1 1 1 0 1 4106776.18 1 0 +180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case1/basecase_closed.txt b/examples/newcases/Case1/basecase_closed.txt index 6920184..8c3785e 100644 --- a/examples/newcases/Case1/basecase_closed.txt +++ b/examples/newcases/Case1/basecase_closed.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 -180 1 1 1 1 0 1 0 1 4106776.18 -180 1 1 1 1 0 1 4106776.18 1 0 -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file + 2 1 1 0.01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 +180 1 1 1 1 0 1 0 1 4106776.18 +180 1 1 1 1 0 1 4106776.18 1 0 +180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case1/basecase_flux.txt b/examples/newcases/Case1/basecase_flux.txt index a6256e8..e214be5 100644 --- a/examples/newcases/Case1/basecase_flux.txt +++ b/examples/newcases/Case1/basecase_flux.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 -180 1 1 1 1 0 1 0 1 4106776.18 -180 1 1 1 1 0 1 4106776.18 1 0 -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file + 2 1 1 0.01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 +180 1 1 1 1 0 1 0 1 4106776.18 +180 1 1 1 1 0 1 4106776.18 1 0 +180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case1/basecase_open.txt b/examples/newcases/Case1/basecase_open.txt index 2fe532c..e9e63d9 100644 --- a/examples/newcases/Case1/basecase_open.txt +++ b/examples/newcases/Case1/basecase_open.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 -180 1 1 1 1 0 1 0 1 4106776.18 -180 1 1 1 1 0 1 4106776.18 1 0 -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file + 2 1 1 0.01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 +180 1 1 1 1 0 1 0 1 4106776.18 +180 1 1 1 1 0 1 4106776.18 1 0 +180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case1/basecase_porvproj.txt b/examples/newcases/Case1/basecase_porvproj.txt index 000967e..bcaee53 100644 --- a/examples/newcases/Case1/basecase_porvproj.txt +++ b/examples/newcases/Case1/basecase_porvproj.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 -180 1 1 1 1 0 1 0 1 4106776.18 -180 1 1 1 1 0 1 4106776.18 1 0 -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file + 2 1 1 0.01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 +180 1 1 1 1 0 1 0 1 4106776.18 +180 1 1 1 1 0 1 4106776.18 1 0 +180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case2/Grid_0_40m.txt b/examples/newcases/Case2/Grid_0_40m.txt index 6a92186..8d27f14 100644 --- a/examples/newcases/Case2/Grid_0_40m.txt +++ b/examples/newcases/Case2/Grid_0_40m.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 + 2 1 1 .01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 180 1 1 1 1 0 1 0 1 4106776.18 180 1 1 1 1 0 1 4106776.18 1 0 180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case2/Grid_1_120m.txt b/examples/newcases/Case2/Grid_1_120m.txt index dbe5c76..6a15cd3 100644 --- a/examples/newcases/Case2/Grid_1_120m.txt +++ b/examples/newcases/Case2/Grid_1_120m.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 + 2 1 1 .01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 180 1 1 1 1 0 1 0 1 4106776.18 180 1 1 1 1 0 1 4106776.18 1 0 180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case2/Grid_2_200m.txt b/examples/newcases/Case2/Grid_2_200m.txt index 1958680..2a66107 100644 --- a/examples/newcases/Case2/Grid_2_200m.txt +++ b/examples/newcases/Case2/Grid_2_200m.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 + 2 1 1 .01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 180 1 1 1 1 0 1 0 1 4106776.18 180 1 1 1 1 0 1 4106776.18 1 0 180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case2/Grid_3_600m.txt b/examples/newcases/Case2/Grid_3_600m.txt index f851d58..9779f55 100644 --- a/examples/newcases/Case2/Grid_3_600m.txt +++ b/examples/newcases/Case2/Grid_3_600m.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 + 2 1 1 .01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 180 1 1 1 1 0 1 0 1 4106776.18 180 1 1 1 1 0 1 4106776.18 1 0 180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case2/Grid_4_1000m.txt b/examples/newcases/Case2/Grid_4_1000m.txt index a886a8f..e053089 100644 --- a/examples/newcases/Case2/Grid_4_1000m.txt +++ b/examples/newcases/Case2/Grid_4_1000m.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 + 2 1 1 .01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 180 1 1 1 1 0 1 0 1 4106776.18 180 1 1 1 1 0 1 4106776.18 1 0 180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case2/Grid_5_5000m.txt b/examples/newcases/Case2/Grid_5_5000m.txt index bf75170..57a9307 100644 --- a/examples/newcases/Case2/Grid_5_5000m.txt +++ b/examples/newcases/Case2/Grid_5_5000m.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 + 2 1 1 .01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 180 1 1 1 1 0 1 0 1 4106776.18 180 1 1 1 1 0 1 4106776.18 1 0 180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case3/Everyday.txt b/examples/newcases/Case3/Everyday.txt index 1958680..32c4cb3 100644 --- a/examples/newcases/Case3/Everyday.txt +++ b/examples/newcases/Case3/Everyday.txt @@ -3,8 +3,8 @@ flow --tolerance-mb=1e-7 --enable-opm-rst-file=true --linear-solver=cprw --newt """Set the model parameters""" 15000 15000 9 #Reginonal aquifer length, width, and depth [m] -75 #Variable array of x-refinment (Regional) -75 #Variable array of y-refinment (Regional) +375 #Variable array of x-refinment (Regional) +375 #Variable array of y-refinment (Regional) 1 #Variable array of z-refinment (Regional) 375 #Variable array of x-refinment (Reference) 375 #Variable array of y-refinment (Reference) @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" -180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 +2 1 1 .01 1 4106776.18 1 4106776.18 1 4106776.18 +178 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 180 1 1 1 1 0 1 0 1 4106776.18 180 1 1 1 1 0 1 4106776.18 1 0 180 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 \ No newline at end of file diff --git a/examples/newcases/Case3/Interpolation_in_time.txt b/examples/newcases/Case3/Interpolation_in_time.txt index 54bfffe..b5b3e0c 100644 --- a/examples/newcases/Case3/Interpolation_in_time.txt +++ b/examples/newcases/Case3/Interpolation_in_time.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" - 10 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 + 2 1 1 .01 1 4106776.18 1 4106776.18 1 4106776.18 + 8 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 50 10 10 1 1 4106776.18 1 4106776.18 1 4106776.18 120 120 10 1 1 4106776.18 1 4106776.18 1 4106776.18 10 1 1 1 1 0 1 0 1 4106776.18 diff --git a/examples/newcases/Case3/On_report_steps.txt b/examples/newcases/Case3/On_report_steps.txt index 0d191bb..2aa8a02 100644 --- a/examples/newcases/Case3/On_report_steps.txt +++ b/examples/newcases/Case3/On_report_steps.txt @@ -43,7 +43,8 @@ PERMXY5 1000 PERMZ5 100 PORO5 0.2 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" - 10 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 + 2 1 1 .01 1 4106776.18 1 4106776.18 1 4106776.18 + 8 1 1 1 1 4106776.18 1 4106776.18 1 4106776.18 50 10 10 1 1 4106776.18 1 4106776.18 1 4106776.18 120 120 120 1 1 4106776.18 1 4106776.18 1 4106776.18 10 1 1 1 1 0 1 0 1 4106776.18 diff --git a/examples/newcases/Case4/complexity.txt b/examples/newcases/Case4/complexity.txt index fc36e5f..0a317f2 100644 --- a/examples/newcases/Case4/complexity.txt +++ b/examples/newcases/Case4/complexity.txt @@ -52,7 +52,8 @@ PERMXY5 1300 PERMZ5 130 PORO5 0.25 """Define the injection values""" """injection time [d], time step size to write results regional [d], time step size to write results site/reference [d], maximum time step [d], fluid (0 wetting, 1 non-wetting) well 0, injection rates [kg/day] well 0, fluid ... well n, injection, ...well n, (if 'wells' for BC in site (Line 14); bottom, right, top, and left values (0(prod)/1(inj), pressure [Pa]))""" - 10 1 1 1 1 1368925.4 1 1368925.4 1 1368925.4 1 4106776.18 1 0 1 0 + 2 1 1 .01 1 1368925.4 1 1368925.4 1 1368925.4 1 4106776.18 1 0 1 0 + 8 1 1 1 1 1368925.4 1 1368925.4 1 1368925.4 1 4106776.18 1 0 1 0 50 10 10 1 1 1368925.4 1 1368925.4 1 1368925.4 1 4106776.18 1 0 1 0 120 120 10 1 1 1368925.4 1 1368925.4 1 1368925.4 1 4106776.18 1 0 1 0 10 1 1 1 1 0 1 0 1 0 1 0 1 0 1 4106776.18 diff --git a/examples/newcases/Locations_figures/Case_1.ipe b/examples/newcases/Locations_figures/Case_1.ipe index 4d82a8c..6b2c251 100644 --- a/examples/newcases/Locations_figures/Case_1.ipe +++ b/examples/newcases/Locations_figures/Case_1.ipe @@ -1,7 +1,7 @@ - - + + @@ -329,7 +329,7 @@ h nx=ny=375, (5,5) -REG/REF +REGIONAL SITE INJ0 INJ1 diff --git a/examples/newcases/Locations_figures/Case_4_regional.ipe b/examples/newcases/Locations_figures/Case_4_regional.ipe index ac075e1..0c47722 100644 --- a/examples/newcases/Locations_figures/Case_4_regional.ipe +++ b/examples/newcases/Locations_figures/Case_4_regional.ipe @@ -1,7 +1,7 @@ - - + + @@ -328,7 +328,7 @@ h h (5,5) -REG +REGIONAL SITE INJ3 INJ4 diff --git a/src/expreccs/visualization/maps2d.py b/src/expreccs/visualization/maps2d.py index 3528414..b430af9 100644 --- a/src/expreccs/visualization/maps2d.py +++ b/src/expreccs/visualization/maps2d.py @@ -20,8 +20,11 @@ def final_time_maps(dic): """ for nfol, fol in enumerate(dic["folders"]): for res in dic[f"{fol}_decks"]: + # es = "regional" dic = manage_name(dic, res) for j, quantity in enumerate(dic["quantity"][:2]): + # j = 2 + # quantity = "FLOWATI+" dic[f"{fol}/{res}_{quantity}_plot"] = np.zeros( [ len(dic[f"{fol}/{dic['name']}_ymy"]) - 1, @@ -93,23 +96,25 @@ def final_time_maps(dic): ) axis.set_xticks( np.linspace( - dic[f"{fol}/{dic['name']}_xcor"].min() / 1000.0, - dic[f"{fol}/{dic['name']}_xcor"].max() / 1000.0, + 0 * 5 + dic[f"{fol}/{dic['name']}_xcor"].min() / 1000.0, + 0 * 10 + dic[f"{fol}/{dic['name']}_xcor"].max() / 1000.0, 6, ) ) axis.set_yticks( np.linspace( - dic[f"{fol}/{dic['name']}_ycor"].min() / 1000.0, - dic[f"{fol}/{dic['name']}_ycor"].max() / 1000.0, + 0 * 5 + dic[f"{fol}/{dic['name']}_ycor"].min() / 1000.0, + 0 * 10 + dic[f"{fol}/{dic['name']}_ycor"].max() / 1000.0, 6, ) ) axis.set_title(dic[f"l{res}"] + f" ({dic['lfolders'][nfol]})") - # axis.set_title(f"REF (Case 4)") + # axis.set_title(f"REFERENCE (Case 4)") + # axis.set_title("REGIONAL (Cases 1, 2, and 3)") + # axis.set_title(f"REGIONAL: {dic['lfolders'][nfol]} (Case 2)") maxp = dic[f"{fol}/{res}_{quantity}_plot"].max() minp = dic[f"{fol}/{res}_{quantity}_plot"].min() - # minp, maxp = 305, 359 + # minp, maxp = -0.55, 0.43 axis.axis("scaled") axis.set_xlabel("Easting [km]") axis.set_ylabel("Northing [km]") @@ -133,6 +138,8 @@ def final_time_maps(dic): label=dic["units"][j], format=lambda x, _: f"{x:.2f}", ) + # axis.set_xlim([5, 10]) + # axis.set_ylim([5, 10]) imag.set_clim( minp, maxp, @@ -231,8 +238,7 @@ def final_time_maps_difference(dic): axis.set_xlabel("Easting [km]") axis.set_ylabel("Northing [km]") axis.set_title( - "SITE " - + r"$\sum$|REF-" + r"SITE $\sum$|REF-" + f"{dic[f'l{res}']}" + f"|={abs(dic[f'{fol}/{res}_difference_{quantity}_plot']).sum():.2E}" ) @@ -241,7 +247,7 @@ def final_time_maps_difference(dic): # axis.tick_params(axis='y', colors='white') maxp = dic[f"{fol}/{res}_difference_{quantity}_plot"].max() minp = dic[f"{fol}/{res}_difference_{quantity}_plot"].min() - # minp, maxp = -1.53, 1.53 + # minp, maxp = -0.27, 0.27 divider = make_axes_locatable(axis) cax = divider.append_axes("right", size="5%", pad=1e-3) vect = np.linspace( @@ -281,7 +287,6 @@ def geological_maps(dic): """ for nfol, fol in enumerate(dic["folders"]): for res in dic[f"{fol}_decks"]: - j = 0 dic = manage_name(dic, res) dic[f"{fol}/{res}_fipn_plot"] = np.zeros( [ @@ -301,10 +306,11 @@ def geological_maps(dic): dic[f"{fol}/{dic['name']}_ycor"] / 1000.0, dic[f"{fol}/{res}_fipn_plot"], shading="flat", - cmap=dic["cmaps"][j], + cmap="Set1", ) axis.set_title(dic[f"l{res}"] + f" ({dic['lfolders'][nfol]})") # axis.set_title("REG/REF (Case 1)") + # axis.set_title("REGIONAL") axis.axis("scaled") name = dic["name"] axis.set_xlabel( diff --git a/src/expreccs/visualization/plotting.py b/src/expreccs/visualization/plotting.py index 3f44f63..af283c4 100644 --- a/src/expreccs/visualization/plotting.py +++ b/src/expreccs/visualization/plotting.py @@ -159,12 +159,12 @@ def plotting_settings(dic): "#2ca02c", "#d62728", "#9467bd", - "#8c564b", + "k", "#e377c2", - "#17becf", + "#8c564b", "#bcbd22", - "k", "#17becf", + "k", "r", ] dic["markers"] = [ @@ -193,24 +193,24 @@ def plotting_settings(dic): (0, (3, 5, 1, 5, 1, 5)), ":", "-.", - "--", (0, (3, 1, 1, 1)), (0, (3, 1, 1, 1, 1, 1)), + "--", "solid", ] dic["lreference"] = r"REF" dic["lregional"] = r"REG" dic["lregional_1"] = r"REG_1" dic["lregional_2"] = r"REG_2" - dic["lsite_pres"] = r"SITE$_p$" - dic["lsite_pres2p"] = r"SITE$_{2p}$" - dic["lsite_pres_1"] = r"SITE$_{1,p}$" - dic["lsite_pres_2"] = r"SITE$_{2,p}$" - dic["lsite_flux"] = r"SITE$_f$" - dic["lsite_porvproj"] = r"SITE$_{V_p}$" - dic["lsite_wells"] = r"SITE$_w$" - dic["lsite_closed"] = r"SITE$_c$" - dic["lsite_free"] = r"SITE$_o$" + dic["lsite_pres"] = r"S$_{pressure}$" + dic["lsite_pres2p"] = r"S$_{pressure 2p}$" + dic["lsite_pres_1"] = r"S$_{1,pres}$" + dic["lsite_pres_2"] = r"S$_{2,pres}$" + dic["lsite_flux"] = r"S$_{flux}$" + dic["lsite_porvproj"] = r"S$_{pore\;volume}$" + dic["lsite_wells"] = r"S$_{wells}$" + dic["lsite_closed"] = r"S$_{closed}$" + dic["lsite_free"] = r"S$_{open}$" dic["cmaps"] = [ "jet", "brg", @@ -775,7 +775,7 @@ def handle_labels_distance(dic, nfol, res, fol, j): dic[f"{fol}/{res}_dates"], dic[f"{fol}/{res}_indicator_plot"], color=dic["colors"][-j - 1], - linestyle=dic["linestyle"][-nfol - 1], + linestyle=dic["linestyle"][-nfol - 2], label=label, ) dic["nmarker"] += 1 @@ -849,7 +849,7 @@ def over_time_max_difference(dic, nqua, quantity): ) dic = handle_labels_difference(dic, res, j, nqua, nfol) dic["axis"][nqua].set_title( - r"$\max$(REF-SITE), $\max$(REF)=" + r"$\max|$REF-SITE|, $\max$(REF)=" + f"{np.array(dic[f'reference_maximum_{quantity}']).max():.2E}" ) dic["axis"][nqua].set_ylabel(dic["units"][nqua])