Skip to content

Commit

Permalink
#35 and #33: Rebuild swig results
Browse files Browse the repository at this point in the history
  • Loading branch information
@philippkraft
philippkraft committed May 9, 2018
1 parent bd34f7f commit 3ffa0c9
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 32 deletions.
2 changes: 1 addition & 1 deletion cmf/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from .stopwatch import StopWatch


__version__ = '1.3.1a0.i28_numperf_reaches_tracer'
__version__ = '1.3.1a0.i33_doc_struct'

from .cmf_core import connect_cells_with_flux as __ccwf

Expand Down
13 changes: 8 additions & 5 deletions cmf/cmf_core.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13251,17 +13251,20 @@ class ShuttleworthWallace(transpiration_method, soil_evaporation_method, surface
Evaporation from the ground: :math:`\\lambda E_{ground} = \\frac{r_{as} \\Delta\\ R_{n,ground} + c_p\\rho D_0}{\\Delta \\gamma r_{as} + \\gamma r_{ss}}`
In case of a complete surface water covered ground, the surface
resistance :math:`r_{ss}` becomes 0. (GIR)
with :math:`\\Delta = \\frac{de_s}{dT} = 4098\\ 0.6108 \\exp\\left(\\frac{17.27 T}{T+237.3}\\right)(T+237.3)^{-2}`,
the slope of the sat. vap. press. T function
:math:`R_{n,ground} = R_n \\exp(-C_R LAI)`, the net radiation flux in
:math:`R_{n,ground} = R_n \\exp(-C_R LAI)`, the net radiation flux to
the ground
:math:`R_{n_canopy} = R_n - R_{n,ground}`, the net radiation flux in the
:math:`R_{n,canopy} = R_n - R_{n,ground}`, the net radiation flux to the
canopy
:math:`\\lambda,c_p\\rho,\\gamma,C_R` constants lambda, c_p_rho,
gamma, C_R
:math:`\\lambda,c_p\\rho,\\gamma` latent heat of vaporization, heat
capacity of air, psychrometer constant
:math:`D_0` vapor pressure deficit at effective source height, see
function D0
Expand All @@ -13276,9 +13279,9 @@ class ShuttleworthWallace(transpiration_method, soil_evaporation_method, surface
__repr__ = _swig_repr
RAA = _swig_property(_cmf_core.ShuttleworthWallace_RAA_get, _cmf_core.ShuttleworthWallace_RAA_set)
RAC = _swig_property(_cmf_core.ShuttleworthWallace_RAC_get, _cmf_core.ShuttleworthWallace_RAC_set)
RSC = _swig_property(_cmf_core.ShuttleworthWallace_RSC_get, _cmf_core.ShuttleworthWallace_RSC_set)
RAS = _swig_property(_cmf_core.ShuttleworthWallace_RAS_get, _cmf_core.ShuttleworthWallace_RAS_set)
RSS = _swig_property(_cmf_core.ShuttleworthWallace_RSS_get, _cmf_core.ShuttleworthWallace_RSS_set)
RSC = _swig_property(_cmf_core.ShuttleworthWallace_RSC_get, _cmf_core.ShuttleworthWallace_RSC_set)
refresh_counter = _swig_property(_cmf_core.ShuttleworthWallace_refresh_counter_get, _cmf_core.ShuttleworthWallace_refresh_counter_set)

def refresh(self, *args):
Expand Down
52 changes: 26 additions & 26 deletions cmf/cmf_core_src/cmf_wrap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72743,7 +72743,7 @@ SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RAC_get(PyObject *SWIGUNUSEDPARM(
}


SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RAS_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSC_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
cmf::upslope::ET::ShuttleworthWallace *arg1 = (cmf::upslope::ET::ShuttleworthWallace *) 0 ;
double arg2 ;
Expand All @@ -72753,26 +72753,26 @@ SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RAS_set(PyObject *SWIGUNUSEDPARM(
int ecode2 = 0 ;
PyObject *swig_obj[2] ;

if (!SWIG_Python_UnpackTuple(args,"ShuttleworthWallace_RAS_set",2,2,swig_obj)) SWIG_fail;
if (!SWIG_Python_UnpackTuple(args,"ShuttleworthWallace_RSC_set",2,2,swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__upslope__ET__ShuttleworthWallace, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RAS_set" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RSC_set" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
}
arg1 = reinterpret_cast< cmf::upslope::ET::ShuttleworthWallace * >(argp1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShuttleworthWallace_RAS_set" "', argument " "2"" of type '" "double""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShuttleworthWallace_RSC_set" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
if (arg1) (arg1)->RAS = arg2;
if (arg1) (arg1)->RSC = arg2;
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}


SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RAS_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSC_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
cmf::upslope::ET::ShuttleworthWallace *arg1 = (cmf::upslope::ET::ShuttleworthWallace *) 0 ;
void *argp1 = 0 ;
Expand All @@ -72784,18 +72784,18 @@ SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RAS_get(PyObject *SWIGUNUSEDPARM(
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__upslope__ET__ShuttleworthWallace, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RAS_get" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RSC_get" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
}
arg1 = reinterpret_cast< cmf::upslope::ET::ShuttleworthWallace * >(argp1);
result = (double) ((arg1)->RAS);
result = (double) ((arg1)->RSC);
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
return NULL;
}


SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSS_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RAS_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
cmf::upslope::ET::ShuttleworthWallace *arg1 = (cmf::upslope::ET::ShuttleworthWallace *) 0 ;
double arg2 ;
Expand All @@ -72805,26 +72805,26 @@ SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSS_set(PyObject *SWIGUNUSEDPARM(
int ecode2 = 0 ;
PyObject *swig_obj[2] ;

if (!SWIG_Python_UnpackTuple(args,"ShuttleworthWallace_RSS_set",2,2,swig_obj)) SWIG_fail;
if (!SWIG_Python_UnpackTuple(args,"ShuttleworthWallace_RAS_set",2,2,swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__upslope__ET__ShuttleworthWallace, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RSS_set" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RAS_set" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
}
arg1 = reinterpret_cast< cmf::upslope::ET::ShuttleworthWallace * >(argp1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShuttleworthWallace_RSS_set" "', argument " "2"" of type '" "double""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShuttleworthWallace_RAS_set" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
if (arg1) (arg1)->RSS = arg2;
if (arg1) (arg1)->RAS = arg2;
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}


SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSS_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RAS_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
cmf::upslope::ET::ShuttleworthWallace *arg1 = (cmf::upslope::ET::ShuttleworthWallace *) 0 ;
void *argp1 = 0 ;
Expand All @@ -72836,18 +72836,18 @@ SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSS_get(PyObject *SWIGUNUSEDPARM(
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__upslope__ET__ShuttleworthWallace, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RSS_get" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RAS_get" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
}
arg1 = reinterpret_cast< cmf::upslope::ET::ShuttleworthWallace * >(argp1);
result = (double) ((arg1)->RSS);
result = (double) ((arg1)->RAS);
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
return NULL;
}


SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSC_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSS_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
cmf::upslope::ET::ShuttleworthWallace *arg1 = (cmf::upslope::ET::ShuttleworthWallace *) 0 ;
double arg2 ;
Expand All @@ -72857,26 +72857,26 @@ SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSC_set(PyObject *SWIGUNUSEDPARM(
int ecode2 = 0 ;
PyObject *swig_obj[2] ;

if (!SWIG_Python_UnpackTuple(args,"ShuttleworthWallace_RSC_set",2,2,swig_obj)) SWIG_fail;
if (!SWIG_Python_UnpackTuple(args,"ShuttleworthWallace_RSS_set",2,2,swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__upslope__ET__ShuttleworthWallace, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RSC_set" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RSS_set" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
}
arg1 = reinterpret_cast< cmf::upslope::ET::ShuttleworthWallace * >(argp1);
ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShuttleworthWallace_RSC_set" "', argument " "2"" of type '" "double""'");
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShuttleworthWallace_RSS_set" "', argument " "2"" of type '" "double""'");
}
arg2 = static_cast< double >(val2);
if (arg1) (arg1)->RSC = arg2;
if (arg1) (arg1)->RSS = arg2;
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}


SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSC_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSS_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
cmf::upslope::ET::ShuttleworthWallace *arg1 = (cmf::upslope::ET::ShuttleworthWallace *) 0 ;
void *argp1 = 0 ;
Expand All @@ -72888,10 +72888,10 @@ SWIGINTERN PyObject *_wrap_ShuttleworthWallace_RSC_get(PyObject *SWIGUNUSEDPARM(
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_cmf__upslope__ET__ShuttleworthWallace, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RSC_get" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShuttleworthWallace_RSS_get" "', argument " "1"" of type '" "cmf::upslope::ET::ShuttleworthWallace *""'");
}
arg1 = reinterpret_cast< cmf::upslope::ET::ShuttleworthWallace * >(argp1);
result = (double) ((arg1)->RSC);
result = (double) ((arg1)->RSS);
resultobj = SWIG_From_double(static_cast< double >(result));
return resultobj;
fail:
Expand Down Expand Up @@ -81612,12 +81612,12 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ShuttleworthWallace_RAA_get", (PyCFunction)_wrap_ShuttleworthWallace_RAA_get, METH_O, (char *)"ShuttleworthWallace_RAA_get(ShuttleworthWallace self) -> double"},
{ (char *)"ShuttleworthWallace_RAC_set", _wrap_ShuttleworthWallace_RAC_set, METH_VARARGS, (char *)"ShuttleworthWallace_RAC_set(ShuttleworthWallace self, double RAC)"},
{ (char *)"ShuttleworthWallace_RAC_get", (PyCFunction)_wrap_ShuttleworthWallace_RAC_get, METH_O, (char *)"ShuttleworthWallace_RAC_get(ShuttleworthWallace self) -> double"},
{ (char *)"ShuttleworthWallace_RSC_set", _wrap_ShuttleworthWallace_RSC_set, METH_VARARGS, (char *)"ShuttleworthWallace_RSC_set(ShuttleworthWallace self, double RSC)"},
{ (char *)"ShuttleworthWallace_RSC_get", (PyCFunction)_wrap_ShuttleworthWallace_RSC_get, METH_O, (char *)"ShuttleworthWallace_RSC_get(ShuttleworthWallace self) -> double"},
{ (char *)"ShuttleworthWallace_RAS_set", _wrap_ShuttleworthWallace_RAS_set, METH_VARARGS, (char *)"ShuttleworthWallace_RAS_set(ShuttleworthWallace self, double RAS)"},
{ (char *)"ShuttleworthWallace_RAS_get", (PyCFunction)_wrap_ShuttleworthWallace_RAS_get, METH_O, (char *)"ShuttleworthWallace_RAS_get(ShuttleworthWallace self) -> double"},
{ (char *)"ShuttleworthWallace_RSS_set", _wrap_ShuttleworthWallace_RSS_set, METH_VARARGS, (char *)"ShuttleworthWallace_RSS_set(ShuttleworthWallace self, double RSS)"},
{ (char *)"ShuttleworthWallace_RSS_get", (PyCFunction)_wrap_ShuttleworthWallace_RSS_get, METH_O, (char *)"ShuttleworthWallace_RSS_get(ShuttleworthWallace self) -> double"},
{ (char *)"ShuttleworthWallace_RSC_set", _wrap_ShuttleworthWallace_RSC_set, METH_VARARGS, (char *)"ShuttleworthWallace_RSC_set(ShuttleworthWallace self, double RSC)"},
{ (char *)"ShuttleworthWallace_RSC_get", (PyCFunction)_wrap_ShuttleworthWallace_RSC_get, METH_O, (char *)"ShuttleworthWallace_RSC_get(ShuttleworthWallace self) -> double"},
{ (char *)"ShuttleworthWallace_refresh_counter_set", _wrap_ShuttleworthWallace_refresh_counter_set, METH_VARARGS, (char *)"ShuttleworthWallace_refresh_counter_set(ShuttleworthWallace self, int refresh_counter)"},
{ (char *)"ShuttleworthWallace_refresh_counter_get", (PyCFunction)_wrap_ShuttleworthWallace_refresh_counter_get, METH_O, (char *)"ShuttleworthWallace_refresh_counter_get(ShuttleworthWallace self) -> int"},
{ (char *)"ShuttleworthWallace_refresh", _wrap_ShuttleworthWallace_refresh, METH_VARARGS, (char *)"\n"
Expand Down

0 comments on commit 3ffa0c9

Please sign in to comment.