Skip to content

Commit

Permalink
Preening during review.
Browse files Browse the repository at this point in the history
  • Loading branch information
DamonHD committed Dec 15, 2023
1 parent 6e6daf6 commit 7732da8
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions javasrc/org/hd/d/TRVmodel/hg/HGTRVHPMModelParameterised.java
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ private static double ifHeatLossPerA2Storey(final ModelParameters params, final
return(IFAabHLW);
}

/**Compute radiator mean water temperature in each A room when B is NOT set back (C).
/**Compute radiator mean water temperature in each A room when B is NOT set back (C) for 'stiff' regulation.
* Extension to heat loss 2 to allow for varying external temperatures.
* <p>
* This is in fact the MW temperature for all room radiators when there are no setbacks.
Expand Down Expand Up @@ -366,7 +366,7 @@ public static double nsbAMW(final double radWnsb)
// radAnsbMW: radiator mean water temperature in each A room when B NOT setback (C).
final double radAnsbMW =
HGTRVHPMModel.NORMAL_ROOM_TEMPERATURE_C + radAnsbdT;
//System.out.println(String.format("radAnbsMW = %.1f", radAnbsMW));
//System.out.println(String.format("radAnsbMW = %.1f", radAnsbMW));
return(radAnsbMW);
}

Expand Down Expand Up @@ -407,15 +407,15 @@ public static DemandWithoutAndWithSetback computeBungalowDemandW(final ModelPara
// radAMWsb: (Heat Loss 2.5) radiator mean water temperature in each A room when B setback (C).
final double radAMWsb = sbAMW(HHLsb, radWnsb, IDWAabHLW);
// Extension to heat loss 2 to allow for varying external temperatures.
final double radMWnsb = nsbAMW(radWnsb);
final double radAMWnsb = nsbAMW(radWnsb);


final double CoPCorrectionK = params.correctCoPForFlowVsMW ? flowMWDelta_K : 0;

// HPinWnsb: (Heat Pump Efficiency) heat-pump electrical power in when B not setback (W).
// (HEAT_PUMP_POWER_IN_NO_SETBACK_W)
// Note that flow and mean temperatures seem to be being mixed here in the HG page.
final double CoPnsb = computeFlowCoP(radMWnsb + CoPCorrectionK);
final double CoPnsb = computeFlowCoP(radAMWnsb + CoPCorrectionK);
//System.out.println(String.format("CoPnsb = %f", CoPnsb));
final double HPinWnsb =
HHLnsb / CoPnsb;
Expand Down

0 comments on commit 7732da8

Please sign in to comment.