Skip to content

Commit 4d54dc8

Browse files
mjg41mjg41
committed
Merge remote-tracking branch 'origin/develop' into feature/ECC-1691-DestineClimateDT 
2 parents b94723f + 332461b commit 4d54dc8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+683
-341
lines changed

‎definitions/grib1/localConcepts/ecmf/cfName.def

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -589,32 +589,32 @@
589589
table2Version = 190 ;
590590
indicatorOfParameter = 179 ;
591591
}
592-
#Eastward turbulent surface stress
592+
#Time-integrated eastward turbulent surface stress
593593
'surface_downward_eastward_stress' = {
594594
table2Version = 128 ;
595595
indicatorOfParameter = 180 ;
596596
}
597-
#Eastward turbulent surface stress
597+
#Time-integrated eastward turbulent surface stress
598598
'surface_downward_eastward_stress' = {
599599
table2Version = 170 ;
600600
indicatorOfParameter = 180 ;
601601
}
602-
#Eastward turbulent surface stress
602+
#Time-integrated eastward turbulent surface stress
603603
'surface_downward_eastward_stress' = {
604604
table2Version = 180 ;
605605
indicatorOfParameter = 180 ;
606606
}
607-
#Northward turbulent surface stress
607+
#Time-integrated northward turbulent surface stress
608608
'surface_downward_northward_stress' = {
609609
table2Version = 128 ;
610610
indicatorOfParameter = 181 ;
611611
}
612-
#Northward turbulent surface stress
612+
#Time-integrated northward turbulent surface stress
613613
'surface_downward_northward_stress' = {
614614
table2Version = 170 ;
615615
indicatorOfParameter = 181 ;
616616
}
617-
#Northward turbulent surface stress
617+
#Time-integrated northward turbulent surface stress
618618
'surface_downward_northward_stress' = {
619619
table2Version = 180 ;
620620
indicatorOfParameter = 181 ;
@@ -959,7 +959,7 @@
959959
table2Version = 174 ;
960960
indicatorOfParameter = 98 ;
961961
}
962-
#Carbon Dioxide
962+
#Carbon dioxide mass mixing ratio
963963
'mass_fraction_of_carbon_dioxide_in_air' = {
964964
table2Version = 210 ;
965965
indicatorOfParameter = 61 ;

‎definitions/grib1/localConcepts/ecmf/cfVarName.def

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,32 +1459,32 @@
14591459
table2Version = 190 ;
14601460
indicatorOfParameter = 179 ;
14611461
}
1462-
#Eastward turbulent surface stress
1462+
#Time-integrated eastward turbulent surface stress
14631463
'ewss' = {
14641464
table2Version = 128 ;
14651465
indicatorOfParameter = 180 ;
14661466
}
1467-
#Eastward turbulent surface stress
1467+
#Time-integrated eastward turbulent surface stress
14681468
'ewss' = {
14691469
table2Version = 170 ;
14701470
indicatorOfParameter = 180 ;
14711471
}
1472-
#Eastward turbulent surface stress
1472+
#Time-integrated eastward turbulent surface stress
14731473
'ewss' = {
14741474
table2Version = 180 ;
14751475
indicatorOfParameter = 180 ;
14761476
}
1477-
#Northward turbulent surface stress
1477+
#Time-integrated northward turbulent surface stress
14781478
'nsss' = {
14791479
table2Version = 128 ;
14801480
indicatorOfParameter = 181 ;
14811481
}
1482-
#Northward turbulent surface stress
1482+
#Time-integrated northward turbulent surface stress
14831483
'nsss' = {
14841484
table2Version = 170 ;
14851485
indicatorOfParameter = 181 ;
14861486
}
1487-
#Northward turbulent surface stress
1487+
#Time-integrated northward turbulent surface stress
14881488
'nsss' = {
14891489
table2Version = 180 ;
14901490
indicatorOfParameter = 181 ;

‎definitions/grib1/localConcepts/ecmf/name.def

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,33 +1459,33 @@
14591459
table2Version = 190 ;
14601460
indicatorOfParameter = 179 ;
14611461
}
1462-
#Eastward turbulent surface stress
1463-
'Eastward turbulent surface stress' = {
1462+
#Time-integrated eastward turbulent surface stress
1463+
'Time-integrated eastward turbulent surface stress' = {
14641464
table2Version = 128 ;
14651465
indicatorOfParameter = 180 ;
14661466
}
1467-
#Eastward turbulent surface stress
1468-
'Eastward turbulent surface stress' = {
1467+
#Time-integrated eastward turbulent surface stress
1468+
'Time-integrated eastward turbulent surface stress' = {
14691469
table2Version = 170 ;
14701470
indicatorOfParameter = 180 ;
14711471
}
1472-
#Eastward turbulent surface stress
1473-
'Eastward turbulent surface stress' = {
1472+
#Time-integrated eastward turbulent surface stress
1473+
'Time-integrated eastward turbulent surface stress' = {
14741474
table2Version = 180 ;
14751475
indicatorOfParameter = 180 ;
14761476
}
1477-
#Northward turbulent surface stress
1478-
'Northward turbulent surface stress' = {
1477+
#Time-integrated northward turbulent surface stress
1478+
'Time-integrated northward turbulent surface stress' = {
14791479
table2Version = 128 ;
14801480
indicatorOfParameter = 181 ;
14811481
}
1482-
#Northward turbulent surface stress
1483-
'Northward turbulent surface stress' = {
1482+
#Time-integrated northward turbulent surface stress
1483+
'Time-integrated northward turbulent surface stress' = {
14841484
table2Version = 170 ;
14851485
indicatorOfParameter = 181 ;
14861486
}
1487-
#Northward turbulent surface stress
1488-
'Northward turbulent surface stress' = {
1487+
#Time-integrated northward turbulent surface stress
1488+
'Time-integrated northward turbulent surface stress' = {
14891489
table2Version = 180 ;
14901490
indicatorOfParameter = 181 ;
14911491
}

‎definitions/grib1/localConcepts/ecmf/paramId.def

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,32 +1459,32 @@
14591459
table2Version = 190 ;
14601460
indicatorOfParameter = 179 ;
14611461
}
1462-
#Eastward turbulent surface stress
1462+
#Time-integrated eastward turbulent surface stress
14631463
'180' = {
14641464
table2Version = 128 ;
14651465
indicatorOfParameter = 180 ;
14661466
}
1467-
#Eastward turbulent surface stress
1467+
#Time-integrated eastward turbulent surface stress
14681468
'180' = {
14691469
table2Version = 170 ;
14701470
indicatorOfParameter = 180 ;
14711471
}
1472-
#Eastward turbulent surface stress
1472+
#Time-integrated eastward turbulent surface stress
14731473
'180' = {
14741474
table2Version = 180 ;
14751475
indicatorOfParameter = 180 ;
14761476
}
1477-
#Northward turbulent surface stress
1477+
#Time-integrated northward turbulent surface stress
14781478
'181' = {
14791479
table2Version = 128 ;
14801480
indicatorOfParameter = 181 ;
14811481
}
1482-
#Northward turbulent surface stress
1482+
#Time-integrated northward turbulent surface stress
14831483
'181' = {
14841484
table2Version = 170 ;
14851485
indicatorOfParameter = 181 ;
14861486
}
1487-
#Northward turbulent surface stress
1487+
#Time-integrated northward turbulent surface stress
14881488
'181' = {
14891489
table2Version = 180 ;
14901490
indicatorOfParameter = 181 ;

‎definitions/grib1/localConcepts/ecmf/shortName.def

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,32 +1459,32 @@
14591459
table2Version = 190 ;
14601460
indicatorOfParameter = 179 ;
14611461
}
1462-
#Eastward turbulent surface stress
1462+
#Time-integrated eastward turbulent surface stress
14631463
'ewss' = {
14641464
table2Version = 128 ;
14651465
indicatorOfParameter = 180 ;
14661466
}
1467-
#Eastward turbulent surface stress
1467+
#Time-integrated eastward turbulent surface stress
14681468
'ewss' = {
14691469
table2Version = 170 ;
14701470
indicatorOfParameter = 180 ;
14711471
}
1472-
#Eastward turbulent surface stress
1472+
#Time-integrated eastward turbulent surface stress
14731473
'ewss' = {
14741474
table2Version = 180 ;
14751475
indicatorOfParameter = 180 ;
14761476
}
1477-
#Northward turbulent surface stress
1477+
#Time-integrated northward turbulent surface stress
14781478
'nsss' = {
14791479
table2Version = 128 ;
14801480
indicatorOfParameter = 181 ;
14811481
}
1482-
#Northward turbulent surface stress
1482+
#Time-integrated northward turbulent surface stress
14831483
'nsss' = {
14841484
table2Version = 170 ;
14851485
indicatorOfParameter = 181 ;
14861486
}
1487-
#Northward turbulent surface stress
1487+
#Time-integrated northward turbulent surface stress
14881488
'nsss' = {
14891489
table2Version = 180 ;
14901490
indicatorOfParameter = 181 ;

‎definitions/grib1/localConcepts/ecmf/units.def

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,32 +1459,32 @@
14591459
table2Version = 190 ;
14601460
indicatorOfParameter = 179 ;
14611461
}
1462-
#Eastward turbulent surface stress
1462+
#Time-integrated eastward turbulent surface stress
14631463
'N m**-2 s' = {
14641464
table2Version = 128 ;
14651465
indicatorOfParameter = 180 ;
14661466
}
1467-
#Eastward turbulent surface stress
1467+
#Time-integrated eastward turbulent surface stress
14681468
'N m**-2 s' = {
14691469
table2Version = 170 ;
14701470
indicatorOfParameter = 180 ;
14711471
}
1472-
#Eastward turbulent surface stress
1472+
#Time-integrated eastward turbulent surface stress
14731473
'N m**-2 s' = {
14741474
table2Version = 180 ;
14751475
indicatorOfParameter = 180 ;
14761476
}
1477-
#Northward turbulent surface stress
1477+
#Time-integrated northward turbulent surface stress
14781478
'N m**-2 s' = {
14791479
table2Version = 128 ;
14801480
indicatorOfParameter = 181 ;
14811481
}
1482-
#Northward turbulent surface stress
1482+
#Time-integrated northward turbulent surface stress
14831483
'N m**-2 s' = {
14841484
table2Version = 170 ;
14851485
indicatorOfParameter = 181 ;
14861486
}
1487-
#Northward turbulent surface stress
1487+
#Time-integrated northward turbulent surface stress
14881488
'N m**-2 s' = {
14891489
table2Version = 180 ;
14901490
indicatorOfParameter = 181 ;

‎definitions/grib2/cfName.def

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@
4545
typeOfFirstFixedSurface = 8 ;
4646
typeOfStatisticalProcessing = 1 ;
4747
}
48-
#Eastward turbulent surface stress
48+
#Time-integrated eastward turbulent surface stress
4949
'surface_downward_eastward_stress' = {
5050
discipline = 0 ;
5151
parameterCategory = 2 ;
52-
parameterNumber = 38 ;
52+
parameterNumber = 62 ;
5353
typeOfFirstFixedSurface = 1 ;
5454
typeOfStatisticalProcessing = 1 ;
5555
}
56-
#Northward turbulent surface stress
56+
#Time-integrated northward turbulent surface stress
5757
'surface_downward_northward_stress' = {
5858
discipline = 0 ;
5959
parameterCategory = 2 ;
60-
parameterNumber = 37 ;
60+
parameterNumber = 63 ;
6161
typeOfFirstFixedSurface = 1 ;
6262
typeOfStatisticalProcessing = 1 ;
6363
}

‎definitions/grib2/cfVarName.def

Lines changed: 66 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -382,19 +382,19 @@
382382
typeOfFirstFixedSurface = 8 ;
383383
typeOfStatisticalProcessing = 1 ;
384384
}
385-
#Eastward turbulent surface stress
385+
#Time-integrated eastward turbulent surface stress
386386
'ewss' = {
387387
discipline = 0 ;
388388
parameterCategory = 2 ;
389-
parameterNumber = 38 ;
389+
parameterNumber = 62 ;
390390
typeOfFirstFixedSurface = 1 ;
391391
typeOfStatisticalProcessing = 1 ;
392392
}
393-
#Northward turbulent surface stress
393+
#Time-integrated northward turbulent surface stress
394394
'nsss' = {
395395
discipline = 0 ;
396396
parameterCategory = 2 ;
397-
parameterNumber = 37 ;
397+
parameterNumber = 63 ;
398398
typeOfFirstFixedSurface = 1 ;
399399
typeOfStatisticalProcessing = 1 ;
400400
}
@@ -724,6 +724,20 @@
724724
parameterCategory = 0 ;
725725
parameterNumber = 89 ;
726726
}
727+
#U-component of atmospheric surface momentum flux
728+
'utaua' = {
729+
discipline = 0 ;
730+
parameterCategory = 2 ;
731+
parameterNumber = 17 ;
732+
typeOfFirstFixedSurface = 1 ;
733+
}
734+
#V-component of atmospheric surface momentum flux
735+
'vtaua' = {
736+
discipline = 0 ;
737+
parameterCategory = 2 ;
738+
parameterNumber = 18 ;
739+
typeOfFirstFixedSurface = 1 ;
740+
}
727741
#U-component of surface momentum flux into ocean
728742
'utauo' = {
729743
discipline = 10 ;
@@ -3745,6 +3759,22 @@
37453759
typeOfFirstFixedSurface = 8 ;
37463760
typeOfStatisticalProcessing = 0 ;
37473761
}
3762+
#Mean eastward turbulent surface stress
3763+
'metss' = {
3764+
discipline = 0 ;
3765+
parameterCategory = 2 ;
3766+
parameterNumber = 62 ;
3767+
typeOfFirstFixedSurface = 1 ;
3768+
typeOfStatisticalProcessing = 0 ;
3769+
}
3770+
#Mean northward turbulent surface stress
3771+
'mntss' = {
3772+
discipline = 0 ;
3773+
parameterCategory = 2 ;
3774+
parameterNumber = 63 ;
3775+
typeOfFirstFixedSurface = 1 ;
3776+
typeOfStatisticalProcessing = 0 ;
3777+
}
37483778
#Mean evaporation rate
37493779
'mer' = {
37503780
discipline = 0 ;
@@ -4735,6 +4765,38 @@
47354765
typeOfFirstFixedSurface = 1 ;
47364766
typeOfSecondFixedSurface = 255 ;
47374767
}
4768+
#Time-integrated eastward turbulent surface stress due to orographic form drag
4769+
'etssofd' = {
4770+
discipline = 0 ;
4771+
parameterCategory = 2 ;
4772+
parameterNumber = 64 ;
4773+
typeOfFirstFixedSurface = 1 ;
4774+
typeOfStatisticalProcessing = 1 ;
4775+
}
4776+
#Time-integrated northward turbulent surface stress due to orographic form drag
4777+
'ntssofd' = {
4778+
discipline = 0 ;
4779+
parameterCategory = 2 ;
4780+
parameterNumber = 65 ;
4781+
typeOfFirstFixedSurface = 1 ;
4782+
typeOfStatisticalProcessing = 1 ;
4783+
}
4784+
#Time-integrated eastward turbulent surface stress due to surface roughness
4785+
'etsssr' = {
4786+
discipline = 0 ;
4787+
parameterCategory = 2 ;
4788+
parameterNumber = 66 ;
4789+
typeOfFirstFixedSurface = 1 ;
4790+
typeOfStatisticalProcessing = 1 ;
4791+
}
4792+
#Time-integrated northward turbulent surface stress due to surface roughness
4793+
'ntsssr' = {
4794+
discipline = 0 ;
4795+
parameterCategory = 2 ;
4796+
parameterNumber = 67 ;
4797+
typeOfFirstFixedSurface = 1 ;
4798+
typeOfStatisticalProcessing = 1 ;
4799+
}
47384800
#Universal thermal climate index
47394801
'utci' = {
47404802
discipline = 20 ;
@@ -8715,18 +8777,6 @@
87158777
parameterCategory = 1 ;
87168778
parameterNumber = 68 ;
87178779
}
8718-
#Momentum flux, u component
8719-
'uflx' = {
8720-
discipline = 0 ;
8721-
parameterCategory = 2 ;
8722-
parameterNumber = 17 ;
8723-
}
8724-
#Momentum flux, v component
8725-
'vflx' = {
8726-
discipline = 0 ;
8727-
parameterCategory = 2 ;
8728-
parameterNumber = 18 ;
8729-
}
87308780
#Maximum wind speed
87318781
'maxgust' = {
87328782
discipline = 0 ;

0 commit comments

Comments
 (0)