does not compile in this condition ... needs PISMDistributedHydrology.cc to actually have W_en state variable and have the mass-conservation part of update work correctly and make the change E_0/H --> phi
new englacial water thickness diagnostic called 'enwat'
compiles; successfully writes diagnostic enwat in -hydrology lakes; note many FIXMEs in PISMDistributedHydrology::update(), because at this stage the actual model with W_en is still not implemented
Merge branch 'dev' into hydrology-englacial
minor: naming and code for check W,Wen>=0 fixed
added physics associated to phi and englacial connection; nontrivial FIXMEs remain in PISMDistributedHydrology.cc because mass transfer not implemented and because mass accounting not completed; verification results don't match and need examination
found bug ... verification results now just fine
clarifying that W_en=0 where W=0; and minor stuff
reimplemented porosity in this sense: now hydrology_englacial_porosity is the 'true' porosity associated to englacial storage and mass conservation, while the sum hydrology_englacial_porosity+hydrology_regularizing_porosity is the diffusive regularization of the pressure equation; merely runs slowly if hydrology_regularizing_porosity=0
Test P clarified; corresponds to zero englacial storage (thus hydrology_englacial_porosity=0) and 'normal' amount of regularizing_porosity; runs fast enough so we can go to 641x641 grid
updating Test P results in regression; almost no change