Skip to content

Commit c477a16

Browse files
JanStreffingJanStreffing
authored
Merge pull request #55 from JanStreffing/remove_std_tos
fully remove std dev of tos from tool, as obs did not agree with std …
2 parents 5b33635 + 4671e46 commit c477a16

File tree

149 files changed

+54937
-77211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+54937
-77211
lines changed

‎cmpitool/cmpisetup.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ def cmpisetup(reanalysis='ERA5'):
4141
Geopotential height variable object
4242
zos : variable
4343
Sea surface height variable object
44-
tos : variable
45-
Sea surface temperature variable object
44+
4645
mlotst : variable
4746
Ocean mixed layer thickness variable object
4847
thetao : variable
@@ -53,7 +52,7 @@ def cmpisetup(reanalysis='ERA5'):
5352
Examples
5453
--------
5554
>>> from cmpitool import cmpisetup
56-
>>> variable, region, climate_model, siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so = cmpisetup()
55+
>>> variable, region, climate_model, siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so = cmpisetup()
5756
>>> models = [climate_model(name='MODEL-NAME', variables=[tas, pr, ua])]
5857
5958
Notes
@@ -109,9 +108,9 @@ def __init__ (self, name, variables):
109108
ua = variable(name='ua', obs=reanalysis, depths=['300hPa'])
110109
zg = variable(name='zg', obs=reanalysis, depths=['500hPa'])
111110
zos = variable(name='zos', obs='NESDIS', depths=['surface'], domain='oce')
112-
tos = variable(name='tos', obs='HadISST2', depths=['surface'], domain='oce')
111+
113112
mlotst = variable(name='mlotst', obs='C-GLORSv7', depths=['surface'], domain='oce')
114113
thetao = variable(name='thetao', obs='EN4', depths=['10m','100m','1000m'], domain='oce')
115114
so = variable(name='so', obs='EN4', depths=['10m','100m','1000m'], domain='oce')
116115

117-
return variable, region, climate_model, siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so
116+
return variable, region, climate_model, siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so

