File tree Expand file tree Collapse file tree 3 files changed +38
-2
lines changed Expand file tree Collapse file tree 3 files changed +38
-2
lines changed Original file line number Diff line number Diff line change @@ -927,7 +927,7 @@ def SS_solver(
927
927
+ " budget"
928
928
)
929
929
930
- if ENFORCE_SOLUTION_CHECKS and (max (np .absolute (RC )) > p .mindist_SS ):
930
+ if ENFORCE_SOLUTION_CHECKS and (max (np .absolute (RC )) > p .RC_SS ):
931
931
print ("Resource Constraint Difference:" , RC )
932
932
err = "Steady state aggregate resource constraint not satisfied"
933
933
raise RuntimeError (err )
Original file line number Diff line number Diff line change @@ -1326,7 +1326,7 @@ def run_TPI(p, client=None):
1326
1326
)
1327
1327
1328
1328
if (
1329
- np .any (np .absolute (RC_error ) >= p .mindist_TPI * 10 )
1329
+ np .any (np .absolute (RC_error ) >= p .RC_TPI )
1330
1330
) and ENFORCE_SOLUTION_CHECKS :
1331
1331
raise RuntimeError (
1332
1332
"Transition path equlibrium not found " + "(RC_error)"
Original file line number Diff line number Diff line change 3340
3340
}
3341
3341
}
3342
3342
},
3343
+ "RC_SS": {
3344
+ "title": "Tolerance for the resource constraint in the steady state solution",
3345
+ "description": "Tolerance for the resource constraint in the steady state solution.",
3346
+ "section_1": "Model Solution Parameters",
3347
+ "notes": "",
3348
+ "type": "float",
3349
+ "value": [
3350
+ {
3351
+ "value": 1e-09
3352
+ }
3353
+ ],
3354
+ "validators": {
3355
+ "range": {
3356
+ "min": 1e-13,
3357
+ "max": 0.001
3358
+ }
3359
+ }
3360
+ },
3361
+ "RC_TPI": {
3362
+ "title": "Tolerance for the resource constraint in the time path solution",
3363
+ "description": "Tolerance for the resource constraint in the time path solution.",
3364
+ "section_1": "Model Solution Parameters",
3365
+ "notes": "",
3366
+ "type": "float",
3367
+ "value": [
3368
+ {
3369
+ "value": 1e-05
3370
+ }
3371
+ ],
3372
+ "validators": {
3373
+ "range": {
3374
+ "min": 1e-13,
3375
+ "max": 0.01
3376
+ }
3377
+ }
3378
+ },
3343
3379
"reform_use_baseline_solution":{
3344
3380
"title": "Whether or not the baseline SS solution is used for starting values when solving the reform",
3345
3381
"description": "Whether or not the baseline SS solution is used for starting values when solving the reform.",
You can’t perform that action at this time.
0 commit comments