Shahram Najm
|
5025ad5fe8
|
ECC-1537: Remove extra unknown key
|
2023-12-01 11:54:54 +00:00 |
Matthew Griffith
|
b94f13a181
|
ECC-1537: Typo, and removing UNRES attribute;
This was missed off from proposal - to be added in an amendment
|
2023-12-01 11:33:03 +00:00 |
Matthew Griffith
|
95302c8e4c
|
ECC-1537: Final tweak to table
|
2023-12-01 10:57:00 +00:00 |
Matthew Griffith
|
c26eb1f875
|
ECC-1537: Minor tweaks to match develop
|
2023-12-01 10:53:51 +00:00 |
Matthew Griffith
|
cfc82bc0db
|
ECC-1537: Reverted all changes added for testing
|
2023-12-01 10:50:51 +00:00 |
Matthew Griffith
|
665c81f4a9
|
Merge remote-tracking branch 'origin/develop' into feature/ECC-1537-TileTemplate
|
2023-12-01 10:33:41 +00:00 |
Shahram Najm
|
05e007ef8f
|
ECC-1714: Add temporary tile templates to make tests pass
|
2023-11-30 13:40:39 +00:00 |
Shahram Najm
|
ca6da53a2b
|
ECC-1714: GRIB2: Update tables/templates with the latest WMO V32.0.0
|
2023-11-30 13:40:01 +00:00 |
Matthew Griffith
|
e5fc1b7440
|
Merge remote-tracking branch 'origin/develop' into feature/ECC-1537-TileTemplate
|
2023-11-29 17:33:57 +00:00 |
Matthew Griffith
|
fc0ff6144d
|
ECC-1537: Removed transients;
These were causing issues setting arrays of tile attributes
|
2023-11-29 17:31:31 +00:00 |
Eugen Betke
|
c515507a26
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-11-28 12:18:55 +00:00 |
Shahram Najm
|
c5ee685523
|
Definitions: Cleanup
|
2023-11-26 18:05:43 +00:00 |
Shahram Najm
|
114c4a5270
|
Definitions: Add more readable alias for numberOfTimeRange
|
2023-11-26 17:51:13 +00:00 |
Shahram Najm
|
e22852c29f
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-11-26 16:02:10 +00:00 |
Matthew Griffith
|
775c793fd7
|
ECC-1537: Beautification of ls, tile and mars
namespaces
|
2023-11-24 17:32:29 +00:00 |
Shahram Najm
|
1b245f8a38
|
ECC-1724: Implement changes for CARRA monthly/daily products
|
2023-11-22 17:09:38 +00:00 |
shahramn
|
c2a56f3910
|
Merge pull request #178 from richard-mladek/feature/SD-63148_rr_monthly
Feature/sd 63148 rr monthly
|
2023-11-22 16:35:13 +00:00 |
Shahram Najm
|
14f7de9c5a
|
Definitions: Use false/true instead of zero/one
|
2023-11-22 10:51:00 +00:00 |
Richard Mladek
|
c17d32fa60
|
changing streams for class=rr to read only
|
2023-11-21 17:17:50 +00:00 |
Richard Mladek
|
22f6855203
|
param names beautification
|
2023-11-21 16:28:42 +00:00 |
Matthew Griffith
|
2b88fa15d4
|
Merge branch 'develop' into feature/ECC-1537-TileTemplate
|
2023-11-21 14:17:38 +00:00 |
Richard Mladek
|
b116f9f5df
|
carra daily/monthly products SD-63148
|
2023-11-21 09:30:37 +00:00 |
Shahram Najm
|
fc13b3510a
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-11-20 20:56:52 +00:00 |
Shahram Najm
|
ddc1d47a6d
|
ECC-1719: Fix levtypes and typeOfLevel
|
2023-11-20 16:52:49 +00:00 |
Shahram Najm
|
6ba0eb0f34
|
ECC-1719: Tweaks to parameter long names and the definitions of 231055 and 231056
|
2023-11-20 16:38:48 +00:00 |
Shahram Najm
|
bcb83cc5cc
|
ECC-1720: Legacy encodings
|
2023-11-18 14:30:33 +00:00 |
Shahram Najm
|
b48efc6bc5
|
ECC-1719, ECC-1720 and ECC-1721
|
2023-11-18 14:26:45 +00:00 |
Shahram Najm
|
a1f17da108
|
ECC-1716: GRIB2: Use dataDate and dataTime for indexing within MARS stream clte
|
2023-11-10 12:39:54 +00:00 |
Shahram Najm
|
ef57ad4519
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-11-09 12:54:27 +00:00 |
Shahram Najm
|
7a83e3c1b8
|
ECC-1713: GRIB2: Add correct definition to discipline 192 parameter 228004 (S2S part)
|
2023-11-08 12:07:18 +00:00 |
Shahram Najm
|
5346e42fff
|
ECC-1712: GRIB2: New table entries for DestinE ClimateDT
|
2023-11-05 15:19:08 +00:00 |
Shahram Najm
|
2f4aa25b18
|
ECC-1713: GRIB2: Add correct definition to discipline 192 parameter 228004; mean2t for DestinE ClimateDT
|
2023-11-04 14:52:26 +00:00 |
Eugen Betke
|
29bd34a13f
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-11-03 14:02:20 +00:00 |
Shahram Najm
|
e2470a8c60
|
ECC-1710: GRIB2: Replace 'highres' with 'high' in DestinE resolution table
|
2023-11-01 15:46:57 +00:00 |
Shahram Najm
|
51f6dcf569
|
ECC-1709: GRIB2: Rename indicatorOfUnitOfTimeRange to indicatorOfUnitForForecastTime
|
2023-10-30 14:45:15 +00:00 |
Shahram Najm
|
6dc344a9b4
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-10-27 12:08:31 +01:00 |
Matthew Griffith
|
4d54dc8a75
|
Merge remote-tracking branch 'origin/develop' into feature/ECC-1691-DestineClimateDT
|
2023-10-24 12:41:32 +00:00 |
Matthew Griffith
|
b94723f9ea
|
ECC-1691: Revert underscores to dashes in dataset
FDB will support this by the end of the week.
|
2023-10-24 12:39:51 +00:00 |
Matthew Griffith
|
32d3ce7b90
|
ECC-1691: Edited destineOrigin concept
Small tweak to destineOrigin concept and test as aresult.
|
2023-10-20 15:00:37 +00:00 |
Shahram Najm
|
546da98c05
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-10-20 12:05:11 +00:00 |
Shahram Najm
|
5bbde7f2f5
|
ECC-1702: GRIB2: Add turbulent surface parameters
|
2023-10-20 11:30:26 +00:00 |
Shahram Najm
|
3864a91526
|
ECC-1707: Modification
|
2023-10-19 15:57:56 +01:00 |
Matthew Griffith
|
820aba02d8
|
Merge remote-tracking branch 'origin/develop' into feature/ECC-1691-DestineClimateDT
|
2023-10-19 13:41:02 +00:00 |
Matthew Griffith
|
86118f33e2
|
ECC-1691: Changed stream name from clim to clte;
This avoids confusion with climatology
|
2023-10-19 13:35:31 +00:00 |
Shahram Najm
|
df60ca871f
|
ECC-1707: GRIB2: Add support for two FESOM grids
|
2023-10-19 13:03:57 +01:00 |
Matthew Griffith
|
4e1d2ee1b5
|
Merge branch 'develop' into feature/ECC-1537-TileTemplate
|
2023-10-18 11:01:15 +00:00 |
Matthew Griffith
|
12a90946ef
|
ECC-1691: Update "-" to "_" in filename.
|
2023-10-17 08:56:19 +00:00 |
Matthew Griffith
|
3cfccfddf6
|
ECC-1691: Changed dash to underscores in dataset;
This is because the values of these keys are used directly in the schema
The fdb schema doesn't support hyphens currently
|
2023-10-16 16:38:33 +00:00 |
Matthew Griffith
|
80e7e88b62
|
ECC-1691: Back to "climate-dt";
This is what we want for future, but had to change while doing fdb tests
|
2023-10-13 16:27:07 +00:00 |
Matthew Griffith
|
64a3dc9d96
|
ECC-1691: Need to change climateDT related file
|
2023-10-13 15:30:24 +00:00 |
Matthew Griffith
|
878b2bdb47
|
ECC-1691: Removed hyphen which fdb has issues with
|
2023-10-13 15:14:17 +00:00 |
Matthew Griffith
|
e25954bc30
|
ECC-1691: Sticking to CMIP format we use US format;
realisation --> realization
|
2023-10-13 14:12:54 +00:00 |
Matthew Griffith
|
9d4ce9b613
|
ECC-1691: Don't want origin in mars namespace
|
2023-10-13 13:59:10 +00:00 |
Matthew Griffith
|
6faa0d118f
|
ECC-1691: Validity time needs to be padded as str;
|
2023-10-13 11:06:11 +00:00 |
Matthew Griffith
|
ec0fd03b6c
|
ECC-1691: Added mars streams and definition files;
Added destine sample GRIB2 file;
Modified test to account for new streams.
|
2023-10-12 16:33:41 +00:00 |
Eugen Betke
|
06b5604692
|
ECC-1620: fix grib2/boot.def
|
2023-10-11 14:56:44 +00:00 |
Eugen Betke
|
c52c05944c
|
ECC-1620: Cleanup stepOutputFormat and forceStepUnits
|
2023-10-11 12:47:24 +00:00 |
Matthew Griffith
|
da51abe875
|
ECC-1691: Deleted some model entries
|
2023-10-10 14:33:36 +00:00 |
Eugen Betke
|
50c737329b
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-10-10 12:16:01 +00:00 |
Matthew Griffith
|
6f6f431490
|
ECC-1691: Removed type and stream from products;
We don't want to define this in products_destine;
It is added in mars_labeling.
|
2023-10-10 10:38:17 +00:00 |
Matthew Griffith
|
68d8bc0b1a
|
ECC-1691: Fixed a typo and reverted some changes
|
2023-10-09 16:52:05 +00:00 |
Matthew Griffith
|
12c2516410
|
Merge branch 'feature/ECC-1691-DestineClimateDT' of github.com:ecmwf/eccodes into feature/ECC-1691-DestineClimateDT
|
2023-10-09 14:59:04 +00:00 |
Shahram Najm
|
17cb98145a
|
Merge branch 'develop' into feature/ECC-1691-DestineClimateDT
|
2023-10-09 15:20:25 +01:00 |
Matthew Griffith
|
dc9067994b
|
Added medium resolution to code table
|
2023-10-09 14:14:43 +00:00 |
Shahram Najm
|
713c3b8950
|
ECC-1700: Fix tests
|
2023-10-09 11:12:44 +01:00 |
shahramn
|
1f6adc0a11
|
Merge pull request #165 from ecmwf/feature/ecPoint
Feature/ec point
|
2023-10-09 11:00:18 +01:00 |
Shahram Najm
|
442d033b76
|
SD-84523: EcCodes local concepts edzw
|
2023-10-05 12:52:36 +01:00 |
Shahram Najm
|
2ae9435fec
|
Merge with develop. Use the new formatting keys (ECC-1698)
|
2023-10-03 18:05:52 +01:00 |
Shahram Najm
|
3a1ea5a54b
|
ECC-1698: Add format specifier keys for converting a number (float or int) into a string
|
2023-10-03 15:20:52 +00:00 |
Shahram Najm
|
98df806ed0
|
ECC-1697: GRIB2: Update long name of hydrology parameter 231002
|
2023-10-03 13:55:44 +00:00 |
Sebastien Villaume
|
b3f5b5df5c
|
change to master table version 32
|
2023-10-03 14:30:24 +01:00 |
Sebastien Villaume
|
0bc5db9ded
|
Merge branch 'develop' into feature/ecPoint
|
2023-10-03 10:26:39 +01:00 |
Shahram Najm
|
7e823700d1
|
ECC-1333: GRIB2 only: make levtype read-only
|
2023-10-02 12:54:37 +01:00 |
Shahram Najm
|
3f437f75a9
|
ECC-1691: Updates from Matt
|
2023-09-29 17:10:53 +01:00 |
Shahram Najm
|
2bbf81094c
|
Merge branch 'develop' into feature/ECC-1691-DestineClimateDT
|
2023-09-29 13:15:03 +01:00 |
Shahram Najm
|
3650874423
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-09-29 12:11:37 +00:00 |
Shahram Najm
|
40003ea72d
|
ECC-1695: GRIB2 definitions: Group files into sub-directories (Part 1)
|
2023-09-29 12:09:56 +00:00 |
Shahram Najm
|
a6e3c4b93a
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-09-29 09:54:13 +01:00 |
Shahram Najm
|
fd7ea997cd
|
ECC-1691: Formatting
|
2023-09-28 16:29:24 +01:00 |
Shahram Najm
|
8f84ece03c
|
ECC-1691: Additional modifications from Matthew
|
2023-09-27 18:10:33 +01:00 |
Shahram Najm
|
91c2fdc9df
|
Merge branch 'develop' into feature/ECC-1691-DestineClimateDT
|
2023-09-27 14:51:59 +01:00 |
Shahram Najm
|
6554d0b193
|
ECC-1691: Fix test re mars.step
|
2023-09-27 10:41:34 +00:00 |
Shahram Najm
|
98659cc99a
|
ECC-1691: Tests
|
2023-09-27 10:58:47 +01:00 |
Shahram Najm
|
66c7e6d73c
|
ECC-1679: Fix levtype for 228023
|
2023-09-26 14:24:41 +01:00 |
Shahram Najm
|
da964bdf7d
|
ECC-1679: GRIB2: Replace discipline=192 encodings
|
2023-09-26 12:02:45 +00:00 |
Matthew Griffith
|
a0af1467ae
|
Merge branch 'ecmwf:develop' into feature/destine-layout
|
2023-09-25 16:10:06 +01:00 |
Matthew Griffith
|
2dd5e69c30
|
Merge branch 'feature/destine-layout' of github.com:mjg41/eccodes into feature/destine-layout
|
2023-09-25 14:49:27 +00:00 |
Matthew Griffith
|
4df1188152
|
Reworking to accommodate PR comment;
Also making a few other tweaks to bring closer to final form
|
2023-09-25 14:49:20 +00:00 |
Eugen Betke
|
d0189a5df5
|
ECC-1620: GRIB1: mars.stepUnits to mars.stepunits
|
2023-09-22 13:44:23 +00:00 |
Shahram Najm
|
cf0aa1b7fd
|
Cleanup
|
2023-09-22 13:12:12 +01:00 |
Eugen Betke
|
c241db0107
|
ECC-1620: Change mars.stepUnits to mars.stepunits
|
2023-09-22 11:10:30 +00:00 |
Eugen Betke
|
d63de0d8b6
|
Merge remote-tracking branch 'origin' into feature/ECC-1620_sub-hourly
|
2023-09-21 16:13:08 +00:00 |
Matthew Griffith
|
9cf3ebedc6
|
Merge branch 'ecmwf:develop' into feature/destine-layout
|
2023-09-21 15:44:36 +01:00 |
Shahram Najm
|
ee77c57a5d
|
ECC-1692: GRIB2: Add Carbon Dioxide parameter encoding to 210061 for pseudo-centre DestinationEarth
|
2023-09-21 14:40:48 +00:00 |
Shahram Najm
|
ff72b36509
|
ECC-1692 GRIB2: Add Carbon Dioxide parameter encoding to 210061 for pseudo-centre DestinationEarth
|
2023-09-21 14:31:11 +00:00 |
Shahram Najm
|
17f590bc78
|
Testing: Add pseudo-centre destine
|
2023-09-21 14:11:16 +00:00 |
Matthew Griffith
|
c3b9767c6a
|
Missed quotation
|
2023-09-21 13:03:08 +00:00 |
Matthew Griffith
|
d145099ee8
|
ECC-1691: Commit to link branch to JIRA ticket
|
2023-09-21 11:15:04 +00:00 |
Matthew Griffith
|
172f1ed4e2
|
Moved model to climateDT only;
Fixed typo;
Removed reference to subCentre table for now which is in progress
|
2023-09-21 10:43:08 +00:00 |
Matthew Griffith
|
f11d3057ce
|
Preparation for develop;
Removing concepts which we don't need for ClimateDT;
Modified tables based on feedback from ClimateDT modellers
|
2023-09-21 10:37:07 +00:00 |
Matthew Griffith
|
1357d24900
|
Merge branch 'feature/destine-layout' of github.com:mjg41/eccodes into feature/destine-layout
|
2023-09-21 10:15:10 +00:00 |
Matthew Griffith
|
6c693fbbd4
|
Remove reference to d2;
This is not necessary at this stage
|
2023-09-21 10:15:07 +00:00 |
Eugen Betke
|
0bd0657680
|
ECC-1620: Format decimal values
|
2023-09-20 13:56:38 +00:00 |
Matthew Griffith
|
c8445bb276
|
Merge branch 'ecmwf:develop' into feature/destine-layout
|
2023-09-20 14:30:09 +02:00 |
Matthew Griffith
|
e8f1a3f080
|
Make grid_spec read_only;
Remove origin from mars namespace;
Remove CARRA-EAST grid_spec
|
2023-09-19 14:49:48 +00:00 |
Shahram Najm
|
8ffaf277db
|
ECC-1688: GRIB2: Update encoding for altimeter wave height parameters (part 2)
|
2023-09-19 14:18:55 +00:00 |
Shahram Najm
|
5ac1521d21
|
ECC-1688: GRIB2: Update encoding for altimeter wave height parameters (part 1)
|
2023-09-19 14:11:56 +00:00 |
Shahram Najm
|
72337e09b5
|
ECC-1684: GRIB2: Rename wind gust parameters
|
2023-09-19 12:26:17 +00:00 |
Robert Osinski
|
1b45b2c16c
|
ECC-1685: GRIB2 - Correct local ECMWF table entries
|
2023-09-19 11:19:31 +01:00 |
Eugen Betke
|
3a39398462
|
ECC-1620: Add stepUnits to MARS output
|
2023-09-19 09:58:04 +00:00 |
Eugen Betke
|
5392a164b0
|
ECC-1620: Fix stepUnits
|
2023-09-19 09:44:35 +00:00 |
Sebastien Villaume
|
c85e5cb124
|
add levtype HL in ERA6
|
2023-09-18 10:49:37 +01:00 |
Matthew Griffith
|
df615ca8e0
|
Added some grids to the gridSpecification
|
2023-09-15 09:25:08 +00:00 |
Eugen Betke
|
45267d146d
|
ECC-1620: Fix handing multiple messages in a GRIB file
|
2023-09-15 07:10:29 +00:00 |
Matthew Griffith
|
033a60d1ef
|
New table entries and definition for ODEDT
|
2023-09-14 16:08:34 +00:00 |
Matthew Griffith
|
e8180539ec
|
Bugs fixed!
Added full functionality for ClimateDT
|
2023-09-13 16:34:18 +00:00 |
Matthew Griffith
|
fbc4d3ab03
|
Merge commit '7e78533dfe9a6cf6e0c2e98dadcf6482493ff3fb' into feature/destine-layout
|
2023-09-13 14:07:49 +00:00 |
Matthew Griffith
|
2f7c58a626
|
Clean up and fixing bugs
|
2023-09-13 14:05:05 +00:00 |
Eugen Betke
|
a08c2cec4a
|
ECC-1620: Recompute optimal step units for each message
|
2023-09-04 13:01:19 +00:00 |
Matthew Griffith
|
0afe8de30a
|
Changed to using dataset specific def file;
Commented out change to sections.def for now while debugging.
|
2023-09-04 12:36:06 +00:00 |
Matthew Griffith
|
4277509efe
|
Merge remote-tracking branch 'origin/develop' into feature/destine-layout
|
2023-09-01 10:33:02 +00:00 |
Matthew Griffith
|
a7b9fc186a
|
Missed file
|
2023-09-01 10:29:52 +00:00 |
Matthew Griffith
|
ee5aa4ef7a
|
Merge branch 'feature/destine-layout' of github.com:mjg41/eccodes into feature/destine-layout
|
2023-09-01 10:26:52 +00:00 |
Matthew Griffith
|
a25977ab0e
|
Work to add additional concepts for DE layout
|
2023-09-01 10:26:49 +00:00 |
Shahram Najm
|
1a887dd0e8
|
ECC-1683: GRIB2: Add new pseudo-centre for DestinE (Destination Earth)
|
2023-09-01 10:08:59 +01:00 |
Shahram Najm
|
ae31e43423
|
ECC-1682: GRIB2: New reflectance parameters
|
2023-08-31 13:55:40 +00:00 |
Shahram Najm
|
97cd0ffe0e
|
ECC-1677: GRIB2: Replace discipline 192 local encoding
|
2023-08-31 12:22:37 +00:00 |
Shahram Najm
|
8c613f0c15
|
ECC-1677: GRIB2: Replace discipline 192 local encoding (part 1)
|
2023-08-31 10:54:26 +00:00 |
Shahram Najm
|
060b2cf7b0
|
ECC-1678: GRIB2: Add encoding for CAPES
|
2023-08-31 10:41:20 +00:00 |
Shahram Najm
|
786ffb8cb4
|
HEALPix: Set Lo to 45 by default
|
2023-08-30 15:15:05 +01:00 |
Shahram Najm
|
a3b40577dd
|
Cleanup
|
2023-08-30 13:49:02 +01:00 |
Shahram Najm
|
feb71f9da6
|
ECC-1674: GRIB2: Add support for encoding template 5.200
|
2023-08-30 13:49:02 +01:00 |
Eugen Betke
|
d6fe32c378
|
Merge branch 'develop' into feature/ECC-1620_sub-hourly
|
2023-08-30 08:52:56 +00:00 |
Eugen Betke
|
febbca0c3f
|
ECC-1620: Remove double packing and unpacking
|
2023-08-30 06:00:49 +00:00 |
Shahram Najm
|
cf50f62e0a
|
ECC-1673: MARS: add mars.number to the combination ocda/tpa
|
2023-08-29 14:03:22 +01:00 |
Shahram Najm
|
d7bf7f9fa5
|
Replace Asserts with proper error messages and exit codes
|
2023-08-28 13:40:32 +01:00 |
Shahram Najm
|
9ec652d21c
|
Testing: JPEG encoding, error cases
|
2023-08-27 13:31:21 +01:00 |
Eugen Betke
|
9cd5041d53
|
ECC-1620: Prototype
|
2023-08-25 06:10:07 +00:00 |
Shahram Najm
|
7c061545bd
|
Squeeze in HEALPix through the backdoor
|
2023-08-24 16:27:09 +01:00 |
Shahram Najm
|
33cd110bd1
|
Definitions: cleanup
|
2023-08-21 18:56:17 +01:00 |
Shahram Najm
|
9070952b84
|
ECC-1670: GRIB: Add new key 'setPackingType'
|
2023-08-20 14:43:09 +01:00 |
Shahram Najm
|
7a8b435d99
|
ECC-1669 and ECC-1668
|
2023-08-18 16:42:11 +00:00 |
Robert Osinski
|
4ef6b20fec
|
removed mmsf for ecPoint
|
2023-08-16 16:30:15 +01:00 |
Robert Osinski
|
40c2a8a02e
|
removed mars.number for type pfc and ppm which are for the whole ensemble
|
2023-08-16 16:30:15 +01:00 |
Shahram Najm
|
70505e4458
|
Definitions: Cleanup
|
2023-08-16 15:03:40 +01:00 |
Shahram Najm
|
4186571111
|
Definitions: Cleanup
|
2023-08-16 12:59:02 +01:00 |
Shahram Najm
|
4740cac86f
|
Definitions: Ensure all supported grid types define Ni,Nx,Nj,Ny
|
2023-08-16 12:48:40 +01:00 |
Shahram Najm
|
6422cf12e0
|
Definitions: Ensure all supported grid types define Ni,Nx,Nj,Ny
|
2023-08-16 11:34:37 +01:00 |
Shahram Najm
|
178a4a442c
|
ECC-1666: Update description
|
2023-08-15 17:24:40 +01:00 |
Shahram Najm
|
f67b14a2f9
|
ECC-1661: GRIB2: Add encoding for parameters with only uerra
|
2023-08-14 15:53:21 +00:00 |