Merge branch 'master' of gitlab.jyu.fi:clblatte/simo_output

structure_SIMO_rslDB_FBE_function.R

@@ -120,7 +120,7 @@ create_table_UNIT <- 'Create Table UNIT AS SELECT u.*,
                       (CASE WHEN u.Main_sp is 4 THEN 1 ELSE 0 END) as Bpub_DOM,
                       (CASE WHEN u.Main_sp is 6 THEN 1 ELSE 0 END) as Alnus_DOM,
                       o.SCAR,o.PLANTING,o.SEEDING,
-                      u.BM_total*0.5 + u.Carbon_soil+u.CARBON_STORAGE_Ojanen+u.PEAT*300000 as CARBON_STORAGE_Update,
+                      u.BM_total*0.5 + u.Carbon_soil+ifnull(u.CARBON_STORAGE_Ojanen,0)+u.PEAT*300000 as CARBON_STORAGE_Update,
                       
                       FROM comp_unit u, data_link l
                       left outer join branch_desc b on l.branch = b.branch and l.id = b.id 

structure_SIMO_rslDB_SA_function.R

@@ -69,7 +69,7 @@ create_table_UNIT <-    'Create Table UNIT AS SELECT u.*,
                         0 as income_biomass, 
                         0 as Biomass, 
                         0 as THIN,
-                        u.BM_total*0.5 + u.Carbon_soil+u.CARBON_STORAGE_Ojanen+u.PEAT*300000 as CARBON_STORAGE_UPDATE,
+                        u.BM_total*0.5 + u.Carbon_soil+ifnull(u.CARBON_STORAGE_Ojanen,0)+u.PEAT*300000 as CARBON_STORAGE_UPDATE,
                         FROM comp_unit u, data_link l
                         left outer join branch_desc b on l.branch = b.branch and l.id = b.id 
                         cross join max_v m on l.id = m.id