‎cmpitool/cmpitool.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ def cmpitool(model_path: str, models: list, eval_models: list = None, out_path:
9090
else:
9191
eval_path=eval_path+'/'
9292

93-
variable, region, climate_model, siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so = cmpisetup()
93+
variable, region, climate_model, siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so = cmpisetup()
9494

95-
obs = [siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]
95+
obs = [siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]
9696

9797
'''
9898
If you don't add all variables to obs for your analysis, the missing ones will be skipped.

‎cmpitool/config_cmip6.py‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@ def config_cmip6(climate_model, obs):
2727
ua = obs[7]
2828
zg = obs[8]
2929
zos = obs[9]
30-
tos = obs[10]
31-
mlotst = obs[11]
32-
thetao = obs[12]
33-
so = obs[13]
30+
31+
mlotst = obs[10]
32+
thetao = obs[11]
33+
so = obs[12]
3434
cmip6_models = [
35-
climate_model(name='ACCESS-CM2', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
36-
climate_model(name='AWI-CM-1-1-MR',variables=[ tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
37-
climate_model(name='BCC-SM2-MR', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
38-
climate_model(name='CAMS-CSM1-0', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
39-
climate_model(name='CanESM5', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
40-
climate_model(name='CAS-ESM2-0', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
41-
climate_model(name='CESM2', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, tos, mlotst, thetao, so]),
42-
climate_model(name='CIESM', variables=[ tas, clt, pr, rlut, ua, zg, zos, tos, thetao, so]),
43-
climate_model(name='CMCC-CM2-SR5', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
44-
climate_model(name='CNRM-CM6-1-HR',variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
45-
climate_model(name='E3SM-1-1', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, tos, mlotst, thetao, so]),
46-
climate_model(name='EC-Earth3', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
47-
climate_model(name='FGOALS-f3-L', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
48-
climate_model(name='FIO-ESM-2-0', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, tos, thetao, so]),
49-
climate_model(name='GISS-E2-1-G', variables=[ tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
50-
climate_model(name='GFDL-CM4', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, thetao, so]),
51-
climate_model(name='HadGEM3MM', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
52-
climate_model(name='ICON-ESM-LR', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
35+
climate_model(name='ACCESS-CM2', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
36+
climate_model(name='AWI-CM-1-1-MR',variables=[ tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
37+
climate_model(name='BCC-SM2-MR', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
38+
climate_model(name='CAMS-CSM1-0', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
39+
climate_model(name='CanESM5', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
40+
climate_model(name='CAS-ESM2-0', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
41+
climate_model(name='CESM2', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, mlotst, thetao, so]),
42+
climate_model(name='CIESM', variables=[ tas, clt, pr, rlut, ua, zg, zos, thetao, so]),
43+
climate_model(name='CMCC-CM2-SR5', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
44+
climate_model(name='CNRM-CM6-1-HR',variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
45+
climate_model(name='E3SM-1-1', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, mlotst, thetao, so]),
46+
climate_model(name='EC-Earth3', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
47+
climate_model(name='FGOALS-f3-L', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
48+
climate_model(name='FIO-ESM-2-0', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, thetao, so]),
49+
climate_model(name='GISS-E2-1-G', variables=[ tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
50+
climate_model(name='GFDL-CM4', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, thetao, so]),
51+
climate_model(name='HadGEM3MM', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
52+
climate_model(name='ICON-ESM-LR', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
5353
climate_model(name='IITM-ESM', variables=[ tas, clt, pr, rlut, uas, vas, ua, zg, ]),
5454
climate_model(name='INM-CM5-0', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, thetao, so]),
55-
climate_model(name='IPSL-CM6A-LR', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
56-
climate_model(name='KIOST-ESM', variables=[siconc, tas, clt, rlut, uas, vas, ua, zg, zos, tos, mlotst, ]),
57-
climate_model(name='MCM-UA-1-0', variables=[ tas, pr, rlut, uas, vas, ua, zg, tos, thetao, so]),
58-
climate_model(name='MIROC6', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, ]),
59-
climate_model(name='MPI-ESM1-2-HR',variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
60-
climate_model(name='MRI-ESM2-0', variables=[siconc, tas, clt, pr, rlut, uas, vas, zos, tos, mlotst, thetao, so]),
61-
climate_model(name='NESM3', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, tos, mlotst, thetao, so]),
62-
climate_model(name='NorESM2-MM', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, tos, mlotst, thetao, so]),
63-
climate_model(name='SAM0-UNICON', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, tos, thetao, so]),
64-
climate_model(name='TaiESM1', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, tos, thetao, so]),
55+
climate_model(name='IPSL-CM6A-LR', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
56+
climate_model(name='KIOST-ESM', variables=[siconc, tas, clt, rlut, uas, vas, ua, zg, zos, mlotst, ]),
57+
climate_model(name='MCM-UA-1-0', variables=[ tas, pr, rlut, uas, vas, ua, zg, thetao, so]),
58+
climate_model(name='MIROC6', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, ]),
59+
climate_model(name='MPI-ESM1-2-HR',variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
60+
climate_model(name='MRI-ESM2-0', variables=[siconc, tas, clt, pr, rlut, uas, vas, zos, mlotst, thetao, so]),
61+
climate_model(name='NESM3', variables=[siconc, tas, clt, pr, rlut, uas, vas, ua, zg, zos, mlotst, thetao, so]),
62+
climate_model(name='NorESM2-MM', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, mlotst, thetao, so]),
63+
climate_model(name='SAM0-UNICON', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, thetao, so]),
64+
climate_model(name='TaiESM1', variables=[siconc, tas, clt, pr, rlut, ua, zg, zos, thetao, so]),
6565
]
6666

6767
return cmip6_models

‎cmpitool/plotting_biasmaps.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def getlimit(var):
7676
levelname=''
7777
else:
7878
levelname=depth+' '
79-
if var.name == 'zos' or var.name== 'tos':
79+
if var.name == 'zos':
8080
levelname='st. dev. '
8181

8282
plt.figure(figsize=(6, 4.5))

‎cmpitool/plotting_heatmaps.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def add_space(input): #Small helper function added spaces in front of season nam
6969
levelname=''
7070
else:
7171
levelname=depth+' '
72-
if var.name == 'zos' or var.name== 'tos':
72+
if var.name == 'zos':
7373
levelname='st. dev. '
7474
index_obs.append(levelname+var.name)
7575
if verbose == 'true':

‎docs/build/doctrees/contribute.doctree‎

-2.87 KB
Binary file not shown.

‎docs/build/doctrees/environment.pickle‎

-15.8 KB
Binary file not shown.

‎docs/build/doctrees/how_to.doctree‎

-7.52 KB
Binary file not shown.

‎docs/build/doctrees/index.doctree‎

-4.57 KB
Binary file not shown.

‎docs/build/doctrees/known_errors.doctree‎

-2.74 KB
Binary file not shown.

0 commit comments

Comments
 (0)