Set FIR=DR in examples that specify DR, per NREL#301

softwareengineerprogrammer · softwareengineerprogrammer · commit c46d6dfa6875 · 2024-10-15T15:22:13.000-07:00
diff --git a/tests/examples/example10_HP.out b/tests/examples/example10_HP.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.0
+ GEOPHIRES Version: 3.6.2
  Simulation Date: 2024-10-15
- Simulation Time:  13:08
- Calculation Time:      0.104 sec
+ Simulation Time:  15:20
+ Calculation Time:      0.100 sec
 
                            ***SUMMARY OF RESULTS***
 
@@ -29,9 +29,9 @@ Simulation Metadata
       Accrued financing during construction:                  5.00
       Project lifetime:                                      30 yr
       Capacity factor:                                       90.0 %
-      Project NPV:                                           3.32 MUSD
+      Project NPV:                                          11.28 MUSD
       Project IRR:                                           8.07 %
-      Project VIR=PI=PIR:                                    1.11
+      Project VIR=PI=PIR:                                    1.36
       Project MOIC:                                          1.01
       Project Payback Period:                               11.96 yr
 
diff --git a/tests/examples/example10_HP.txt b/tests/examples/example10_HP.txt
@@ -51,6 +51,7 @@ Heat Pump COP, 2.8,            --- [-]
 Plant Lifetime,30,						---[years]
 Economic Model,2,						---BICYCLE Levelized Cost Model
 Discount Rate, 0.05,			--- [-] Required if Standard LCOE/LCOH model is selected. See manual for details.
+Fixed Internal Rate, 5, -- matches Discount Rate
 Inflation Rate During Construction,0.05,				---[-]
 
 # ***Capital and O&M Cost Parameters***
diff --git a/tests/examples/example11_AC.out b/tests/examples/example11_AC.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.0
+ GEOPHIRES Version: 3.6.2
  Simulation Date: 2024-10-15
- Simulation Time:  13:07
- Calculation Time:      0.104 sec
+ Simulation Time:  15:20
+ Calculation Time:      0.099 sec
 
                            ***SUMMARY OF RESULTS***
 
@@ -30,9 +30,9 @@ Simulation Metadata
       Accrued financing during construction:                  5.00
       Project lifetime:                                      30 yr
       Capacity factor:                                       90.0 %
-      Project NPV:                                          -0.53 MUSD
+      Project NPV:                                           6.22 MUSD
       Project IRR:                                           6.82 %
-      Project VIR=PI=PIR:                                    0.98
+      Project VIR=PI=PIR:                                    1.21
       Project MOIC:                                          0.83
       Project Payback Period:                               13.36 yr
 
diff --git a/tests/examples/example11_AC.txt b/tests/examples/example11_AC.txt
@@ -46,6 +46,7 @@ Absorption Chiller COP, 0.72,            --- [-]
 Plant Lifetime,30,						---[years]
 Economic Model,2,						---BICYCLE Levelized Cost Model
 Discount Rate, 0.05,			--- [-] Required if Standard LCOE/LCOH model is selected. See manual for details.
+Fixed Internal Rate, 5, -- matches Discount Rate
 Inflation Rate During Construction,0.05,				---[-]
 
 # ***Capital and O&M Cost Parameters***
diff --git a/tests/examples/example13.out b/tests/examples/example13.out
@@ -4,9 +4,9 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.0
+ GEOPHIRES Version: 3.6.2
  Simulation Date: 2024-10-15
- Simulation Time:  13:07
+ Simulation Time:  15:20
  Calculation Time:      0.035 sec
 
                            ***SUMMARY OF RESULTS***
@@ -30,9 +30,9 @@ Simulation Metadata
       Accrued financing during construction:                  0.00
       Project lifetime:                                      30 yr
       Capacity factor:                                       80.0 %
-      Project NPV:                                         -45.14 MUSD
+      Project NPV:                                         -43.00 MUSD
       Project IRR:                                          -5.99 %
