Skip to content

Commit b2f9f8c

Browse files
minor adjustment of the grouped correction logic
1 parent d627b8c commit b2f9f8c

File tree

5 files changed

+10
-142
lines changed

5 files changed

+10
-142
lines changed

.DS_Store

-6 KB
Binary file not shown.

.gitignore

Lines changed: 1 addition & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1 @@
1-
# Byte-compiled / optimized / DLL files
2-
__pycache__/
3-
*.py[cod]
4-
*$py.class
5-
6-
# C extensions
7-
*.so
8-
9-
# Distribution / packaging
10-
.Python
11-
build/
12-
develop-eggs/
13-
dist/
14-
downloads/
15-
eggs/
16-
.eggs/
17-
lib/
18-
lib64/
19-
parts/
20-
sdist/
21-
var/
22-
wheels/
23-
pip-wheel-metadata/
24-
share/python-wheels/
25-
*.egg-info/
26-
.installed.cfg
27-
*.egg
28-
MANIFEST
29-
30-
# PyInstaller
31-
# Usually these files are written by a python script from a template
32-
# before PyInstaller builds the exe, so as to inject date/other infos into it.
33-
*.manifest
34-
*.spec
35-
36-
# Installer logs
37-
pip-log.txt
38-
pip-delete-this-directory.txt
39-
40-
# Unit test / coverage reports
41-
htmlcov/
42-
.tox/
43-
.nox/
44-
.coverage
45-
.coverage.*
46-
.cache
47-
nosetests.xml
48-
coverage.xml
49-
*.cover
50-
*.py,cover
51-
.hypothesis/
52-
.pytest_cache/
53-
54-
# Translations
55-
*.mo
56-
*.pot
57-
58-
# Django stuff:
59-
*.log
60-
local_settings.py
61-
db.sqlite3
62-
db.sqlite3-journal
63-
64-
# Flask stuff:
65-
instance/
66-
.webassets-cache
67-
68-
# Scrapy stuff:
69-
.scrapy
70-
71-
# Sphinx documentation
72-
docs/_build/
73-
74-
# PyBuilder
75-
target/
76-
77-
# Jupyter Notebook
78-
.ipynb_checkpoints
79-
80-
# IPython
81-
profile_default/
82-
ipython_config.py
83-
84-
# pyenv
85-
.python-version
86-
87-
# pipenv
88-
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
89-
# However, in case of collaboration, if having platform-specific dependencies or dependencies
90-
# having no cross-platform support, pipenv may install dependencies that don't work, or not
91-
# install all needed dependencies.
92-
#Pipfile.lock
93-
94-
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
95-
__pypackages__/
96-
97-
# Celery stuff
98-
celerybeat-schedule
99-
celerybeat.pid
100-
101-
# SageMath parsed files
102-
*.sage.py
103-
104-
# Environments
105-
.env
106-
.venv
107-
env/
108-
venv/
109-
ENV/
110-
env.bak/
111-
venv.bak/
112-
113-
# Spyder project settings
114-
.spyderproject
115-
.spyproject
116-
117-
# Rope project settings
118-
.ropeproject
119-
120-
# mkdocs documentation
121-
/site
122-
123-
# mypy
124-
.mypy_cache/
125-
.dmypy.json
126-
dmypy.json
127-
128-
# Pyre type checker
129-
.pyre/
1+
.DS_Store

CMethods.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -330,26 +330,22 @@ def grouped_correction(cls,
330330
331331
xarray.core.dataarray.DataArray: Adjusted data
332332
333-
'''
334-
333+
'''
334+
335335
func_adjustment = cls.get_function(method)
336336
result = simp.copy(deep=True).load()
337337
groups = simh.groupby(group).groups
338-
simp_groups = simp.groupby(group).groups
339338

340-
for month, simp_group in zip(groups.keys(), simp_groups.keys()):
339+
for month in groups.keys():
341340
m_obs, m_simh, m_simp = [], [], []
342341

343342
for i in groups[month]:
344343
m_obs.append(obs[i])
345344
m_simh.append(simh[i])
346-
m_simp.append(simp[i])
347-
# m_obs = np.array([obs[i] for i in groups[group]])
348-
# m_simh = np.array([simh[i] for i in groups[group]])
349-
# m_simp = np.array([simp[i] for i in scen_groups[group]])
345+
m_simp.append(simp[i])
350346

351-
computed_result = func_adjustment(obs=m_obs, simh=m_simh, simp=m_simp, kind=kind, **kwargs)
352-
for i, index in enumerate(simp_groups[month]): result[index] = computed_result[i]
347+
computed_result = func_adjustment(obs=m_obs, simh=m_simh, simp=m_simp, kind=kind, group=None, **kwargs)
348+
for i, index in enumerate(groups[month]): result[index] = computed_result[i]
353349

354350
return result
355351

@@ -359,7 +355,7 @@ def linear_scaling(cls,
359355
obs: xr.core.dataarray.DataArray,
360356
simh: xr.core.dataarray.DataArray,
361357
simp: xr.core.dataarray.DataArray,
362-
group: str=None,
358+
group: str='time.month',
363359
kind: str='+',
364360
**kwargs
365361
) -> xr.core.dataarray.DataArray:
@@ -416,7 +412,7 @@ def variance_scaling(cls,
416412
obs: xr.core.dataarray.DataArray,
417413
simh: xr.core.dataarray.DataArray,
418414
simp: xr.core.dataarray.DataArray,
419-
group: str=None,
415+
group: str='time.month',
420416
kind: str='+',
421417
**kwargs
422418
) -> xr.core.dataarray.DataArray:
@@ -479,7 +475,7 @@ def delta_method(cls,
479475
obs: xr.core.dataarray.DataArray,
480476
simh: xr.core.dataarray.DataArray,
481477
simp: xr.core.dataarray.DataArray,
482-
group: str=None,
478+
group: str='time.month',
483479
kind: str='+',
484480
**kwargs
485481
) -> xr.core.dataarray.DataArray:

__pycache__/CMethods.cpython-37.pyc

25.4 KB
Binary file not shown.

__pycache__/CMethods.cpython-39.pyc

25.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)