add fv (or v) to output file names

Author: martin-boettcher

calvalus-processing/src/main/java/com/bc/calvalus/processing/fire/format/grid/s2/S2GridMapper.java

@@ -40,7 +40,7 @@ public class S2GridMapper extends AbstractGridMapper {
 
     private static final int GRID_CELLS_PER_DEGREE = 4;
     private static final int NUM_GRID_CELLS = 1;
-    // 20190101-ESACCI-L3S_FIRE-BA-MSI-AREA_h39v19-0.1-CL.tif
+    // 20190101-ESACCI-L3S_FIRE-BA-MSI-AREA_h39v19-fv0.1-CL.tif
     private static final Pattern CL_FILENAME_PATTERN = Pattern.compile("........-ESACCI-L3S_FIRE-BA-MSI-AREA_h(..)v(..)-.*-CL.tif");
     private String oneDegTile;
     protected int numRowsGlobal;

calvalus-processing/src/main/java/com/bc/calvalus/processing/fire/format/grid/s2/S2GridReducer.java

@@ -36,7 +36,7 @@ protected void reduce(Text key, Iterable<GridCells> values, Context context) thr
 
     @Override
     protected String getFilename(String year, String month, String version) {
-        return String.format("%s%s%s-ESACCI-L4_FIRE-BA-MSI-f%s.nc", year, month, "01", version);
+        return String.format("%s%s%s-ESACCI-L4_FIRE-BA-MSI-fv%s.nc", year, month, "01", version);
     }
 
     @Override

calvalus-processing/src/main/java/com/bc/calvalus/processing/fire/format/pixel/s2/S2PixelFinaliseMapper.java

@@ -51,7 +51,7 @@ protected Band getLcBand(Product lcProduct) {
 
     @Override
     public String createBaseFilename(String year, String month, String version, String areaString) {
-        return String.format("%s%s01-ESACCI-L3S_FIRE-BA-MSI-AREA_%s-%s", year, month, areaString.split(";")[1], version);
+        return String.format("%s%s01-ESACCI-L3S_FIRE-BA-MSI-AREA_%s-fv%s", year, month, areaString.split(";")[1], version);
     }
 
 }