-      Project VIR=PI=PIR:                                    0.20
+      Project VIR=PI=PIR:                                    0.24
       Project MOIC:                                         -0.22
       Project Payback Period:                          N/A
       CHP: Percent cost allocation for electrical plant:      60.28 %
diff --git a/tests/examples/example13.txt b/tests/examples/example13.txt
@@ -53,6 +53,7 @@ District Heating Road Length,3, 				---[km] supersedes model option 2 if any val
 Plant Lifetime,30,						--- [years]
 Economic Model,2,						--- Should be 1 (FCR model), 2 (Standard LCOE/LCOH model), or 3 (Bicycle model).
 Discount Rate,0.05,
+Fixed Internal Rate,5, -- matches Discount Rate
 Inflation Rate During Construction,0,				--- [-]
 Well Drilling and Completion Capital Cost Adjustment Factor,1,	--- [-] Use built-in well cost correlation as is
 Well Drilling Cost Correlation,1,				--- [-] Use built-in well drilling cost correlation #1
diff --git a/tests/examples/example2.out b/tests/examples/example2.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.0
+ GEOPHIRES Version: 3.6.2
  Simulation Date: 2024-10-15
- Simulation Time:  13:07
- Calculation Time:      0.208 sec
+ Simulation Time:  15:20
+ Calculation Time:      0.209 sec
 
                            ***SUMMARY OF RESULTS***
 
@@ -28,9 +28,9 @@ Simulation Metadata
       Accrued financing during construction:                  0.00
       Project lifetime:                                      25 yr
       Capacity factor:                                       90.0 %
-      Project NPV:                                          -3.54 MUSD
+      Project NPV:                                           3.83 MUSD
       Project IRR:                                           5.97 %
-      Project VIR=PI=PIR:                                    0.91
+      Project VIR=PI=PIR:                                    1.09
       Project MOIC:                                          0.52
       Project Payback Period:                               13.21 yr
 
diff --git a/tests/examples/example2.txt b/tests/examples/example2.txt
@@ -43,6 +43,7 @@ Surface Temperature,15,						---[deg.C]
 Plant Lifetime,25,						---[years]
 Economic Model,2,						---Standard Levelized Cost Model
 Discount Rate,.05,						---[-]
+Fixed Internal Rate,5,                  -- matches Discount Rate
 Inflation Rate During Construction,0,				---[-]
 
 # ***Capital and O&M Cost Parameters***
diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.0
+ GEOPHIRES Version: 3.6.2
  Simulation Date: 2024-10-15
- Simulation Time:  13:08
- Calculation Time:      0.528 sec
+ Simulation Time:  15:20
+ Calculation Time:      0.530 sec
 
                            ***SUMMARY OF RESULTS***
 
@@ -29,9 +29,9 @@ Simulation Metadata
       Accrued financing during construction:                  0.00
       Project lifetime:                                      20 yr
       Capacity factor:                                       95.0 %
-      Project NPV:                                         334.92 MUSD
+      Project NPV:                                         402.91 MUSD
       Project IRR:                                          15.06 %
-      Project VIR=PI=PIR:                                    1.80
+      Project VIR=PI=PIR:                                    1.97
       Project MOIC:                                          2.00
       Project Payback Period:                                7.61 yr
       Estimated Jobs Created:                                 221
diff --git a/tests/examples/example_SHR-2.txt b/tests/examples/example_SHR-2.txt
@@ -47,6 +47,7 @@ Tax Relief Per Year, 2.212
 Do Carbon Price Calculations, True
 Time steps per year, 6
 Discount Rate, 0.06
+Fixed Internal Rate, 6, -- matches Discount Rate
 Reservoir Stimulation Capital Cost, 18
 Well Drilling and Completion Capital Cost Adjustment Factor, 2
 Injection Well Drilling and Completion Capital Cost Adjustment Factor, 2
