Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

string constructor #1008

Merged
merged 9 commits into from
Dec 19, 2023
Merged

string constructor #1008

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9f10276
initial commit
lee1043 Dec 18, 2023
6469853
bug fix and clean up
lee1043 Dec 18, 2023
1184e54
pre-commit fix
lee1043 Dec 18, 2023
0cf0fa9
clean up
lee1043 Dec 18, 2023
143d8b3
replace StringConstructor from genutil to that from PMP
lee1043 Dec 18, 2023
a47c5ae
replace StringConstructor from genutil to PMP
lee1043 Dec 18, 2023
b8ad6cd
update to fix github rendering error
lee1043 Dec 18, 2023
ca3cbf4
update to fix github rendering error
lee1043 Dec 18, 2023
d026c9c
Merge branch 'main' into feature/1007_lee1043_stringConstructor
lee1043 Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
update to fix github rendering error
  • Loading branch information
@lee1043
lee1043 committed Dec 18, 2023
commit b8ad6cdf67e015f2f2470d2d7d120bbfae89de41
95 changes: 54 additions & 41 deletions doc/jupyter/Demo/Demo_2a_monsoon_wang.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@
"results_dir = 'demo_output/monsoon_wang'\n",
"\n",
"# Threshold\n",
"threshold = 2.5 / 86400\n"
"threshold = 2.5 / 86400\n",
"\n"
]
}
],
Expand Down Expand Up @@ -110,7 +111,6 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Deprecation warning: please use 'import pcmdi_metrics.driver.pmp_parser.PMPParser'\n",
"******************************************************************************************\n",
"demo_data/CMIP5_demo_clims/cmip5.historical.CanCM4.r1i1p1.mon.pr.198101-200512.AC.v20200426.nc\n"
]
Expand All @@ -119,7 +119,14 @@
"name": "stderr",
"output_type": "stream",
"text": [
"INFO::2021-11-15 14:52::pcmdi_metrics:: Results saved to a json file: /Users/ordonez4/Documents/git/pcmdi_metrics/doc/jupyter/Demo/demo_output/monsoon_wang/monsoon_wang.json\n"
"/Users/lee1043/mambaforge/envs/pmp_devel_20230223/lib/python3.9/site-packages/cdms2/avariable.py:1289: Warning: \n",
"avariable.regrid: regridTool = 'esmf' but your version does not\n",
"seems to be built with esmf, will switch to regridTool = 'libcf'\n",
" \n",
" warnings.warn(message, Warning)\n",
"INFO::2023-12-18 12:39::pcmdi_metrics:: Results saved to a json file: /Users/lee1043/Documents/Research/git/pcmdi_metrics_20230620_pcmdi/pcmdi_metrics/doc/jupyter/Demo/demo_output/monsoon_wang/monsoon_wang.json\n",
"2023-12-18 12:39:49,908 [INFO]: base.py(write:250) >> Results saved to a json file: /Users/lee1043/Documents/Research/git/pcmdi_metrics_20230620_pcmdi/pcmdi_metrics/doc/jupyter/Demo/demo_output/monsoon_wang/monsoon_wang.json\n",
"2023-12-18 12:39:49,908 [INFO]: base.py(write:250) >> Results saved to a json file: /Users/lee1043/Documents/Research/git/pcmdi_metrics_20230620_pcmdi/pcmdi_metrics/doc/jupyter/Demo/demo_output/monsoon_wang/monsoon_wang.json\n"
]
}
],
Expand Down Expand Up @@ -148,42 +155,42 @@
" \"CanCM4\": {\n",
" \"AllMW\": {\n",
" \"cor\": \"0.754\",\n",
" \"rmsn\": \"0.692\",\n",
" \"threat_score\": \"0.477\"\n",
" \"rmsn\": \"0.691\",\n",
" \"threat_score\": \"0.479\"\n",
" },\n",
" \"AllM\": {\n",
" \"cor\": \"0.757\",\n",
" \"rmsn\": \"0.691\",\n",
" \"threat_score\": \"0.477\"\n",
" \"rmsn\": \"0.689\",\n",
" \"threat_score\": \"0.479\"\n",
" },\n",
" \"NAMM\": {\n",
" \"cor\": \"0.788\",\n",
" \"rmsn\": \"0.656\",\n",
" \"cor\": \"0.791\",\n",
" \"rmsn\": \"0.650\",\n",
" \"threat_score\": \"0.474\"\n",
" },\n",
" \"SAMM\": {\n",
" \"cor\": \"0.770\",\n",
" \"rmsn\": \"0.698\",\n",
" \"threat_score\": \"0.459\"\n",
" \"rmsn\": \"0.695\",\n",
" \"threat_score\": \"0.456\"\n",
" },\n",
" \"NAFM\": {\n",
" \"cor\": \"0.775\",\n",
" \"rmsn\": \"0.649\",\n",
" \"threat_score\": \"0.409\"\n",
" \"cor\": \"0.776\",\n",
" \"rmsn\": \"0.646\",\n",
" \"threat_score\": \"0.411\"\n",
" },\n",
" \"SAFM\": {\n",
" \"cor\": \"0.782\",\n",
" \"rmsn\": \"0.673\",\n",
" \"cor\": \"0.780\",\n",
" \"rmsn\": \"0.674\",\n",
" \"threat_score\": \"0.645\"\n",
" },\n",
" \"ASM\": {\n",
" \"cor\": \"0.724\",\n",
" \"rmsn\": \"0.715\",\n",
" \"threat_score\": \"0.403\"\n",
" \"cor\": \"0.726\",\n",
" \"rmsn\": \"0.713\",\n",
" \"threat_score\": \"0.405\"\n",
" },\n",
" \"AUSM\": {\n",
" \"cor\": \"0.835\",\n",
" \"rmsn\": \"0.580\",\n",
" \"rmsn\": \"0.578\",\n",
" \"threat_score\": \"0.523\"\n",
" }\n",
" }\n",
Expand Down Expand Up @@ -222,7 +229,6 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Deprecation warning: please use 'import pcmdi_metrics.driver.pmp_parser.PMPParser'\n",
"******************************************************************************************\n",
"demo_data/CMIP5_demo_clims/cmip5.historical.CanCM4.r1i1p1.mon.pr.198101-200512.AC.v20200426.nc\n"
]
Expand All @@ -231,7 +237,14 @@
"name": "stderr",
"output_type": "stream",
"text": [
"INFO::2021-11-15 14:52::pcmdi_metrics:: Results saved to a json file: /Users/ordonez4/Documents/git/pcmdi_metrics/doc/jupyter/Demo/demo_output/monsoon_wang/monsoon_wang_ex2.json\n"
"/Users/lee1043/mambaforge/envs/pmp_devel_20230223/lib/python3.9/site-packages/cdms2/avariable.py:1289: Warning: \n",
"avariable.regrid: regridTool = 'esmf' but your version does not\n",
"seems to be built with esmf, will switch to regridTool = 'libcf'\n",
" \n",
" warnings.warn(message, Warning)\n",
"INFO::2023-12-18 12:40::pcmdi_metrics:: Results saved to a json file: /Users/lee1043/Documents/Research/git/pcmdi_metrics_20230620_pcmdi/pcmdi_metrics/doc/jupyter/Demo/demo_output/monsoon_wang/monsoon_wang_ex2.json\n",
"2023-12-18 12:40:38,357 [INFO]: base.py(write:250) >> Results saved to a json file: /Users/lee1043/Documents/Research/git/pcmdi_metrics_20230620_pcmdi/pcmdi_metrics/doc/jupyter/Demo/demo_output/monsoon_wang/monsoon_wang_ex2.json\n",
"2023-12-18 12:40:38,357 [INFO]: base.py(write:250) >> Results saved to a json file: /Users/lee1043/Documents/Research/git/pcmdi_metrics_20230620_pcmdi/pcmdi_metrics/doc/jupyter/Demo/demo_output/monsoon_wang/monsoon_wang_ex2.json\n"
]
}
],
Expand Down Expand Up @@ -265,43 +278,43 @@
" \"CanCM4\": {\n",
" \"AllMW\": {\n",
" \"cor\": \"0.754\",\n",
" \"rmsn\": \"0.692\",\n",
" \"rmsn\": \"0.691\",\n",
" \"threat_score\": \"0.457\"\n",
" },\n",
" \"AllM\": {\n",
" \"cor\": \"0.757\",\n",
" \"rmsn\": \"0.691\",\n",
" \"rmsn\": \"0.689\",\n",
" \"threat_score\": \"0.457\"\n",
" },\n",
" \"NAMM\": {\n",
" \"cor\": \"0.788\",\n",
" \"rmsn\": \"0.656\",\n",
" \"threat_score\": \"0.476\"\n",
" \"cor\": \"0.791\",\n",
" \"rmsn\": \"0.650\",\n",
" \"threat_score\": \"0.473\"\n",
" },\n",
" \"SAMM\": {\n",
" \"cor\": \"0.770\",\n",
" \"rmsn\": \"0.698\",\n",
" \"threat_score\": \"0.466\"\n",
" \"rmsn\": \"0.695\",\n",
" \"threat_score\": \"0.458\"\n",
" },\n",
" \"NAFM\": {\n",
" \"cor\": \"0.775\",\n",
" \"rmsn\": \"0.649\",\n",
" \"threat_score\": \"0.385\"\n",
" \"cor\": \"0.776\",\n",
" \"rmsn\": \"0.646\",\n",
" \"threat_score\": \"0.387\"\n",
" },\n",
" \"SAFM\": {\n",
" \"cor\": \"0.782\",\n",
" \"rmsn\": \"0.673\",\n",
" \"threat_score\": \"0.660\"\n",
" \"cor\": \"0.780\",\n",
" \"rmsn\": \"0.674\",\n",
" \"threat_score\": \"0.667\"\n",
" },\n",
" \"ASM\": {\n",
" \"cor\": \"0.724\",\n",
" \"rmsn\": \"0.715\",\n",
" \"threat_score\": \"0.365\"\n",
" \"cor\": \"0.726\",\n",
" \"rmsn\": \"0.713\",\n",
" \"threat_score\": \"0.368\"\n",
" },\n",
" \"AUSM\": {\n",
" \"cor\": \"0.835\",\n",
" \"rmsn\": \"0.580\",\n",
" \"threat_score\": \"0.429\"\n",
" \"rmsn\": \"0.578\",\n",
" \"threat_score\": \"0.435\"\n",
" }\n",
" }\n",
"}\n"
Expand Down Expand Up @@ -338,7 +351,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.6"
"version": "3.9.7"
},
"selected_variables": [],
"vcdat_file_path": "",
Expand Down