Added funtions for upscaling net porosity and NTG in UpscalerBase
Added upscaling of NTG and net porosoty in cpchop
Added forgotten if on NTG output