Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/devel' into SOdevel
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-nilsson-irfu committed Sep 6, 2019
2 parents 8c49af1 + 53d04c4 commit 1ea1d71
Show file tree
Hide file tree
Showing 200 changed files with 171,540 additions and 631,003 deletions.
1 change: 1 addition & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Git
2. Routines in [master](https://github.com/irfu/irfu-matlab/tree/master) branch should do not less and not more than written in their help!
3. Our [devel](https://github.com/irfu/irfu-matlab/tree/devel) branch includes latest delivered development changes for the next release.
4. Semantic release numbering https://semver.org/
5. Write clear and useful git commit messages https://chris.beams.io/posts/git-commit/

Common data types
-----------------
Expand Down
17 changes: 17 additions & 0 deletions .github/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>se.irfu</groupId>
<artifactId>irfu-matlab</artifactId>
<version>1.14.2</version>
<dependencies>
<!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
<version>3.28.0</version>
</dependency>
</dependencies>
</project>
6 changes: 5 additions & 1 deletion @dataobj/dataobj.m
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,11 @@
end
else
data{iVar(i)}(data{iVar(i)}==0) = NaN; % fillvalue timeline
data{iVar(i)} = irf_time(data{iVar(i)},'cdfepoch>epoch');
dTmp = data{iVar(i)};
for iCol=1:size(dTmp,2)
dTmp(:,iCol) = irf_time(dTmp(:,iCol),'cdfepoch>epoch');
end
data{iVar(i)} = dTmp; clear dTmp
% bug fix for spdfcdfread (time comes out as row vector)
if size(data{iVar(i)},1)~=info.Variables{iVar(i),3}
data{iVar(i)} = data{iVar(i)}';
Expand Down
5 changes: 4 additions & 1 deletion @dataobj/get_ts.m
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@

%userData
ud = data;
ud = rmfield(ud,{'DEPEND_0','data','nrec','dim','name','variance','UNITS'});

field_list={'DEPEND_0','data','nrec','dim','name','variance','UNITS'};
ud = rmfield(ud,field_list(isfield(ud,field_list)));

repres = [];
if isfield(data,'TENSOR_ORDER') % CAA data has TENSOR_ORDER>=1
tensorOrder = data.TENSOR_ORDER; ud = rmfield(ud,'TENSOR_ORDER');
Expand Down
Loading

0 comments on commit 1ea1d71

Please sign in to comment.