diff --git a/modules/.idea/misc.xml b/modules/.idea/misc.xml deleted file mode 100644 index 7a7b5c92bb27e1c1c2070636db8ffa589a9f243a..0000000000000000000000000000000000000000 --- a/modules/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (modules)" project-jdk-type="Python SDK" /> -</project> \ No newline at end of file diff --git a/modules/.idea/modules.iml b/modules/.idea/modules.iml deleted file mode 100644 index 448c51a9d05033aec03581564b86441e8faeb0bf..0000000000000000000000000000000000000000 --- a/modules/.idea/modules.iml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="PYTHON_MODULE" version="4"> - <component name="NewModuleRootManager"> - <content url="file://$MODULE_DIR$" /> - <orderEntry type="jdk" jdkName="Python 3.7 (modules)" jdkType="Python SDK" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> - <component name="TestRunnerService"> - <option name="PROJECT_TEST_RUNNER" value="Unittests" /> - </component> -</module> \ No newline at end of file diff --git a/modules/.idea/modules.xml b/modules/.idea/modules.xml deleted file mode 100644 index 75a0f377d8e106c27fc5df28455b58608ce8f7f9..0000000000000000000000000000000000000000 --- a/modules/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/.idea/modules.iml" filepath="$PROJECT_DIR$/.idea/modules.iml" /> - </modules> - </component> -</project> \ No newline at end of file diff --git a/modules/.idea/vcs.xml b/modules/.idea/vcs.xml deleted file mode 100644 index 6c0b8635858dc7ad44b93df54b762707ce49eefc..0000000000000000000000000000000000000000 --- a/modules/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="$PROJECT_DIR$/.." vcs="Git" /> - </component> -</project> \ No newline at end of file diff --git a/modules/.idea/workspace.xml b/modules/.idea/workspace.xml deleted file mode 100644 index bfad5ecc31570653b67c8ccb2ece802df682cb7e..0000000000000000000000000000000000000000 --- a/modules/.idea/workspace.xml +++ /dev/null @@ -1,880 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ChangeListManager"> - <list default="true" id="6685192a-aae3-4353-baf3-c54b18376dc3" name="Default Changelist" comment="snapshot.."> - <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - </list> - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> - <option name="SHOW_DIALOG" value="false" /> - <option name="HIGHLIGHT_CONFLICTS" value="true" /> - <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> - <option name="LAST_RESOLUTION" value="IGNORE" /> - </component> - <component name="FileEditorManager"> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/util/romio.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="60"> - <caret line="4" column="13" lean-forward="true" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> - <folding> - <element signature="e#0#19#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/deeplearning/amv_raob.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="8550"> - <caret line="570" column="4" selection-start-line="570" selection-start-column="4" selection-end-line="570" selection-end-column="4" /> - <folding> - <element signature="e#0#15#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/aeolus/geos_nav.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="510"> - <caret line="34" column="26" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/amv/intercompare.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-3"> - <caret line="1163" column="44" selection-start-line="1163" selection-start-column="44" selection-end-line="1163" selection-end-column="44" /> - <folding> - <element signature="e#0#18#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/deeplearning/cloudheight.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="12330"> - <caret line="822" column="20" selection-start-line="822" selection-start-column="20" selection-end-line="822" selection-end-column="20" /> - <folding> - <element signature="e#0#23#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/amv/aeolus.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="439"> - <caret line="262" lean-forward="true" selection-start-line="262" selection-end-line="262" /> - <folding> - <element signature="e#0#15#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/util/util.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1335"> - <caret line="89" column="71" selection-start-line="89" selection-start-column="71" selection-end-line="89" selection-end-column="71" /> - <folding> - <element signature="e#0#18#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$USER_HOME$/seg.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1563"> - <caret line="16" column="78" lean-forward="true" selection-start-line="16" selection-start-column="78" selection-end-line="16" selection-end-column="78" /> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/aeolus/aeolus_amv.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1166"> - <caret line="693" lean-forward="true" selection-start-line="693" selection-end-line="693" /> - <folding> - <element signature="e#0#19#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/util/gfs_reader.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="222"> - <caret line="46" column="94" selection-start-line="46" selection-start-column="94" selection-end-line="46" selection-end-column="94" /> - <folding> - <element signature="e#0#15#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - </leaf> - </component> - <component name="FindInProjectRecents"> - <findStrings> - <find>xrange</find> - <find>ntotm</find> - <find>totlevs</find> - <find>ntot</find> - <find>enum</find> - <find>num_aeolus_profs</find> - </findStrings> - </component> - <component name="Git.Settings"> - <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> - </component> - <component name="IdeDocumentHistory"> - <option name="CHANGED_PATHS"> - <list> - <option value="$PROJECT_DIR$/util/plot.py" /> - <option value="$PROJECT_DIR$/util/lon_lat_grid.py" /> - <option value="$PROJECT_DIR$/util/geos_nav.py" /> - <option value="$PROJECT_DIR$/util/romio.py" /> - <option value="$USER_HOME$/sss1day_FMB.py" /> - <option value="$USER_HOME$/sss1day_FMB_py3.py" /> - <option value="$PROJECT_DIR$/util/sss1day_FMB_py3.py" /> - <option value="$PROJECT_DIR$/aeolus/geos_nav.py" /> - <option value="$PROJECT_DIR$/deeplearning/amv_raob.py" /> - <option value="$PROJECT_DIR$/util/setup.py" /> - <option value="$PROJECT_DIR$/amv/intercompare.py" /> - <option value="$PROJECT_DIR$/amv/aeolus.py" /> - <option value="$PROJECT_DIR$/aeolus/aeolus_amv.py" /> - <option value="$PROJECT_DIR$/util/util.py" /> - <option value="$PROJECT_DIR$/deeplearning/cloudheight.py" /> - <option value="$PROJECT_DIR$/util/gfs_reader.py" /> - </list> - </option> - </component> - <component name="ProjectFrameBounds"> - <option name="x" value="45" /> - <option name="y" value="23" /> - <option name="width" value="2344" /> - <option name="height" value="1402" /> - </component> - <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> - <component name="ProjectView"> - <navigator proportions="" version="1"> - <foldersAlwaysOnTop value="true" /> - </navigator> - <panes> - <pane id="ProjectPane"> - <subPane> - <expand> - <path> - <item name="modules" type="b2602c69:ProjectViewProjectNode" /> - <item name="modules" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="modules" type="b2602c69:ProjectViewProjectNode" /> - <item name="modules" type="462c0819:PsiDirectoryNode" /> - <item name="aeolus" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="modules" type="b2602c69:ProjectViewProjectNode" /> - <item name="modules" type="462c0819:PsiDirectoryNode" /> - <item name="amv" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="modules" type="b2602c69:ProjectViewProjectNode" /> - <item name="modules" type="462c0819:PsiDirectoryNode" /> - <item name="deeplearning" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="modules" type="b2602c69:ProjectViewProjectNode" /> - <item name="modules" type="462c0819:PsiDirectoryNode" /> - <item name="util" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="modules" type="b2602c69:ProjectViewProjectNode" /> - <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" /> - </path> - </expand> - <select /> - </subPane> - </pane> - <pane id="Scope" /> - </panes> - </component> - <component name="PropertiesComponent"> - <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> - <property name="settings.editor.selected.configurable" value="vcs.Git" /> - </component> - <component name="RunDashboard"> - <option name="ruleStates"> - <list> - <RuleState> - <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> - </RuleState> - <RuleState> - <option name="name" value="StatusDashboardGroupingRule" /> - </RuleState> - </list> - </option> - </component> - <component name="SvnConfiguration"> - <configuration /> - </component> - <component name="TaskManager"> - <task active="true" id="Default" summary="Default task"> - <changelist id="6685192a-aae3-4353-baf3-c54b18376dc3" name="Default Changelist" comment="" /> - <created>1599498568302</created> - <option name="number" value="Default" /> - <option name="presentableId" value="Default" /> - <updated>1599498568302</updated> - </task> - <task id="LOCAL-00035" summary="add profile lon/lat to product output"> - <created>1601577184608</created> - <option name="number" value="00035" /> - <option name="presentableId" value="LOCAL-00035" /> - <option name="project" value="LOCAL" /> - <updated>1601577184608</updated> - </task> - <task id="LOCAL-00036" summary="add method to subset by time from product file"> - <created>1601924385522</created> - <option name="number" value="00036" /> - <option name="presentableId" value="LOCAL-00036" /> - <option name="project" value="LOCAL" /> - <updated>1601924385522</updated> - </task> - <task id="LOCAL-00037" summary="snapshot..."> - <created>1601926702115</created> - <option name="number" value="00037" /> - <option name="presentableId" value="LOCAL-00037" /> - <option name="project" value="LOCAL" /> - <updated>1601926702115</updated> - </task> - <task id="LOCAL-00038" summary="fix bug"> - <created>1601934028469</created> - <option name="number" value="00038" /> - <option name="presentableId" value="LOCAL-00038" /> - <option name="project" value="LOCAL" /> - <updated>1601934028469</updated> - </task> - <task id="LOCAL-00039" summary="snapshot..."> - <created>1601934215973</created> - <option name="number" value="00039" /> - <option name="presentableId" value="LOCAL-00039" /> - <option name="project" value="LOCAL" /> - <updated>1601934215973</updated> - </task> - <task id="LOCAL-00040" summary="snapshot..."> - <created>1601935377344</created> - <option name="number" value="00040" /> - <option name="presentableId" value="LOCAL-00040" /> - <option name="project" value="LOCAL" /> - <updated>1601935377344</updated> - </task> - <task id="LOCAL-00041" summary="snapshot..."> - <created>1601935693343</created> - <option name="number" value="00041" /> - <option name="presentableId" value="LOCAL-00041" /> - <option name="project" value="LOCAL" /> - <updated>1601935693343</updated> - </task> - <task id="LOCAL-00042" summary="minor"> - <created>1601993559244</created> - <option name="number" value="00042" /> - <option name="presentableId" value="LOCAL-00042" /> - <option name="project" value="LOCAL" /> - <updated>1601993559244</updated> - </task> - <task id="LOCAL-00043" summary="fix indexing problem with prof lon/lats"> - <created>1601994271535</created> - <option name="number" value="00043" /> - <option name="presentableId" value="LOCAL-00043" /> - <option name="project" value="LOCAL" /> - <updated>1601994271535</updated> - </task> - <task id="LOCAL-00044" summary="snapshot.."> - <created>1602000293907</created> - <option name="number" value="00044" /> - <option name="presentableId" value="LOCAL-00044" /> - <option name="project" value="LOCAL" /> - <updated>1602000293907</updated> - </task> - <task id="LOCAL-00045" summary="snapshot.."> - <created>1602000932923</created> - <option name="number" value="00045" /> - <option name="presentableId" value="LOCAL-00045" /> - <option name="project" value="LOCAL" /> - <updated>1602000932923</updated> - </task> - <task id="LOCAL-00046" summary="snapshot.."> - <created>1602006966920</created> - <option name="number" value="00046" /> - <option name="presentableId" value="LOCAL-00046" /> - <option name="project" value="LOCAL" /> - <updated>1602006966920</updated> - </task> - <task id="LOCAL-00047" summary="snapshot.."> - <created>1602007198465</created> - <option name="number" value="00047" /> - <option name="presentableId" value="LOCAL-00047" /> - <option name="project" value="LOCAL" /> - <updated>1602007198465</updated> - </task> - <task id="LOCAL-00048" summary="snapshot.."> - <created>1602515393049</created> - <option name="number" value="00048" /> - <option name="presentableId" value="LOCAL-00048" /> - <option name="project" value="LOCAL" /> - <updated>1602515393049</updated> - </task> - <task id="LOCAL-00049" summary="snapshot.."> - <created>1602518236712</created> - <option name="number" value="00049" /> - <option name="presentableId" value="LOCAL-00049" /> - <option name="project" value="LOCAL" /> - <updated>1602518236712</updated> - </task> - <task id="LOCAL-00050" summary="snapshot.."> - <created>1602518634852</created> - <option name="number" value="00050" /> - <option name="presentableId" value="LOCAL-00050" /> - <option name="project" value="LOCAL" /> - <updated>1602518634852</updated> - </task> - <task id="LOCAL-00051" summary="snapshot.."> - <created>1602521985220</created> - <option name="number" value="00051" /> - <option name="presentableId" value="LOCAL-00051" /> - <option name="project" value="LOCAL" /> - <updated>1602521985220</updated> - </task> - <task id="LOCAL-00052" summary="snapshot.."> - <created>1602530168941</created> - <option name="number" value="00052" /> - <option name="presentableId" value="LOCAL-00052" /> - <option name="project" value="LOCAL" /> - <updated>1602530168941</updated> - </task> - <task id="LOCAL-00053" summary="snapshot.."> - <created>1602532073763</created> - <option name="number" value="00053" /> - <option name="presentableId" value="LOCAL-00053" /> - <option name="project" value="LOCAL" /> - <updated>1602532073763</updated> - </task> - <task id="LOCAL-00054" summary="snapshot.."> - <created>1602532522222</created> - <option name="number" value="00054" /> - <option name="presentableId" value="LOCAL-00054" /> - <option name="project" value="LOCAL" /> - <updated>1602532522222</updated> - </task> - <task id="LOCAL-00055" summary="snapshot.."> - <created>1602532931927</created> - <option name="number" value="00055" /> - <option name="presentableId" value="LOCAL-00055" /> - <option name="project" value="LOCAL" /> - <updated>1602532931927</updated> - </task> - <task id="LOCAL-00056" summary="snapshot.."> - <created>1602535645296</created> - <option name="number" value="00056" /> - <option name="presentableId" value="LOCAL-00056" /> - <option name="project" value="LOCAL" /> - <updated>1602535645296</updated> - </task> - <task id="LOCAL-00057" summary="snapshot.."> - <created>1602537900939</created> - <option name="number" value="00057" /> - <option name="presentableId" value="LOCAL-00057" /> - <option name="project" value="LOCAL" /> - <updated>1602537900939</updated> - </task> - <task id="LOCAL-00058" summary="snapshot.."> - <created>1602546617270</created> - <option name="number" value="00058" /> - <option name="presentableId" value="LOCAL-00058" /> - <option name="project" value="LOCAL" /> - <updated>1602546617270</updated> - </task> - <task id="LOCAL-00059" summary="snapshot.."> - <created>1602550094685</created> - <option name="number" value="00059" /> - <option name="presentableId" value="LOCAL-00059" /> - <option name="project" value="LOCAL" /> - <updated>1602550094685</updated> - </task> - <task id="LOCAL-00060" summary="snapshot.."> - <created>1602612525063</created> - <option name="number" value="00060" /> - <option name="presentableId" value="LOCAL-00060" /> - <option name="project" value="LOCAL" /> - <updated>1602612525063</updated> - </task> - <task id="LOCAL-00061" summary="snapshot.."> - <created>1602613328017</created> - <option name="number" value="00061" /> - <option name="presentableId" value="LOCAL-00061" /> - <option name="project" value="LOCAL" /> - <updated>1602613328018</updated> - </task> - <task id="LOCAL-00062" summary="snapshot.."> - <created>1602613446935</created> - <option name="number" value="00062" /> - <option name="presentableId" value="LOCAL-00062" /> - <option name="project" value="LOCAL" /> - <updated>1602613446935</updated> - </task> - <task id="LOCAL-00063" summary="snapshot.."> - <created>1602614635346</created> - <option name="number" value="00063" /> - <option name="presentableId" value="LOCAL-00063" /> - <option name="project" value="LOCAL" /> - <updated>1602614635346</updated> - </task> - <task id="LOCAL-00064" summary="snapshot.."> - <created>1602617171631</created> - <option name="number" value="00064" /> - <option name="presentableId" value="LOCAL-00064" /> - <option name="project" value="LOCAL" /> - <updated>1602617171631</updated> - </task> - <task id="LOCAL-00065" summary="snapshot.."> - <created>1602623864760</created> - <option name="number" value="00065" /> - <option name="presentableId" value="LOCAL-00065" /> - <option name="project" value="LOCAL" /> - <updated>1602623864760</updated> - </task> - <task id="LOCAL-00066" summary="snapshot.."> - <created>1602626402417</created> - <option name="number" value="00066" /> - <option name="presentableId" value="LOCAL-00066" /> - <option name="project" value="LOCAL" /> - <updated>1602626402417</updated> - </task> - <task id="LOCAL-00067" summary="snapshot.."> - <created>1602626931726</created> - <option name="number" value="00067" /> - <option name="presentableId" value="LOCAL-00067" /> - <option name="project" value="LOCAL" /> - <updated>1602626931726</updated> - </task> - <task id="LOCAL-00068" summary="snapshot.."> - <created>1602627176207</created> - <option name="number" value="00068" /> - <option name="presentableId" value="LOCAL-00068" /> - <option name="project" value="LOCAL" /> - <updated>1602627176207</updated> - </task> - <task id="LOCAL-00069" summary="snapshot.."> - <created>1602627516335</created> - <option name="number" value="00069" /> - <option name="presentableId" value="LOCAL-00069" /> - <option name="project" value="LOCAL" /> - <updated>1602627516335</updated> - </task> - <task id="LOCAL-00070" summary="snapshot.."> - <created>1602684899732</created> - <option name="number" value="00070" /> - <option name="presentableId" value="LOCAL-00070" /> - <option name="project" value="LOCAL" /> - <updated>1602684899732</updated> - </task> - <task id="LOCAL-00071" summary="remove dead code"> - <created>1602694594532</created> - <option name="number" value="00071" /> - <option name="presentableId" value="LOCAL-00071" /> - <option name="project" value="LOCAL" /> - <updated>1602694594532</updated> - </task> - <task id="LOCAL-00072" summary="minor"> - <created>1602713427770</created> - <option name="number" value="00072" /> - <option name="presentableId" value="LOCAL-00072" /> - <option name="project" value="LOCAL" /> - <updated>1602713427770</updated> - </task> - <task id="LOCAL-00073" summary="first crack best fit altitude coords"> - <created>1602790076070</created> - <option name="number" value="00073" /> - <option name="presentableId" value="LOCAL-00073" /> - <option name="project" value="LOCAL" /> - <updated>1602790076070</updated> - </task> - <task id="LOCAL-00074" summary="snapshot.."> - <created>1602805959640</created> - <option name="number" value="00074" /> - <option name="presentableId" value="LOCAL-00074" /> - <option name="project" value="LOCAL" /> - <updated>1602805959641</updated> - </task> - <task id="LOCAL-00075" summary="snapshot.."> - <created>1603413955140</created> - <option name="number" value="00075" /> - <option name="presentableId" value="LOCAL-00075" /> - <option name="project" value="LOCAL" /> - <updated>1603413955140</updated> - </task> - <task id="LOCAL-00076" summary="snapshot.."> - <created>1603739782976</created> - <option name="number" value="00076" /> - <option name="presentableId" value="LOCAL-00076" /> - <option name="project" value="LOCAL" /> - <updated>1603739782976</updated> - </task> - <task id="LOCAL-00077" summary="minor"> - <created>1603745450044</created> - <option name="number" value="00077" /> - <option name="presentableId" value="LOCAL-00077" /> - <option name="project" value="LOCAL" /> - <updated>1603745450044</updated> - </task> - <task id="LOCAL-00078" summary="snapshot.."> - <created>1603748745839</created> - <option name="number" value="00078" /> - <option name="presentableId" value="LOCAL-00078" /> - <option name="project" value="LOCAL" /> - <updated>1603748745839</updated> - </task> - <task id="LOCAL-00079" summary="snapshot.."> - <created>1603749791872</created> - <option name="number" value="00079" /> - <option name="presentableId" value="LOCAL-00079" /> - <option name="project" value="LOCAL" /> - <updated>1603749791872</updated> - </task> - <task id="LOCAL-00080" summary="snapshot.."> - <created>1604685971058</created> - <option name="number" value="00080" /> - <option name="presentableId" value="LOCAL-00080" /> - <option name="project" value="LOCAL" /> - <updated>1604685971058</updated> - </task> - <task id="LOCAL-00081" summary="snapshot.."> - <created>1605023913567</created> - <option name="number" value="00081" /> - <option name="presentableId" value="LOCAL-00081" /> - <option name="project" value="LOCAL" /> - <updated>1605023913567</updated> - </task> - <task id="LOCAL-00082" summary="snapshot.."> - <created>1605039470479</created> - <option name="number" value="00082" /> - <option name="presentableId" value="LOCAL-00082" /> - <option name="project" value="LOCAL" /> - <updated>1605039470479</updated> - </task> - <task id="LOCAL-00083" summary="snapshot.."> - <created>1605894506136</created> - <option name="number" value="00083" /> - <option name="presentableId" value="LOCAL-00083" /> - <option name="project" value="LOCAL" /> - <updated>1605894506136</updated> - </task> - <option name="localTasksCounter" value="84" /> - <servers /> - </component> - <component name="TodoView"> - <todo-panel id="selected-file"> - <is-autoscroll-to-source value="true" /> - </todo-panel> - <todo-panel id="all"> - <are-packages-shown value="true" /> - <is-autoscroll-to-source value="true" /> - </todo-panel> - </component> - <component name="ToolWindowManager"> - <frame x="45" y="23" width="2344" height="1402" extended-state="0" /> - <layout> - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16185966" /> - <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> - <window_info id="Favorites" order="2" side_tool="true" /> - <window_info anchor="bottom" id="Messages" /> - <window_info anchor="bottom" id="Message" order="0" /> - <window_info anchor="bottom" id="Find" order="1" /> - <window_info anchor="bottom" id="Run" order="2" /> - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> - <window_info anchor="bottom" id="TODO" order="6" weight="0.32977098" /> - <window_info anchor="bottom" id="Version Control" order="7" weight="0.32977098" /> - <window_info anchor="bottom" id="Terminal" order="8" weight="0.32977098" /> - <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5005807" side_tool="true" weight="0.30076337" /> - <window_info active="true" anchor="bottom" id="Python Console" order="10" sideWeight="0.49941927" visible="true" weight="0.30076337" /> - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> - </layout> - <layout-to-restore> - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21835075" /> - <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> - <window_info id="Favorites" order="2" side_tool="true" /> - <window_info anchor="bottom" id="Messages" order="0" /> - <window_info anchor="bottom" id="Message" order="1" /> - <window_info anchor="bottom" id="Find" order="2" /> - <window_info anchor="bottom" id="Run" order="3" /> - <window_info anchor="bottom" id="Debug" order="4" weight="0.4" /> - <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" /> - <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" /> - <window_info anchor="bottom" id="TODO" order="7" weight="0.32977098" /> - <window_info anchor="bottom" id="Version Control" order="8" weight="0.32977098" /> - <window_info anchor="bottom" id="Terminal" order="9" weight="0.32977098" /> - <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> - <window_info anchor="bottom" id="Python Console" order="11" visible="true" weight="0.30076337" /> - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> - </layout-to-restore> - </component> - <component name="Vcs.Log.Tabs.Properties"> - <option name="TAB_STATES"> - <map> - <entry key="MAIN"> - <value> - <State> - <option name="RECENTLY_FILTERED_USER_GROUPS"> - <collection /> - </option> - <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> - <collection /> - </option> - <option name="COLUMN_ORDER"> - <list> - <option value="0" /> - <option value="1" /> - <option value="2" /> - <option value="3" /> - </list> - </option> - </State> - </value> - </entry> - </map> - </option> - </component> - <component name="VcsManagerConfiguration"> - <MESSAGE value="snapshot" /> - <MESSAGE value="add hook for 'fitting_mie_sr'" /> - <MESSAGE value="fix bug with channel position parameter" /> - <MESSAGE value="add press to altitude" /> - <MESSAGE value="invert profile order for metpy" /> - <MESSAGE value="add separate predict method" /> - <MESSAGE value="use numpy logical funcs to remove inefficient for loop counter" /> - <MESSAGE value="add on/off for checking wind error estimate" /> - <MESSAGE value="add support for Carr stereo winds" /> - <MESSAGE value="take out explicit GOES-16 range check, shouldn't need now." /> - <MESSAGE value="add distance from aeolus prof loc to each amv loc" /> - <MESSAGE value="add dist from prof to each amv to product file" /> - <MESSAGE value="stupid bug" /> - <MESSAGE value="improve get_aeolus_time_dict_s" /> - <MESSAGE value="use correct indexes for hht, hhb" /> - <MESSAGE value="add profile lon/lat to product output" /> - <MESSAGE value="add method to subset by time from product file" /> - <MESSAGE value="fix bug" /> - <MESSAGE value="snapshot..." /> - <MESSAGE value="fix indexing problem with prof lon/lats" /> - <MESSAGE value="remove dead code" /> - <MESSAGE value="first crack best fit altitude coords" /> - <MESSAGE value="minor" /> - <MESSAGE value="snapshot.." /> - <option name="LAST_COMMIT_MESSAGE" value="snapshot.." /> - </component> - <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/util/plot_cm.py"> - <provider selected="true" editor-type-id="text-editor"> - <state> - <folding> - <element signature="e#0#25#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/util/plot.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="195"> - <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/util/lon_lat_grid.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="105"> - <caret line="7" column="38" lean-forward="true" selection-start-line="7" selection-start-column="38" selection-end-line="7" selection-end-column="38" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/util/goesr_l1b.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="315"> - <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" /> - <folding> - <element signature="e#430#444#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/util/bar_plot.py"> - <provider selected="true" editor-type-id="text-editor"> - <state> - <folding> - <element signature="e#0#18#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/deeplearning/__init__.py"> - <provider selected="true" editor-type-id="text-editor" /> - </entry> - <entry file="file://$USER_HOME$/sss1day_FMB.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1385"> - <caret line="265" selection-start-line="265" selection-end-line="265" /> - </state> - </provider> - </entry> - <entry file="file://$USER_HOME$/sss1day_FMB_py3.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="265"> - <caret line="168" column="11" selection-start-line="168" selection-start-column="11" selection-end-line="168" selection-end-column="11" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/util/geos_nav.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1171"> - <caret line="141" column="8" selection-start-line="141" selection-start-column="8" selection-end-line="141" selection-end-column="8" /> - <folding> - <element signature="e#1#19#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/util/setup.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="195"> - <caret line="13" selection-start-line="13" selection-end-line="13" /> - <folding> - <element signature="e#40#105#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/util/sss1day_FMB_py3.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2277"> - <caret line="78" column="61" lean-forward="true" selection-start-line="78" selection-start-column="61" selection-end-line="78" selection-end-column="61" /> - <folding> - <element signature="e#0#9#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/aeolus/geos_nav.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="510"> - <caret line="34" column="26" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/util/romio.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="60"> - <caret line="4" column="13" lean-forward="true" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> - <folding> - <element signature="e#0#19#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$USER_HOME$/seg.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1563"> - <caret line="16" column="78" lean-forward="true" selection-start-line="16" selection-start-column="78" selection-end-line="16" selection-end-column="78" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/amv/aeolus.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="439"> - <caret line="262" lean-forward="true" selection-start-line="262" selection-end-line="262" /> - <folding> - <element signature="e#0#15#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/aeolus/aeolus_amv.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1166"> - <caret line="693" lean-forward="true" selection-start-line="693" selection-end-line="693" /> - <folding> - <element signature="e#0#19#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/amv/intercompare.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-3"> - <caret line="1163" column="44" selection-start-line="1163" selection-start-column="44" selection-end-line="1163" selection-end-column="44" /> - <folding> - <element signature="e#0#18#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/util/util.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1335"> - <caret line="89" column="71" selection-start-line="89" selection-start-column="71" selection-end-line="89" selection-end-column="71" /> - <folding> - <element signature="e#0#18#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/deeplearning/cloudheight.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="12330"> - <caret line="822" column="20" selection-start-line="822" selection-start-column="20" selection-end-line="822" selection-end-column="20" /> - <folding> - <element signature="e#0#23#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/deeplearning/amv_raob.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="8550"> - <caret line="570" column="4" selection-start-line="570" selection-start-column="4" selection-end-line="570" selection-end-column="4" /> - <folding> - <element signature="e#0#15#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/util/gfs_reader.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="222"> - <caret line="46" column="94" selection-start-line="46" selection-start-column="94" selection-end-line="46" selection-end-column="94" /> - <folding> - <element signature="e#0#15#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </component> -</project> \ No newline at end of file diff --git a/modules/deeplearning/amv_raob.py b/modules/deeplearning/amv_raob.py index 50dec4f9925f5a5c3fcbf7e237b019107d6b21cb..bed3cb5549c1012b48cfcc01e9c13af06834d4e9 100644 --- a/modules/deeplearning/amv_raob.py +++ b/modules/deeplearning/amv_raob.py @@ -25,7 +25,7 @@ gfs_date_format = '%y%m%d' h4_to_h5_path = home_dir + '/h4toh5convert' -data_dir = '/data1/rink' +data_dir = '/home/rink/data' converted_file_dir = data_dir + '/gfs_h5' CACHE_GFS = True @@ -549,6 +549,7 @@ def get_bounding_gfs_files(timestamp): farr = np.array(filelist) farr = farr[sidxs] ftimes = tarr[sidxs] + idxs = np.arange(len(filelist)) above = ftimes >= timestamp if not above.any(): @@ -559,16 +560,18 @@ def get_bounding_gfs_files(timestamp): if not below.any(): return None, None, None, None tL = ftimes[below].max() - - iL = np.searchsorted(ftimes, tL, 'left') + iL = idxs[below].max() iR = iL + 1 fList = farr.tolist() - return fList[iL], ftimes[iL], fList[iR], ftimes[iR] + if timestamp == ftimes[iL]: + return fList[iL], ftimes[iL], None, None + else: + return fList[iL], ftimes[iL], fList[iR], ftimes[iR] -def get_profile(xr_dataset, fld_name, lons, lats, lon360=True): +def get_profile(xr_dataset, fld_name, lons, lats, lon360=True, do_norm=False): if lon360: lons = np.where(lons < 0, lons + 360, lons) # convert -180,180 to 0,360 @@ -583,6 +586,9 @@ def get_profile(xr_dataset, fld_name, lons, lats, lon360=True): dim1 = xr.DataArray(lats, dims='k') intrp_fld = fld.interp(fakeDim1=dim1, fakeDim2=dim2, fakeDim0=plevs, method='linear') + intrp_fld = intrp_fld.values + if do_norm: + intrp_fld = normalize(intrp_fld, fld_name) return intrp_fld diff --git a/modules/deeplearning/cloudheight.py b/modules/deeplearning/cloudheight.py index ea45158f1f943e76483760ef45fd37dae55163b2..f6694ebd46df8350b0deeb3a3fe0dfd8059f2ce9 100644 --- a/modules/deeplearning/cloudheight.py +++ b/modules/deeplearning/cloudheight.py @@ -8,7 +8,7 @@ import xarray as xr import pickle from deeplearning.amv_raob import get_bounding_gfs_files, convert_file, get_images, get_interpolated_profile, \ - split_matchup, shuffle_dict, get_interpolated_scalar, get_num_samples + split_matchup, shuffle_dict, get_interpolated_scalar, get_num_samples, get_time_tuple_utc, get_profile LOG_DEVICE_PLACEMENT = False @@ -273,23 +273,31 @@ class CloudHeightNN: label.append(tup[2]) sfc.append(tup[3]) continue - print('not found in cache, processing key: ', key) obs = self.matchup_dict.get(key) if obs is None: print('no entry for: ', key) timestamp = obs[0][0] + print('not found in cache, processing key: ', key, get_time_tuple_utc(timestamp)[0]) gfs_0, time_0, gfs_1, time_1 = get_bounding_gfs_files(timestamp) - if (gfs_0 is None) or (gfs_1 is None): - print('no GFS for: ', timestamp) + if (gfs_0 is None) and (gfs_1 is None): + print('no GFS for: ', get_time_tuple_utc(timestamp)[0]) + continue + try: + gfs_0 = convert_file(gfs_0) + if gfs_1 is not None: + gfs_1 = convert_file(gfs_1) + except Exception as exc: + print(get_time_tuple_utc(timestamp)[0]) + print(exc) continue - gfs_0 = convert_file(gfs_0) - gfs_1 = convert_file(gfs_1) + ds_1 = None try: ds_0 = xr.open_dataset(gfs_0) - ds_1 = xr.open_dataset(gfs_1) + if gfs_1 is not None: + ds_1 = xr.open_dataset(gfs_1) except Exception as exc: print(exc) continue @@ -334,20 +342,26 @@ class CloudHeightNN: lons = lons[common_idxs] lats = lats[common_idxs] - ndb = get_interpolated_profile(ds_0, ds_1, time_0, time_1, 'temperature', timestamp, lons, lats, do_norm=True) + if ds_1 is not None: + ndb = get_interpolated_profile(ds_0, ds_1, time_0, time_1, 'temperature', timestamp, lons, lats, do_norm=True) + else: + ndb = get_profile(ds_0, 'temperature', lons, lats, do_norm=True) if ndb is None: continue - ndf = get_interpolated_profile(ds_0, ds_1, time_0, time_1, 'rh', timestamp, lons, lats, do_norm=False) + if ds_1 is not None: + ndf = get_interpolated_profile(ds_0, ds_1, time_0, time_1, 'rh', timestamp, lons, lats, do_norm=False) + else: + ndf = get_profile(ds_0, 'rh', lons, lats, do_norm=False) if ndf is None: continue ndf /= 100.0 ndb = np.stack((ndb, ndf), axis=2) - ndd = get_interpolated_scalar(ds_0, ds_1, time_0, time_1, 'MSL pressure', timestamp, lons, lats, do_norm=False) - ndd /= 1000.0 + #ndd = get_interpolated_scalar(ds_0, ds_1, time_0, time_1, 'MSL pressure', timestamp, lons, lats, do_norm=False) + #ndd /= 1000.0 - nde = get_interpolated_scalar(ds_0, ds_1, time_0, time_1, 'surface temperature', timestamp, lons, lats, do_norm=True) + #nde = get_interpolated_scalar(ds_0, ds_1, time_0, time_1, 'surface temperature', timestamp, lons, lats, do_norm=True) # label/truth # Level of best fit (LBF) @@ -369,7 +383,8 @@ class CloudHeightNN: images.append(nda) vprof.append(ndb) label.append(ndc) - nds = np.stack([ndd, nde], axis=1) + # nds = np.stack([ndd, nde], axis=1) + nds = np.zeros((len(lons), 2)) sfc.append(nds) if not CACHE_GFS: @@ -379,7 +394,8 @@ class CloudHeightNN: self.in_mem_data_cache[key] = (nda, ndb, ndc, nds) ds_0.close() - ds_1.close() + if ds_1 is not None: + ds_1.close() images = np.concatenate(images) @@ -781,15 +797,15 @@ class CloudHeightNN: print('loss, acc: ', self.test_loss.result(), self.test_accuracy.result()) ckpt_manager.save() + if DISK_CACHE and epoch == 0: + f = open(cachepath, 'wb') + pickle.dump(self.in_mem_data_cache, f) + f.close() + print('total time: ', total_time) self.writer_train.close() self.writer_valid.close() - if DISK_CACHE: - f = open(cachepath, 'wb') - pickle.dump(self.in_mem_data_cache, f) - f.close() - def build_model(self): flat = self.build_cnn() flat_1d = self.build_1d_cnn() diff --git a/modules/util/gfs_reader.py b/modules/util/gfs_reader.py index 0bc0785ce8f42c10373d19e16debda62027fde8c..b4107744f57dc5dc93931ab955e2c3940b53d76c 100644 --- a/modules/util/gfs_reader.py +++ b/modules/util/gfs_reader.py @@ -71,6 +71,7 @@ def get_bounding_gfs_files(timestamp): farr = np.array(filelist) farr = farr[sidxs] ftimes = tarr[sidxs] + idxs = np.arange(len(filelist)) above = ftimes >= timestamp if not above.any(): @@ -82,7 +83,7 @@ def get_bounding_gfs_files(timestamp): return None, None, None, None tL = ftimes[below].max() - iL = np.searchsorted(ftimes, tL, 'left') + iL = idxs[below].max() iR = iL + 1 fList = farr.tolist()