variable name fixing

DamonHD · Dec 8, 2023 · 1f8957a · 1f8957a
1 parent e9f20bd
commit 1f8957a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/javasrc/org/hd/d/TRVmodel/hg/HGTRVHPMModel.java b/javasrc/org/hd/d/TRVmodel/hg/HGTRVHPMModel.java
@@ -139,24 +139,24 @@ private HGTRVHPMModel() { }
     public static final double INTERNAL_WALL_AND_DOOR_HEAT_LOSS_PER_A_ROOM_W =
     		INTERNAL_WALL_MINUS_DOOR_HEAT_LOSS_W + INTERNAL_DOOR_HEAT_LOSS_W;
 
-    /**radWAbs: (Heat Loss 2.0) radiator output in each A room when B setback (W). */
+    /**radWAsb: (Heat Loss 2.0) radiator output in each A room when B setback (W). */
     public static final double RADIATOR_POWER_IN_A_ROOMS_WHEN_B_SETBACK_W =
 		RADIATOR_POWER_WITH_HOME_AT_NORMAL_ROOM_TEMPERATURE_W + INTERNAL_WALL_AND_DOOR_HEAT_LOSS_PER_A_ROOM_W;
-    /**radWBbs: (Heat Loss 2.0) radiator output in each B room when B setback (W). */
+    /**radWBsb: (Heat Loss 2.0) radiator output in each B room when B setback (W). */
     public static final double RADIATOR_POWER_IN_B_ROOMS_WHEN_B_SETBACK_W =
 		(HOME_HEAT_LOSS_B_SETBACK_W - 2*RADIATOR_POWER_IN_A_ROOMS_WHEN_B_SETBACK_W) / 2;
     /**radWAmultsb: (Heat Loss 2.1) radiator output increase multiplier in each A room when B setback. */
     public static final double RADIATOR_POWER_UPLIFT_IN_A_ROOMS_WHEN_B_SETBACK_MULTIPLIER =
 		RADIATOR_POWER_IN_A_ROOMS_WHEN_B_SETBACK_W / RADIATOR_POWER_WITH_HOME_AT_NORMAL_ROOM_TEMPERATURE_W;
  	/**MWATP2Dexp: (Heat Loss 2.2) exponent to go from power increase to delta-T increase. */
     public static final double RADIATOR_EXP_POWER_TO_DT = 0.77;
-    /**radAbsdTmult: (Heat Loss 2.3) radiator MW-AT delta-T increase multiplier in each A room when B setback. */
+    /**radAdTmultsb: (Heat Loss 2.3) radiator MW-AT delta-T increase multiplier in each A room when B setback. */
     public static final double RADIATOR_DT_UPLIFT_IN_A_ROOMS_WHEN_B_SETBACK_MULTIPLIER =
 		Math.pow(RADIATOR_POWER_UPLIFT_IN_A_ROOMS_WHEN_B_SETBACK_MULTIPLIER, RADIATOR_EXP_POWER_TO_DT);
-    /**radAbsdT: (Heat Loss 2.4) radiator MW-AT delta-T in each A room when B setback (K). */
+    /**radAdTsb: (Heat Loss 2.4) radiator MW-AT delta-T in each A room when B setback (K). */
     public static final double RADIATOR_DT_IN_A_ROOMS_WHEN_B_SETBACK_K =
 		RADIATOR_MWATDT_AT_NORMAL_ROOM_TEMPERATURE_K * RADIATOR_DT_UPLIFT_IN_A_ROOMS_WHEN_B_SETBACK_MULTIPLIER;
-    /**radAbsMW: (Heat Loss 2.5) radiator mean water temperature in each A room when B setback (C). */
+    /**radAMWsb: (Heat Loss 2.5) radiator mean water temperature in each A room when B setback (C). */
     public static final double RADIATOR_MW_IN_A_ROOMS_WHEN_B_SETBACK_C =
 		NORMAL_ROOM_TEMPERATURE_C + RADIATOR_DT_IN_A_ROOMS_WHEN_B_SETBACK_K;
 

diff --git a/javasrc/org/hd/d/TRVmodel/hg/HGTRVHPMModelParameterised.java b/javasrc/org/hd/d/TRVmodel/hg/HGTRVHPMModelParameterised.java
@@ -187,29 +187,26 @@ public static double sbAMW(final double HHLsb, final double radWnsb, final doubl
         final double radWAsb =
         	//HGTRVHPMModel.RADIATOR_POWER_WITH_HOME_AT_NORMAL_ROOM_TEMPERATURE_W + IDWAabHLW;
     		radWnsb + IWAabHLW;
-        // radWBbs: (Heat Loss 2.0) radiator output in each B room when B setback (W).
+        // radWBsb: (Heat Loss 2.0) radiator output in each B room when B setback (W).
         // (Was: RADIATOR_POWER_IN_B_ROOMS_WHEN_B_SETBACK_W)
-// TODO: why unused: radWBsb
-//        final double radWBsb =
-//    		(HHLsb - 2*radWAsb) / 2;
         // radWAmultsb: (Heat Loss 2.1) radiator output increase multiplier in each A room when B setback.
         // (RADIATOR_POWER_UPLIFT_IN_A_ROOMS_WHEN_B_SETBACK_MULTIPLIER)
         final double radWAmultsb =
     		radWAsb / HGTRVHPMModel.RADIATOR_POWER_WITH_HOME_AT_NORMAL_ROOM_TEMPERATURE_W;
         // radAsbdTmult: (Heat Loss 2.3) radiator MW-AT delta-T increase multiplier in each A room when B setback.
         // (RADIATOR_DT_UPLIFT_IN_A_ROOMS_WHEN_B_SETBACK_MULTIPLIER)
-        final double radAsbdTmult =
+        final double radAdTmultsb =
     		Math.pow(radWAmultsb, HGTRVHPMModel.RADIATOR_EXP_POWER_TO_DT);
         // radAsbdT: (Heat Loss 2.4) radiator MW-AT delta-T in each A room when B setback (K).
         // (RADIATOR_DT_IN_A_ROOMS_WHEN_B_SETBACK_K)
         final double radAsbdT =
-    		HGTRVHPMModel.RADIATOR_MWATDT_AT_NORMAL_ROOM_TEMPERATURE_K * radAsbdTmult;
+    		HGTRVHPMModel.RADIATOR_MWATDT_AT_NORMAL_ROOM_TEMPERATURE_K * radAdTmultsb;
         // radAsbMW: (Heat Loss 2.5) radiator mean water temperature in each A room when B setback (C).
         // (RADIATOR_MW_IN_A_ROOMS_WHEN_B_SETBACK_C)
-        final double radAsbMW =
+        final double radAMWsb =
     		HGTRVHPMModel.NORMAL_ROOM_TEMPERATURE_C + radAsbdT;
-//System.out.println(String.format("radAbsMW = %.1f", radAbsMW));
-		return(radAsbMW);
+//System.out.println(String.format("radAMWsb = %.1f", radAMWsb));
+		return(radAMWsb);
 		}
 
     /**Internal wall heat loss/transfer per A room (HEAT LOSS 1) with A at 'normal' temperature (W).     *