Added the capability for cesModel2 to use the same algorithms when energyType=NA. This will eliminate the need for the cesModelWithoutEnergy function. Next step is to delete cesModelWithoutEnergy and convert all places that are using cesModelWithoutEnergy to now use cesModel2.