Skip to content

Commit d39442c

Browse files
cwebearbgruening
andauthored
edit xml file to take into account the new version (#156)
* edit xml file to take into account the new version * update * Update bgc_harmonizer.xml * Update bgc_harmonizer.xml --------- Co-authored-by: Björn Grüning <bjoern@gruenings.eu>
1 parent a54328a commit d39442c

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

tools/bgc_ocean/bgc_harmonizer.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<tool id="harmonize_insitu_to_netcdf" name="QCV harmonizer" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@" profile="22.01" license="MIT">
2-
<description>and aggregator of insitu marine physical and biogeochemical data</description>
2+
<description>and aggregator of in-situ marine physical and biogeochemical data</description>
33
<macros>
4-
<token name="@TOOL_VERSION@">1.1</token>
4+
<token name="@TOOL_VERSION@">2.0</token>
55
<token name="@VERSION_SUFFIX@">0</token>
66
</macros>
77
<requirements>
@@ -11,25 +11,25 @@
1111
export HOME=\$PWD &&
1212
1313
#for $i, $infile in enumerate($infiles):
14-
cp '$infile' '/runtime/data/original_data/work/ga_la_xy/${infile.element_identifier}' &&
14+
cp '$infile' '/runtime/data-in/${infile.element_identifier}' &&
1515
#end for
1616
1717
/app/launchers/start-app.sh GALAXY &&
1818
19-
cp /runtime/data/harmonized_data/work/ga_la_xy_harm_agg.nc '$output_net'
19+
cp /runtime/data-out/*.nc '$output_net'
2020
]]></command>
2121
<inputs>
22-
<param name="infiles" type="data" format="netcdf" multiple="true" label="Input the netcdf data files" help="This files can netcdf raw Argo or Gliders datafiles following CMEMS convention."/>
22+
<param name="infiles" type="data" format="netcdf" multiple="true" label="Input the NetCDF data files" help="This files can NetCDF raw Argo or Gliders data files following CMEMS convention."/>
2323
</inputs>
2424
<outputs>
25-
<data name="output_net" format="netcdf" from_work_dir="/runtime/data/harmonized_data/work/*.nc" label="${tool.name} netcdf data" />
25+
<data name="output_net" format="netcdf" label="${tool.name} NetCDF data" />
2626
</outputs>
2727
<tests>
2828
<test expect_num_outputs="1">
2929
<param name="infiles" value="D6901758_001.nc,D6901758_002.nc,D6901758_003.nc,D6901758_004.nc,D6901758_005.nc"/>
3030
<output name="output_net">
3131
<assert_contents>
32-
<has_size value="427535" delta="0"/>
32+
<has_size value="480666" delta="0"/>
3333
</assert_contents>
3434
</output>
3535
</test>
@@ -58,13 +58,17 @@ Coordinates and variables :
5858
5959
--
6060
61-
"temperature" : ["TEMP", "TEMPERATURE"],
62-
"salinity" : ["PSAL", "PRACTICAL_SALINITY"],
63-
"oxygen" : ["DOXY"],
61+
"temperature" : ["TEMP", "TEMPERATURE", "t_an"],
62+
"salinity" : ["PSAL", "PRACTICAL_SALINITY", "s_an"],
63+
"oxygen" : ["DOXY", "o_an"],
64+
"oxygenSat" : ["O_an"],
6465
"pressure" : ["PRES"],
6566
"chlorophylle" : ["CHLA"],
6667
"nitrate" : ["NO3", "NITRATE", "n_an"],
6768
"bbp700" : ["BBP700"],
69+
"C1PHASE_DOXY" : ["C1PHASE_DOXY"],
70+
"C2PHASE_DOXY" : ["C2PHASE_DOXY"],
71+
"TEMP_DOXY" : ["TEMP_DOXY"],
6872
6973
All variables are tagged with a suffix to indicate the state of the data (_raw, _dmadjusted, _rtadjusted)
7074
@@ -92,26 +96,22 @@ Units :
9296
9397
Arbitrarily,
9498
95-
dates are written following : "seconds since 1950-01-01T00:00:00 in julian calendar"
96-
longitude is set between : -180° and 180°
97-
latitude is set between : -90° and 90°
99+
dates are written following: "days decimal since 1950-01-01T00:00:00 in julian calendar"
100+
longitude is set between: -180° and 180°
101+
latitude is set between: -90° and 90°
98102
99-
WARNING : This application works only platform by platform. For example, it is possible to aggregate and harmonize a whole argo trajectory but one at a time. If two argo trajectories are needed to process, this tool needs to be run 2 times.
103+
WARNING: This application works only platform by platform. For example, it is possible to aggregate and harmonize a whole argo trajectory but one at a time.
104+
If two argo trajectories are needed to process, this tool needs to be run 2 times.
100105
101106
**Input**
102107
103-
a list of files in a txt file named cerb_listing.txt copntaining only filenames without paths. The tool will find the files automatically. A listing example here :
108+
files in the input folder should be like:
104109
105110
BD6901580_003.nc BD6901580_004.nc BD6901580_005.nc BD6901580_006.nc D6901580_003.nc D6901580_004.nc D6901580_005.nc D6901580_006.nc 6901580_meta.nc
106111
107-
paths of where are the data (volumes) containing configurations, listings and data. Paths are :
108-
109-
config path : where your textfile containing the list of files names is : it contains the listing cerb_listing.txt
110-
data_path : highest folder including all the files to harmonize written in the textfile listing
111-
112112
**Output**
113113
114-
A concatenated and harmonized netcdf file
114+
A concatenated and harmonized NetCDF file.
115115
116116
]]></help>
117117
<citations>

0 commit comments

Comments
 (0)