Skip to content

Commit

Permalink
fixed conflict file merging from team members
Browse files Browse the repository at this point in the history
  • Loading branch information
@apchoiCMD
apchoiCMD committed Sep 25, 2023
1 parent 2ff854e commit c6616fe
Show file tree
Hide file tree
Showing 11 changed files with 1,002 additions and 4 deletions.
9 changes: 9 additions & 0 deletions utils/test/prepdata.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,16 @@ set -e

project_source_dir=$1

ncgen -o rads_adt_3a_2021181.nc4 ${project_source_dir}/testdata/rads_adt_3a_2021181.cdl
ncgen -o rads_adt_3b_2021181.nc4 ${project_source_dir}/testdata/rads_adt_3b_2021181.cdl
ncgen -o rads_adt_3a_2021182.nc4 ${project_source_dir}/testdata/rads_adt_3a_2021182.cdl
ncgen -o rads_adt_3b_2021182.nc4 ${project_source_dir}/testdata/rads_adt_3b_2021182.cdl
ncgen -o rads_adt_c2_2021181.nc4 ${project_source_dir}/testdata/rads_adt_c2_2021181.cdl
ncgen -o rads_adt_c2_2021182.nc4 ${project_source_dir}/testdata/rads_adt_c2_2021182.cdl
ncgen -o rads_adt_j3_2021181.nc4 ${project_source_dir}/testdata/rads_adt_j3_2021181.cdl
ncgen -o rads_adt_j3_2021182.nc4 ${project_source_dir}/testdata/rads_adt_j3_2021182.cdl
ncgen -o rads_adt_sa_2021181.nc4 ${project_source_dir}/testdata/rads_adt_sa_2021181.cdl
ncgen -o rads_adt_sa_2021182.nc4 ${project_source_dir}/testdata/rads_adt_sa_2021182.cdl
ncgen -o icec_amsr2_north_1.nc4 ${project_source_dir}/testdata/icec_amsr2_north_1.cdl
ncgen -o icec_amsr2_north_2.nc4 ${project_source_dir}/testdata/icec_amsr2_north_2.cdl
ncgen -o icec_amsr2_south_1.nc4 ${project_source_dir}/testdata/icec_amsr2_south_1.cdl
Expand Down
110 changes: 110 additions & 0 deletions utils/test/testdata/rads_adt_3a_2021181.cdl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
netcdf rads_adt_3a_2021181 {
dimensions:
time = UNLIMITED ; // (11 currently)
variables:
int adt_egm2008(time) ;
adt_egm2008:_FillValue = 2147483647 ;
adt_egm2008:long_name = "absolute dynamic topography (EGM2008)" ;
adt_egm2008:standard_name = "absolute_dynamic_topography_egm2008" ;
adt_egm2008:units = "m" ;
adt_egm2008:scale_factor = 0.0001 ;
adt_egm2008:coordinates = "lon lat" ;
int adt_xgm2016(time) ;
adt_xgm2016:_FillValue = 2147483647 ;
adt_xgm2016:long_name = "absolute dynamic topography (XGM2016)" ;
adt_xgm2016:standard_name = "absolute_dynamic_topography_xgm2016" ;
adt_xgm2016:units = "m" ;
adt_xgm2016:scale_factor = 0.0001 ;
adt_xgm2016:coordinates = "lon lat" ;
int cycle(time) ;
cycle:_FillValue = 2147483647 ;
cycle:long_name = "cycle number" ;
cycle:field = 9905s ;
int lat(time) ;
lat:_FillValue = 2147483647 ;
lat:long_name = "latitude" ;
lat:standard_name = "latitude" ;
lat:units = "degrees_north" ;
lat:scale_factor = 1.e-06 ;
lat:field = 201s ;
lat:comment = "Positive latitude is North latitude, negative latitude is South latitude" ;
int lon(time) ;
lon:_FillValue = 2147483647 ;
lon:long_name = "longitude" ;
lon:standard_name = "longitude" ;
lon:units = "degrees_east" ;
lon:scale_factor = 1.e-06 ;
lon:field = 301s ;
lon:comment = "East longitude relative to Greenwich meridian" ;
int pass(time) ;
pass:_FillValue = 2147483647 ;
pass:long_name = "pass number" ;
pass:field = 9906s ;
short sla(time) ;
sla:_FillValue = 32767s ;
sla:long_name = "sea level anomaly" ;
sla:standard_name = "sea_surface_height_above_sea_level" ;
sla:units = "m" ;
sla:quality_flag = "swh sig0 range_rms range_numval flags swh_rms sig0_rms" ;
sla:scale_factor = 0.0001 ;
sla:coordinates = "lon lat" ;
sla:field = 0s ;
sla:comment = "Sea level determined from satellite altitude - range - all altimetric corrections" ;
double time_dtg(time) ;
time_dtg:long_name = "time_dtg" ;
time_dtg:standard_name = "time_dtg" ;
time_dtg:units = "yyyymmddhhmmss" ;
time_dtg:coordinates = "lon lat" ;
time_dtg:comment = "UTC time formatted as yyyymmddhhmmss" ;
double time_mjd(time) ;
time_mjd:long_name = "Modified Julian Days" ;
time_mjd:standard_name = "time" ;
time_mjd:units = "days since 1858-11-17 00:00:00 UTC" ;
time_mjd:field = 105s ;
time_mjd:comment = "UTC time of measurement expressed in Modified Julian Days" ;

// global attributes:
:Conventions = "CF-1.7" ;
:title = "RADS 4 pass file" ;
:institution = "EUMETSAT / NOAA / TU Delft" ;
:source = "radar altimeter" ;
:references = "RADS Data Manual, Version 4.2 or later" ;
:featureType = "trajectory" ;
:ellipsoid = "TOPEX" ;
:ellipsoid_axis = 6378136.3 ;
:ellipsoid_flattening = 0.00335281317789691 ;
:filename = "rads_adt_3a_2021181.nc" ;
:mission_name = "SNTNL-3A" ;
:mission_phase = "a" ;
:log01 = "2021-07-01 | /Users/rads/bin/rads2nc --ymd=20210630000000,20210701000000 -C1,1000 -S3a -Vsla,adt_egm2008,adt_xgm2016,time_mjd,time_dtg,lon,lat,cycle,pass -X/Users/rads/cron/xgm2016 -X/Users/rads/cron/adt -X/Users/rads/cron/time_dtg -o/Users/rads/adt/2021/181/rads_adt_3a_2021181.nc: RAW data from" ;
:history = "Mon Sep 25 17:01:30 2023: ncks -d time,0,10 rads_adt_3a_2021181.nc rads_adt_3a_2021181.ncn\n",
"2021-07-01 21:14:30 : /Users/rads/bin/rads2nc --ymd=20210630000000,20210701000000 -C1,1000 -S3a -Vsla,adt_egm2008,adt_xgm2016,time_mjd,time_dtg,lon,lat,cycle,pass -X/Users/rads/cron/xgm2016 -X/Users/rads/cron/adt -X/Users/rads/cron/time_dtg -o/Users/rads/adt/2021/181/rads_adt_3a_2021181.nc" ;
:NCO = "netCDF Operators version 5.0.6 (Homepage = http://nco.sf.net, Code = http://github.com/nco/nco)" ;
data:

adt_egm2008 = 1674, 2176, 1671, 2320, 2011, 2349, 2139, 2174, 2462, 2441,
2487 ;

adt_xgm2016 = 1621, 2300, 1938, 2652, 2093, 2246, 1948, 1976, 2406, 2469,
2649 ;

cycle = 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73 ;

lat = -43973134, -43915104, -43857071, -43799035, -43740996, -43682953,
-43624907, -43566858, -43508805, -43450749, -43392690 ;

lon = -21550109, -21571346, -21592549, -21613720, -21634859, -21655964,
-21677037, -21698078, -21719086, -21740062, -21761007 ;

pass = 517, 517, 517, 517, 517, 517, 517, 517, 517, 517, 517 ;

sla = 75, 523, -338, 671, 104, 513, 128, 108, 424, 322, 497 ;

time_dtg = 20210630000000, 20210630000001, 20210630000002, 20210630000003,
20210630000004, 20210630000005, 20210630000006, 20210630000007,
20210630000008, 20210630000009, 20210630000010 ;

time_mjd = 59395, 59395.0000115741, 59395.0000231481, 59395.0000347222,
59395.0000462963, 59395.0000578704, 59395.0000694444, 59395.0000810185,
59395.0000925926, 59395.0001041667, 59395.0001157407 ;
}
111 changes: 111 additions & 0 deletions utils/test/testdata/rads_adt_3a_2021182.cdl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
netcdf rads_adt_3a_2021182 {
dimensions:
time = UNLIMITED ; // (11 currently)
variables:
int adt_egm2008(time) ;
adt_egm2008:_FillValue = 2147483647 ;
adt_egm2008:long_name = "absolute dynamic topography (EGM2008)" ;
adt_egm2008:standard_name = "absolute_dynamic_topography_egm2008" ;
adt_egm2008:units = "m" ;
adt_egm2008:scale_factor = 0.0001 ;
adt_egm2008:coordinates = "lon lat" ;
int adt_xgm2016(time) ;
adt_xgm2016:_FillValue = 2147483647 ;
adt_xgm2016:long_name = "absolute dynamic topography (XGM2016)" ;
adt_xgm2016:standard_name = "absolute_dynamic_topography_xgm2016" ;
adt_xgm2016:units = "m" ;
adt_xgm2016:scale_factor = 0.0001 ;
adt_xgm2016:coordinates = "lon lat" ;
int cycle(time) ;
cycle:_FillValue = 2147483647 ;
cycle:long_name = "cycle number" ;
cycle:field = 9905s ;
int lat(time) ;
lat:_FillValue = 2147483647 ;
lat:long_name = "latitude" ;
lat:standard_name = "latitude" ;
lat:units = "degrees_north" ;
lat:scale_factor = 1.e-06 ;
lat:field = 201s ;
lat:comment = "Positive latitude is North latitude, negative latitude is South latitude" ;
int lon(time) ;
lon:_FillValue = 2147483647 ;
lon:long_name = "longitude" ;
lon:standard_name = "longitude" ;
lon:units = "degrees_east" ;
lon:scale_factor = 1.e-06 ;
lon:field = 301s ;
lon:comment = "East longitude relative to Greenwich meridian" ;
int pass(time) ;
pass:_FillValue = 2147483647 ;
pass:long_name = "pass number" ;
pass:field = 9906s ;
short sla(time) ;
sla:_FillValue = 32767s ;
sla:long_name = "sea level anomaly" ;
sla:standard_name = "sea_surface_height_above_sea_level" ;
sla:units = "m" ;
sla:quality_flag = "swh sig0 range_rms range_numval flags swh_rms sig0_rms" ;
sla:scale_factor = 0.0001 ;
sla:coordinates = "lon lat" ;
sla:field = 0s ;
sla:comment = "Sea level determined from satellite altitude - range - all altimetric corrections" ;
double time_dtg(time) ;
time_dtg:long_name = "time_dtg" ;
time_dtg:standard_name = "time_dtg" ;
time_dtg:units = "yyyymmddhhmmss" ;
time_dtg:coordinates = "lon lat" ;
time_dtg:comment = "UTC time formatted as yyyymmddhhmmss" ;
double time_mjd(time) ;
time_mjd:long_name = "Modified Julian Days" ;
time_mjd:standard_name = "time" ;
time_mjd:units = "days since 1858-11-17 00:00:00 UTC" ;
time_mjd:field = 105s ;
time_mjd:comment = "UTC time of measurement expressed in Modified Julian Days" ;

// global attributes:
:Conventions = "CF-1.7" ;
:title = "RADS 4 pass file" ;
:institution = "EUMETSAT / NOAA / TU Delft" ;
:source = "radar altimeter" ;
:references = "RADS Data Manual, Version 4.2 or later" ;
:featureType = "trajectory" ;
:ellipsoid = "TOPEX" ;
:ellipsoid_axis = 6378136.3 ;
:ellipsoid_flattening = 0.00335281317789691 ;
:filename = "rads_adt_3a_2021182.nc" ;
:mission_name = "SNTNL-3A" ;
:mission_phase = "a" ;
:log01 = "2021-07-02 | /Users/rads/bin/rads2nc --ymd=20210701000000,20210702000000 -C1,1000 -S3a -Vsla,adt_egm2008,adt_xgm2016,time_mjd,time_dtg,lon,lat,cycle,pass -X/Users/rads/cron/xgm2016 -X/Users/rads/cron/adt -X/Users/rads/cron/time_dtg -o/Users/rads/adt/2021/182/rads_adt_3a_2021182.nc: RAW data from" ;
:history = "Mon Sep 25 17:01:31 2023: ncks -d time,0,10 rads_adt_3a_2021182.nc rads_adt_3a_2021182.ncn\n",
"2021-07-02 21:11:15 : /Users/rads/bin/rads2nc --ymd=20210701000000,20210702000000 -C1,1000 -S3a -Vsla,adt_egm2008,adt_xgm2016,time_mjd,time_dtg,lon,lat,cycle,pass -X/Users/rads/cron/xgm2016 -X/Users/rads/cron/adt -X/Users/rads/cron/time_dtg -o/Users/rads/adt/2021/182/rads_adt_3a_2021182.nc" ;
:NCO = "netCDF Operators version 5.0.6 (Homepage = http://nco.sf.net, Code = http://github.com/nco/nco)" ;
data:

adt_egm2008 = -4374, -3849, -3832, -3530, -3149, -2888, -2611, -2423, -2116,
-2011, -2170 ;

adt_xgm2016 = -4617, -4012, -3779, -3212, -2781, -2466, -2048, -2067, -1971,
-2110, -2327 ;

cycle = 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, 73 ;

lat = 48396720, 48454663, 48512601, 48570535, 48628465, 48686391, 48744313,
48802230, 48860143, 48918052, 48975957 ;

lon = -39706628, -39730940, -39755297, -39779700, -39804149, -39828645,
-39853187, -39877776, -39902412, -39927095, -39951826 ;

pass = 545, 545, 545, 545, 545, 545, 545, 545, 545, 545, 545 ;

sla = -3955, -3487, -3628, -3103, -2815, -2565, -2353, -2275, -1983, -1491,
-1688 ;

time_dtg = 20210701000001, 20210701000002, 20210701000003, 20210701000004,
20210701000005, 20210701000006, 20210701000007, 20210701000008,
20210701000009, 20210701000010, 20210701000011 ;

time_mjd = 59396.0000115741, 59396.0000231481, 59396.0000347222,
59396.0000462963, 59396.0000578704, 59396.0000694444, 59396.0000810185,
59396.0000925926, 59396.0001041667, 59396.0001157407, 59396.0001273148 ;
}
110 changes: 110 additions & 0 deletions utils/test/testdata/rads_adt_3b_2021181.cdl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
netcdf rads_adt_3b_2021181 {
dimensions:
time = UNLIMITED ; // (11 currently)
variables:
int adt_egm2008(time) ;
adt_egm2008:_FillValue = 2147483647 ;
adt_egm2008:long_name = "absolute dynamic topography (EGM2008)" ;
adt_egm2008:standard_name = "absolute_dynamic_topography_egm2008" ;
adt_egm2008:units = "m" ;
adt_egm2008:scale_factor = 0.0001 ;
adt_egm2008:coordinates = "lon lat" ;
int adt_xgm2016(time) ;
adt_xgm2016:_FillValue = 2147483647 ;
adt_xgm2016:long_name = "absolute dynamic topography (XGM2016)" ;
adt_xgm2016:standard_name = "absolute_dynamic_topography_xgm2016" ;
adt_xgm2016:units = "m" ;
adt_xgm2016:scale_factor = 0.0001 ;
adt_xgm2016:coordinates = "lon lat" ;
int cycle(time) ;
cycle:_FillValue = 2147483647 ;
cycle:long_name = "cycle number" ;
cycle:field = 9905s ;
int lat(time) ;
lat:_FillValue = 2147483647 ;
lat:long_name = "latitude" ;
lat:standard_name = "latitude" ;
lat:units = "degrees_north" ;
lat:scale_factor = 1.e-06 ;
lat:field = 201s ;
lat:comment = "Positive latitude is North latitude, negative latitude is South latitude" ;
int lon(time) ;
lon:_FillValue = 2147483647 ;
lon:long_name = "longitude" ;
lon:standard_name = "longitude" ;
lon:units = "degrees_east" ;
lon:scale_factor = 1.e-06 ;
lon:field = 301s ;
lon:comment = "East longitude relative to Greenwich meridian" ;
int pass(time) ;
pass:_FillValue = 2147483647 ;
pass:long_name = "pass number" ;
pass:field = 9906s ;
short sla(time) ;
sla:_FillValue = 32767s ;
sla:long_name = "sea level anomaly" ;
sla:standard_name = "sea_surface_height_above_sea_level" ;
sla:units = "m" ;
sla:quality_flag = "swh sig0 range_rms range_numval flags swh_rms sig0_rms" ;
sla:scale_factor = 0.0001 ;
sla:coordinates = "lon lat" ;
sla:field = 0s ;
sla:comment = "Sea level determined from satellite altitude - range - all altimetric corrections" ;
double time_dtg(time) ;
time_dtg:long_name = "time_dtg" ;
time_dtg:standard_name = "time_dtg" ;
time_dtg:units = "yyyymmddhhmmss" ;
time_dtg:coordinates = "lon lat" ;
time_dtg:comment = "UTC time formatted as yyyymmddhhmmss" ;
double time_mjd(time) ;
time_mjd:long_name = "Modified Julian Days" ;
time_mjd:standard_name = "time" ;
time_mjd:units = "days since 1858-11-17 00:00:00 UTC" ;
time_mjd:field = 105s ;
time_mjd:comment = "UTC time of measurement expressed in Modified Julian Days" ;

// global attributes:
:Conventions = "CF-1.7" ;
:title = "RADS 4 pass file" ;
:institution = "EUMETSAT / NOAA / TU Delft" ;
:source = "radar altimeter" ;
:references = "RADS Data Manual, Version 4.2 or later" ;
:featureType = "trajectory" ;
:ellipsoid = "TOPEX" ;
:ellipsoid_axis = 6378136.3 ;
:ellipsoid_flattening = 0.00335281317789691 ;
:filename = "rads_adt_3b_2021181.nc" ;
:mission_name = "SNTNL-3B" ;
:mission_phase = "b" ;
:log01 = "2021-07-01 | /Users/rads/bin/rads2nc --ymd=20210630000000,20210701000000 -S3b -Vsla,adt_egm2008,adt_xgm2016,time_mjd,time_dtg,lon,lat,cycle,pass -X/Users/rads/cron/xgm2016 -X/Users/rads/cron/adt -X/Users/rads/cron/time_dtg -o/Users/rads/adt/2021/181/rads_adt_3b_2021181.nc: RAW data from" ;
:history = "Mon Sep 25 17:01:31 2023: ncks -d time,0,10 rads_adt_3b_2021181.nc rads_adt_3b_2021181.ncn\n",
"2021-07-01 21:31:13 : /Users/rads/bin/rads2nc --ymd=20210630000000,20210701000000 -S3b -Vsla,adt_egm2008,adt_xgm2016,time_mjd,time_dtg,lon,lat,cycle,pass -X/Users/rads/cron/xgm2016 -X/Users/rads/cron/adt -X/Users/rads/cron/time_dtg -o/Users/rads/adt/2021/181/rads_adt_3b_2021181.nc" ;
:NCO = "netCDF Operators version 5.0.6 (Homepage = http://nco.sf.net, Code = http://github.com/nco/nco)" ;
data:

adt_egm2008 = 6505, 7307, 6026, 5871, 5561, 5246, 4981, 4661, 4391, 4409,
4283 ;

adt_xgm2016 = 3136, 4247, 4498, 4515, 4579, 4741, 4731, 4351, 4016, 3860,
3887 ;

cycle = 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54 ;

lat = 59732735, 59505896, 58767628, 58710774, 58653911, 58597040, 58540159,
58483270, 58426372, 58369465, 58312550 ;

lon = 163417447, 163262248, 162770394, 162733328, 162696369, 162659516,
162622770, 162586128, 162549591, 162513159, 162476830 ;

pass = 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, 232 ;

sla = 4578, 5072, 1437, 756, 254, 91, -2, -170, -484, -313, -244 ;

time_dtg = 20210630000629, 20210630000633, 20210630000646, 20210630000647,
20210630000648, 20210630000649, 20210630000650, 20210630000651,
20210630000652, 20210630000653, 20210630000654 ;

time_mjd = 59395.0045023148, 59395.0045486111, 59395.0046990741,
59395.0047106482, 59395.0047222222, 59395.0047337963, 59395.0047453704,
59395.0047569444, 59395.0047685185, 59395.0047800926, 59395.0047916667 ;
}
Loading

0 comments on commit c6616fe

Please sign in to comment.