Browse Source

HICUM2 no need for return value in temp-update function

pre-master-46
dwarning 5 years ago
committed by Holger Vogt
parent
commit
71b000e1ad
  1. 4
      src/spicelib/devices/hicum2/hicumL2.cpp
  2. 2
      src/spicelib/devices/hicum2/hicumL2.hpp
  3. 6
      src/spicelib/devices/hicum2/hicumL2temp.cpp

4
src/spicelib/devices/hicum2/hicumL2.cpp

@ -411,8 +411,6 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
//end of variables
int _iret;
#ifndef PREDICTOR
double xfact;
#endif
@ -1797,7 +1795,7 @@ HICUMload(GENmodel *inModel, CKTcircuit *ckt)
// Thermal update
if (selfheat) {
Temp = here->HICUMtemp+Vrth;
_iret = hicum_thermal_update(model, here, &Temp, &Tdev_Vrth);
hicum_thermal_update(model, here, &Temp, &Tdev_Vrth);
here->HICUMdtemp_sh = Temp - here->HICUMtemp;
here->HICUMtemp_Vrth = Tdev_Vrth;

2
src/spicelib/devices/hicum2/hicumL2.hpp

@ -12,7 +12,7 @@ extern "C" {
#endif
void hicum_diode(double T, double IS, double UM1, double U, double *Iz, double *Gz, double *Tz);
void hicum_qjmodf(double T, double c_0, double u_d, double z, double a_j, double U_cap, double *C, double *C_dU, double *C_dvt, double *Qz, double *Qz_dU, double *Qz_dvt);
int hicum_thermal_update(HICUMmodel *, HICUMinstance *, double * Temp, double * Tdev_Vrth);
void hicum_thermal_update(HICUMmodel *, HICUMinstance *, double * Temp, double * Tdev_Vrth);
int HICUMload(GENmodel *inModel, CKTcircuit *ckt);
int HICUMtemp(GENmodel *inModel, CKTcircuit *ckt);
#ifdef __cplusplus

6
src/spicelib/devices/hicum2/hicumL2temp.cpp

@ -115,7 +115,6 @@ HICUMtemp(GENmodel *inModel, CKTcircuit *ckt)
/* Pre-compute many useful parameters
*/
{
int iret;
HICUMmodel *model = (HICUMmodel *)inModel;
HICUMinstance *here;
@ -130,14 +129,14 @@ HICUMtemp(GENmodel *inModel, CKTcircuit *ckt)
if(here->HICUMdtempGiven) here->HICUMtemp = here->HICUMtemp + here->HICUMdtemp;
iret = hicum_thermal_update(model, here, &here -> HICUMtemp, &here->HICUMtemp_Vrth);
hicum_thermal_update(model, here, &here -> HICUMtemp, &here->HICUMtemp_Vrth);
}
}
return(OK);
}
int hicum_thermal_update(HICUMmodel *inModel, HICUMinstance *inInstance, double * HICUMTemp, double * Tdev_Vrth)
void hicum_thermal_update(HICUMmodel *inModel, HICUMinstance *inInstance, double * HICUMTemp, double * Tdev_Vrth)
{
HICUMmodel *model = (HICUMmodel *)inModel;
HICUMinstance *here = (HICUMinstance *)inInstance;
@ -517,5 +516,4 @@ int hicum_thermal_update(HICUMmodel *inModel, HICUMinstance *inInstance, double
here->HICUMrth_t.rpart = a.rpart();
here->HICUMrth_t.dpart = a.dpart();
return(0);
}
Loading…
Cancel
Save