Skip to content

Commit 1d1a9bc

Browse files
erikvansebilleerikvansebille
committed
Small fixes to circulation_models after comparing tool run
1 parent 91a1a2e commit 1d1a9bc

1 file changed

Lines changed: 14 additions & 36 deletions

File tree

‎parcels/_datasets/structured/circulation_models.py‎

Lines changed: 14 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def _copernicusmarine():
4747
"unit_long": "Meters",
4848
"units": "m",
4949
"axis": "Z",
50-
"long_name": "depth",
50+
"long_name": "Depth",
5151
"standard_name": "depth",
5252
"positive": "down",
5353
},
@@ -173,7 +173,6 @@ def _NEMO_MOI_U():
173173
"valid_min": -10.0,
174174
"valid_max": 10.0,
175175
"long_name": "Zonal velocity",
176-
"unit_long": "Meters per second",
177176
"standard_name": "sea_water_x_velocity",
178177
"short_name": "vozocrtx",
179178
"online_operation": "N/A",
@@ -242,16 +241,6 @@ def _NEMO_MOI_U():
242241
"units": "1",
243242
},
244243
),
245-
"time_counter": (
246-
["time_counter"],
247-
np.empty(0, dtype="datetime64[ns]"),
248-
{
249-
"standard_name": "time",
250-
"long_name": "Time axis",
251-
"axis": "T",
252-
"time_origin": "1950-JAN-01 00:00:00",
253-
},
254-
),
255244
"deptht": (
256245
["deptht"],
257246
np.linspace(1, 5500, Z, dtype="float64"),
@@ -281,7 +270,6 @@ def _NEMO_MOI_V():
281270
"valid_min": -10.0,
282271
"valid_max": 10.0,
283272
"long_name": "Meridional velocity",
284-
"unit_long": "Meters per second",
285273
"standard_name": "sea_water_y_velocity",
286274
"short_name": "vomecrty",
287275
"online_operation": "N/A",
@@ -297,8 +285,8 @@ def _NEMO_MOI_V():
297285
np.tile(np.linspace(-179, 179, X, endpoint=False), (Y, 1)), # note that this is not curvilinear
298286
{
299287
"units": "degrees_east",
300-
"valid_min": -179.99984754002182,
301-
"valid_max": 179.999842386314,
288+
"valid_min": -179.9999951021171,
289+
"valid_max": 180.0,
302290
"long_name": "Longitude",
303291
"nav_model": "Default grid",
304292
"standard_name": "longitude",
@@ -309,8 +297,8 @@ def _NEMO_MOI_V():
309297
np.tile(np.linspace(-75, 85, Y).reshape(-1, 1), (1, X)), # note that this is not curvilinear
310298
{
311299
"units": "degrees_north",
312-
"valid_min": -77.0104751586914,
313-
"valid_max": 89.9591064453125,
300+
"valid_min": -77.00110752801133,
301+
"valid_max": 89.95529158641207,
314302
"long_name": "Latitude",
315303
"nav_model": "Default grid",
316304
"standard_name": "latitude",
@@ -334,16 +322,6 @@ def _NEMO_MOI_V():
334322
"units": "1",
335323
},
336324
),
337-
"time_counter": (
338-
["time_counter"],
339-
np.empty(0, dtype="datetime64[ns]"),
340-
{
341-
"standard_name": "time",
342-
"long_name": "Time axis",
343-
"axis": "T",
344-
"time_origin": "1950-JAN-01 00:00:00",
345-
},
346-
),
347325
"deptht": (
348326
["deptht"],
349327
np.linspace(1, 5500, Z, dtype="float64"),
@@ -924,7 +902,7 @@ def _ecco4():
924902
"units": "degrees_north",
925903
"coordinate": "YG XG",
926904
"coverage_content_type": "coordinate",
927-
"comment": "Nonuniform grid spacing. Note: 'southwest' does not correspond to geographic orientation but is used for convenience to describe the computational grid. See MITgcm documentation for details.",
905+
"comment": "Nonuniform grid spacing. Note: 'southwest' does not correspond to geographic orientation but is used for convenience to describe the computational grid. See MITgcm dcoumentation for details.",
928906
},
929907
),
930908
"XC": (
@@ -949,7 +927,7 @@ def _ecco4():
949927
"units": "degrees_east",
950928
"coordinate": "YG XG",
951929
"coverage_content_type": "coordinate",
952-
"comment": "Nonuniform grid spacing. Note: 'southwest' does not correspond to geographic orientation but is used for convenience to describe the computational grid. See MITgcm documentation for details.",
930+
"comment": "Nonuniform grid spacing. Note: 'southwest' does not correspond to geographic orientation but is used for convenience to describe the computational grid. See MITgcm dcoumentation for details.",
953931
},
954932
),
955933
},
@@ -1007,7 +985,7 @@ def _CROCO_idealized():
1007985
{
1008986
"long_name": "free-surface",
1009987
"units": "meter",
1010-
"field": "free_surface, scalar, series",
988+
"field": "free-surface, scalar, series",
1011989
"standard_name": "sea_surface_height",
1012990
},
1013991
),
@@ -1066,7 +1044,7 @@ def _CROCO_idealized():
10661044
["eta_rho"],
10671045
np.arange(Y, dtype="float32"),
10681046
{
1069-
"long name": "y-dimension of the grid",
1047+
"long_name": "y-dimension of the grid",
10701048
"standard_name": "y_grid_index",
10711049
"axis": "Y",
10721050
"c_grid_dynamic_range": f"2:{Y}",
@@ -1076,8 +1054,8 @@ def _CROCO_idealized():
10761054
["eta_v"],
10771055
np.arange(Y - 1, dtype="float32"),
10781056
{
1079-
"long name": "y-dimension of the grid at v location",
1080-
"standard_name": "y_grid_index_at_v_location",
1057+
"long_name": "y-dimension of the grid at v location",
1058+
"standard_name": "x_grid_index_at_v_location",
10811059
"axis": "Y",
10821060
"c_grid_axis_shift": 0.5,
10831061
"c_grid_dynamic_range": f"2:{Y - 1}",
@@ -1087,7 +1065,7 @@ def _CROCO_idealized():
10871065
["xi_rho"],
10881066
np.arange(X, dtype="float32"),
10891067
{
1090-
"long name": "x-dimension of the grid",
1068+
"long_name": "x-dimension of the grid",
10911069
"standard_name": "x_grid_index",
10921070
"axis": "X",
10931071
"c_grid_dynamic_range": f"2:{X}",
@@ -1097,7 +1075,7 @@ def _CROCO_idealized():
10971075
["xi_u"],
10981076
np.arange(X - 1, dtype="float32"),
10991077
{
1100-
"long name": "x-dimension of the grid at u location",
1078+
"long_name": "x-dimension of the grid at u location",
11011079
"standard_name": "x_grid_index_at_u_location",
11021080
"axis": "X",
11031081
"c_grid_axis_shift": 0.5,
@@ -1121,7 +1099,7 @@ def _CROCO_idealized():
11211099
"long_name": "y-locations of RHO-points",
11221100
"units": "meter",
11231101
"standard_name": "plane_y_coordinate",
1124-
"field": "y_rho, scalar",
1102+
"field": "y_rho, scal",
11251103
},
11261104
),
11271105
},

0 commit comments

Comments
 (0)