[nonisothermal] move the already existing non-isothermal two-phase
models to the generic setting In order to use a new nonisothermal model, only the includes in the corresponding application files have to be changed from including the dedicated non-isothermal model such as #include <dumux/implicit/2p2cni/2p2cnimodel.hh> to the corresponding isothermal one such as #include <dumux/implicit/2p2c/2p2cmodel.hh> This has been done for the tests in test/implicit/2pni, ...2p2cni and ...co2ni. For enabling the isothermal models to get the new non-isothermal functionality, it was sufficient to modify the files ...properties.hh and ...propertydefaults.hh: - In ...properties.hh, a non-isothermal type tag such as "TwoPTwoCNI" is introduced that inhereits from the corresponding isothermal one AND the type tag "NonIsothermal". In order to not mix it up with the old non-isothermal models, corresponding safety guards were added. - In ...propertydefaults.hh, the properties introduced in niproperties.hh of the isothermal model have to be set. The old non-isothermal models have been deprecated by emitting a warning if the corresponding ...properties.hh file is included. To ensure that they still work, the ...properties.hh file is included on top of every file that corresponds to the old model. Together with the safety guard mentioned above, this guarantees that in fact the old model is chosen if desired. Reviewed by Alex K. git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13290 2fb0f335-1f38-0410-981e-8018bf24f1b0
Showing
- dumux/implicit/2p/2pproperties.hh 9 additions, 0 deletionsdumux/implicit/2p/2pproperties.hh
- dumux/implicit/2p/2ppropertydefaults.hh 46 additions, 1 deletiondumux/implicit/2p/2ppropertydefaults.hh
- dumux/implicit/2p/2pvolumevariables.hh 3 additions, 1 deletiondumux/implicit/2p/2pvolumevariables.hh
- dumux/implicit/2p2c/2p2cproperties.hh 10 additions, 1 deletiondumux/implicit/2p2c/2p2cproperties.hh
- dumux/implicit/2p2c/2p2cpropertydefaults.hh 50 additions, 5 deletionsdumux/implicit/2p2c/2p2cpropertydefaults.hh
- dumux/implicit/2p2cni/2p2cnifluxvariables.hh 1 addition, 1 deletiondumux/implicit/2p2cni/2p2cnifluxvariables.hh
- dumux/implicit/2p2cni/2p2cniindices.hh 1 addition, 0 deletionsdumux/implicit/2p2cni/2p2cniindices.hh
- dumux/implicit/2p2cni/2p2cnimodel.hh 1 addition, 0 deletionsdumux/implicit/2p2cni/2p2cnimodel.hh
- dumux/implicit/2p2cni/2p2cniproperties.hh 2 additions, 0 deletionsdumux/implicit/2p2cni/2p2cniproperties.hh
- dumux/implicit/2p2cni/2p2cnipropertydefaults.hh 1 addition, 0 deletionsdumux/implicit/2p2cni/2p2cnipropertydefaults.hh
- dumux/implicit/2p2cni/2p2cnivolumevariables.hh 1 addition, 0 deletionsdumux/implicit/2p2cni/2p2cnivolumevariables.hh
- dumux/implicit/2pni/2pnifluxvariables.hh 1 addition, 2 deletionsdumux/implicit/2pni/2pnifluxvariables.hh
- dumux/implicit/2pni/2pniindices.hh 1 addition, 0 deletionsdumux/implicit/2pni/2pniindices.hh
- dumux/implicit/2pni/2pnimodel.hh 1 addition, 1 deletiondumux/implicit/2pni/2pnimodel.hh
- dumux/implicit/2pni/2pniproperties.hh 2 additions, 0 deletionsdumux/implicit/2pni/2pniproperties.hh
- dumux/implicit/2pni/2pnivolumevariables.hh 1 addition, 0 deletionsdumux/implicit/2pni/2pnivolumevariables.hh
- dumux/implicit/co2ni/co2nimodel.hh 3 additions, 0 deletionsdumux/implicit/co2ni/co2nimodel.hh
- dumux/implicit/co2ni/co2nivolumevariables.hh 1 addition, 0 deletionsdumux/implicit/co2ni/co2nivolumevariables.hh
- test/implicit/2p2cni/waterairproblem.hh 1 addition, 1 deletiontest/implicit/2p2cni/waterairproblem.hh
- test/implicit/2p2cni/waterairspatialparams.hh 1 addition, 1 deletiontest/implicit/2p2cni/waterairspatialparams.hh
Loading
Please register or sign in to comment