Skip to content

Commit 1dec1f3

Browse files
DaveCassonDaveCasson
committed
Update to OC files
1 parent 8e7089d commit 1dec1f3

File tree

21 files changed

+213
-114672
lines changed

21 files changed

+213
-114672
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ running
1111
*.grib2
1212
*.nc
1313
*.tif
14+
*.gz
1415

1516
# Ignore folders that are produced by running Delft-FEWS
1617
DumpFiles/

‎Config/IdMapFiles/ECCC/IdImportECCCScalar.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
<!-- For Real Time Data Imports -->
44
<parameter internal="TA.obs" external="air_temperature"/>
55
<parameter internal="PC.obs" external="total_precipitation"/>
6-
<parameter internal="TAmax.obs" internalQualifier="max" external="air_temperature_yesterday_high"/>
6+
<parameter internal="TAmax.obs" external="air_temperature_yesterday_high"/>
7+
<parameter internal="TAmin.obs" external="air_temperature_yesterday_low"/>
8+
<parameter internal="TAmax.obs" external="air_temperature_today_high"/>
9+
<parameter internal="TAmin.obs" external="air_temperature_today_low"/>
10+
<!--<parameter internal="TAmax.obs" internalQualifier="max" external="air_temperature_yesterday_high"/>
711
<parameter internal="TAmin.obs" internalQualifier="min" external="air_temperature_yesterday_low"/>
812
<parameter internal="TAmax.obs" internalQualifier="max" external="air_temperature_today_high"/>
9-
<parameter internal="TAmin.obs" internalQualifier="min" external="air_temperature_today_low"/>
13+
<parameter internal="TAmin.obs" internalQualifier="min" external="air_temperature_today_low"/>-->
1014
</idMap>

‎Config/ModuleConfigFiles/Import/ECCCScalar/ImportECCCScalar.xml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<timeSeriesImportRun xmlns="http://www.wldelft.nl/fews" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.wldelft.nl/fews http://fews.wldelft.nl/schemas/version1.0/timeSeriesImportRun.xsd">
33
<import>
4-
<general>
5-
<importType>CanadaMeteo</importType>
6-
<serverUrl>https://dd.meteo.gc.ca/observations/xml</serverUrl>
7-
<!-- Time period has to be configured for the importer to work -->
8-
<relativeViewPeriod unit="day" start="$STARTTIME$" end="$ENDTIME$" startOverrulable="true" endOverrulable="true"/>
9-
<idMapId>IdImportECCCScalar</idMapId>
10-
<importTimeZone>
11-
<timeZoneName>$TIMEZONE$</timeZoneName>
12-
</importTimeZone>
13-
<dataFeedId>$LOCATIONSET$</dataFeedId>
14-
</general>
4+
<general>
5+
<importType>CanadaMeteo</importType>
6+
<serverUrl>https://dd.meteo.gc.ca</serverUrl>
7+
<!--<user>dummy_username</user>
8+
<password>dummy_password</password>-->
9+
<!-- Time period has to be configured for the importer to work -->
10+
<relativeViewPeriod unit="day" start="$STARTTIME$" end="$ENDTIME$" startOverrulable="true" endOverrulable="true"/>
11+
<idMapId>IdImportECCCScalar</idMapId>
12+
<importTimeZone>
13+
<timeZoneName>PST</timeZoneName>
14+
</importTimeZone>
15+
16+
</general>
1517
<properties>
1618
<!--Optional configuration field. Value is a comma separated string of the region folder to be included.-->
1719
<!--If it is not configured, data will be fetched from all folders for the specified time. Case sensitive.-->
@@ -20,7 +22,7 @@
2022
<!--Optional configuration field. Value is a comma separated string of the time folders to be included.-->
2123
<!--If it is not configured, data will be fetched from all folders for the specified time.-->
2224
<!--Possible choices: "hourly", "today", "yesterday"-->
23-
<string key="TimeDirectory" value="today, yesterday"/>
25+
<string key="TimeDirectory" value="hourly, today, yesterday"/>
2426
</properties>
2527
<timeSeriesSet>
2628
<moduleInstanceId>ImportECCCScalar</moduleInstanceId>

‎Config/ModuleConfigFiles/Import/NOAA/ImportMRMS.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<general>
66
<importType>NETCDF-CF_GRID</importType>
77
<serverUrl>https://thredds.ucar.edu/thredds/dodsC/grib/NCEP/MRMS/ALASKA/Precip/</serverUrl>
8-
<relativeViewPeriod unit="hour" startOverrulable="true" start="-60" end="0"/>
8+
<relativeViewPeriod unit="hour" startOverrulable="true" start="-6" end="0"/>
99
<logWarningsToSeparateFile>true</logWarningsToSeparateFile>
1010
<idMapId>IdImportMRMSOpenDAP</idMapId>
1111
<unitConversionsId>ImportUnitConversions</unitConversionsId>

‎Config/ModuleConfigFiles/Import/Snow/RetrieveGLOBSNOW.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<generalAdapterRun xmlns="http://www.wldelft.nl/fews" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.wldelft.nl/fews http://fews.wldelft.nl/schemas/version1.0/generalAdapterRun.xsd">
44
<general>
55
<piVersion>1.8</piVersion>
6-
<rootDir>%REGION_HOME%/modules/pyscripts</rootDir>
6+
<rootDir>%REGION_HOME%/Modules/pyscripts</rootDir>
77
<workDir>%ROOT_DIR%/work</workDir>
88
<exportDir>$IMPORT_FOLDER$/GLOBSNOW</exportDir>
99
<importDir>$IMPORT_FOLDER$/GLOBSNOW</importDir>
@@ -37,9 +37,9 @@
3737
<executable>%ROOT_DIR%/bin/dist/get_ec_forecasts.exe</executable>
3838
</command>-->
3939
<arguments>
40-
<argument>%ROOT_DIR%\bin\data_download_main.py</argument>
40+
<argument>%ROOT_DIR%/bin/data_download_main.py</argument>
4141
<argument>--run_info_file</argument>
42-
<argument>%WORK_DIR%\fews_data_download_run_info.xml</argument>
42+
<argument>%WORK_DIR%/fews_data_download_run_info.xml</argument>
4343
<argument>--data-source</argument>
4444
<argument>GLOBSNOW</argument>
4545
</arguments>

‎Config/ModuleConfigFiles/Import/Snow/RetrieveSNODAS.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<generalAdapterRun xmlns="http://www.wldelft.nl/fews" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.wldelft.nl/fews http://fews.wldelft.nl/schemas/version1.0/generalAdapterRun.xsd">
44
<general>
55
<piVersion>1.8</piVersion>
6-
<rootDir>%REGION_HOME%/modules/pyscripts</rootDir>
6+
<rootDir>%REGION_HOME%/Modules/pyscripts</rootDir>
77
<workDir>%ROOT_DIR%/work</workDir>
88
<exportDir>$IMPORT_FOLDER$/SNODAS</exportDir>
99
<importDir>$IMPORT_FOLDER$/SNODAS</importDir>
@@ -37,9 +37,9 @@
3737
<executable>%ROOT_DIR%/bin/dist/get_ec_forecasts.exe</executable>
3838
</command>-->
3939
<arguments>
40-
<argument>%ROOT_DIR%\bin\data_download_main.py</argument>
40+
<argument>%ROOT_DIR%/bin/data_download_main.py</argument>
4141
<argument>--run_info_file</argument>
42-
<argument>%WORK_DIR%\fews_data_download_run_info.xml</argument>
42+
<argument>%WORK_DIR%/fews_data_download_run_info.xml</argument>
4343
<argument>--data-source</argument>
4444
<argument>SNODAS</argument>
4545
</arguments>

‎Config/ModuleDataSetFiles/PyscriptsBinaries.zip‎

6.25 KB
Binary file not shown.

‎Config/RegionConfigFiles/Grids.xml‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,22 @@
109109
<xCellSize>0.5</xCellSize>
110110
<yCellSize>0.5</yCellSize>
111111
</regular>
112-
<irregular locationId="GLOBSNOW">
113-
<rows>721</rows>
114-
<columns>721</columns>
115-
<csvFile>
116-
<file>GlobSnow_SWE_L3A_v.1.0.csv</file>
117-
<geoDatum>WGS 1984</geoDatum>
118-
<x>%X%</x>
119-
<y>%Y%</y>
120-
</csvFile>
121-
</irregular>
112+
<regular locationId="GLOBSNOW">
113+
<rows>1440</rows>
114+
<columns>1440</columns>
115+
<lambertAzimuthalEqualArea>
116+
<originLatitude>90.0</originLatitude>
117+
<originLongitude>0.0</originLongitude>
118+
<earthRadius>6371229.0</earthRadius>
119+
</lambertAzimuthalEqualArea>
120+
<firstCellCenter>
121+
<x>-8993750.0</x>
122+
<y>8993750.0</y>
123+
<z>0.0</z>
124+
</firstCellCenter>
125+
<xCellSize>12500.0</xCellSize>
126+
<yCellSize>12500.0</yCellSize>
127+
</regular>
122128
<regular locationId="SREF">
123129
<rows>287</rows>
124130
<columns>708</columns>

‎Config/RootConfigFiles/fss_clientConfig.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
http://fews.wldelft.nl/schemas/version1.0/clientConfig.xsd">
44
<clientType>Forecasting Shell</clientType>
55
<otherRootConfigFiles>
6-
<!--<name>patch.jar</name> - simplified patch - will get from AI-->
76
<name>fss_global.properties</name>
87
</otherRootConfigFiles>
98
<jvmOption>-Xmx4096m</jvmOption>
10-
<autoExportModuleDataSet name="PyscriptsBinaries" exportDir="Modules"/>
11-
</clientConfiguration>
9+
<autoExportModuleDataSet name="PyscriptsBinaries" exportDir="Modules"/>
10+
<autoExportModuleDataSet name="PythonLinuxBinaries" exportDir="Modules"/>
11+
<autoExportModuleDataSet name="SUMMABinaries" exportDir="Modules"/>
12+
</clientConfiguration>

‎Config/RootConfigFiles/fss_global.Properties‎ renamed to ‎Config/RootConfigFiles/fss_global.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ MAPLAYERSCACHE_FOLDER = %REGION_HOME%/MapsCache
2424
PRODUCTS_ROOT_DIR = %REGION_HOME%/Products
2525

2626
#Executable Directories
27-
PYTHON_EXE = %REGION_HOME%/Modules/Python311/python.exe
27+
PYTHON_EXE = %REGION_HOME%/Modules/openfews/bin/python
2828
WFLOW_EXE = %REGION_HOME%/Modules/wflow_cli/bin/wflow_cli.exe
2929
WFLOW_ADAPT_EXE = %REGION_HOME%/Modules/wflow/bin/wflow_adapt.exe
3030

0 commit comments

Comments
 (0)