Skip to content

Commit 6bdffbc

Browse files
amirrothamirroth
committed
Fix plugin issue, collapse StoreType/SOVStoreType and TimeStepType/SOVTimeStepType
1 parent e469481 commit 6bdffbc

File tree

171 files changed

+10189
-10247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+10189
-10247
lines changed

‎src/EnergyPlus/AirflowNetwork/src/Solver.cpp

Lines changed: 232 additions & 232 deletions
Large diffs are not rendered by default.

‎src/EnergyPlus/BaseboardElectric.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -348,38 +348,38 @@ namespace BaseboardElectric {
348348
"Baseboard Total Heating Energy",
349349
Constant::Units::J,
350350
thisBaseboard.Energy,
351-
OutputProcessor::SOVTimeStepType::System,
352-
OutputProcessor::SOVStoreType::Summed,
351+
OutputProcessor::TimeStepType::System,
352+
OutputProcessor::StoreType::Sum,
353353
thisBaseboard.EquipName,
354354
Constant::eResource::EnergyTransfer,
355-
OutputProcessor::SOVGroup::HVAC,
356-
OutputProcessor::SOVEndUseCat::Baseboard);
355+
OutputProcessor::Group::HVAC,
356+
OutputProcessor::EndUseCat::Baseboard);
357357

358358
SetupOutputVariable(state,
359359
"Baseboard Total Heating Rate",
360360
Constant::Units::W,
361361
thisBaseboard.Power,
362-
OutputProcessor::SOVTimeStepType::System,
363-
OutputProcessor::SOVStoreType::Average,
362+
OutputProcessor::TimeStepType::System,
363+
OutputProcessor::StoreType::Average,
364364
thisBaseboard.EquipName);
365365

366366
SetupOutputVariable(state,
367367
"Baseboard Electricity Energy",
368368
Constant::Units::J,
369369
thisBaseboard.ElecUseLoad,
370-
OutputProcessor::SOVTimeStepType::System,
371-
OutputProcessor::SOVStoreType::Summed,
370+
OutputProcessor::TimeStepType::System,
371+
OutputProcessor::StoreType::Sum,
372372
thisBaseboard.EquipName,
373373
Constant::eResource::Electricity,
374-
OutputProcessor::SOVGroup::HVAC,
375-
OutputProcessor::SOVEndUseCat::Heating);
374+
OutputProcessor::Group::HVAC,
375+
OutputProcessor::EndUseCat::Heating);
376376

377377
SetupOutputVariable(state,
378378
"Baseboard Electricity Rate",
379379
Constant::Units::W,
380380
thisBaseboard.ElecUseRate,
381-
OutputProcessor::SOVTimeStepType::System,
382-
OutputProcessor::SOVStoreType::Average,
381+
OutputProcessor::TimeStepType::System,
382+
OutputProcessor::StoreType::Average,
383383
thisBaseboard.EquipName);
384384
}
385385
}

‎src/EnergyPlus/BaseboardRadiator.cc

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -434,78 +434,78 @@ namespace BaseboardRadiator {
434434
"Baseboard Total Heating Energy",
435435
Constant::Units::J,
436436
thisBaseboard.Energy,
437-
OutputProcessor::SOVTimeStepType::System,
438-
OutputProcessor::SOVStoreType::Summed,
437+
OutputProcessor::TimeStepType::System,
438+
OutputProcessor::StoreType::Sum,
439439
thisBaseboard.EquipID,
440440
Constant::eResource::EnergyTransfer,
441-
OutputProcessor::SOVGroup::HVAC,
442-
OutputProcessor::SOVEndUseCat::Baseboard);
441+
OutputProcessor::Group::HVAC,
442+
OutputProcessor::EndUseCat::Baseboard);
443443

444444
SetupOutputVariable(state,
445445
"Baseboard Hot Water Energy",
446446
Constant::Units::J,
447447
thisBaseboard.Energy,
448-
OutputProcessor::SOVTimeStepType::System,
449-
OutputProcessor::SOVStoreType::Summed,
448+
OutputProcessor::TimeStepType::System,
449+
OutputProcessor::StoreType::Sum,
450450
thisBaseboard.EquipID,
451451
Constant::eResource::PlantLoopHeatingDemand,
452-
OutputProcessor::SOVGroup::HVAC,
453-
OutputProcessor::SOVEndUseCat::Baseboard);
452+
OutputProcessor::Group::HVAC,
453+
OutputProcessor::EndUseCat::Baseboard);
454454

455455
SetupOutputVariable(state,
456456
"Baseboard Total Heating Rate",
457457
Constant::Units::W,
458458
thisBaseboard.Power,
459-
OutputProcessor::SOVTimeStepType::System,
460-
OutputProcessor::SOVStoreType::Average,
459+
OutputProcessor::TimeStepType::System,
460+
OutputProcessor::StoreType::Average,
461461
thisBaseboard.EquipID);
462462

463463
SetupOutputVariable(state,
464464
"Baseboard Hot Water Mass Flow Rate",
465465
Constant::Units::kg_s,
466466
thisBaseboard.WaterMassFlowRate,
467-
OutputProcessor::SOVTimeStepType::System,
468-
OutputProcessor::SOVStoreType::Average,
467+
OutputProcessor::TimeStepType::System,
468+
OutputProcessor::StoreType::Average,
469469
thisBaseboard.EquipID);
470470

471471
SetupOutputVariable(state,
472472
"Baseboard Air Mass Flow Rate",
473473
Constant::Units::kg_s,
474474
thisBaseboard.AirMassFlowRate,
475-
OutputProcessor::SOVTimeStepType::System,
476-
OutputProcessor::SOVStoreType::Average,
475+
OutputProcessor::TimeStepType::System,
476+
OutputProcessor::StoreType::Average,
477477
thisBaseboard.EquipID);
478478

479479
SetupOutputVariable(state,
480480
"Baseboard Air Inlet Temperature",
481481
Constant::Units::C,
482482
thisBaseboard.AirInletTemp,
483-
OutputProcessor::SOVTimeStepType::System,
484-
OutputProcessor::SOVStoreType::Average,
483+
OutputProcessor::TimeStepType::System,
484+
OutputProcessor::StoreType::Average,
485485
thisBaseboard.EquipID);
486486

487487
SetupOutputVariable(state,
488488
"Baseboard Air Outlet Temperature",
489489
Constant::Units::C,
490490
thisBaseboard.AirOutletTemp,
491-
OutputProcessor::SOVTimeStepType::System,
492-
OutputProcessor::SOVStoreType::Average,
491+
OutputProcessor::TimeStepType::System,
492+
OutputProcessor::StoreType::Average,
493493
thisBaseboard.EquipID);
494494

495495
SetupOutputVariable(state,
496496
"Baseboard Water Inlet Temperature",
497497
Constant::Units::C,
498498
thisBaseboard.WaterInletTemp,
499-
OutputProcessor::SOVTimeStepType::System,
500-
OutputProcessor::SOVStoreType::Average,
499+
OutputProcessor::TimeStepType::System,
500+
OutputProcessor::StoreType::Average,
501501
thisBaseboard.EquipID);
502502

503503
SetupOutputVariable(state,
504504
"Baseboard Water Outlet Temperature",
505505
Constant::Units::C,
506506
thisBaseboard.WaterOutletTemp,
507-
OutputProcessor::SOVTimeStepType::System,
508-
OutputProcessor::SOVStoreType::Average,
507+
OutputProcessor::TimeStepType::System,
508+
OutputProcessor::StoreType::Average,
509509
thisBaseboard.EquipID);
510510
}
511511
}

‎src/EnergyPlus/BoilerSteam.cc

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -412,65 +412,65 @@ namespace BoilerSteam {
412412
"Boiler Heating Rate",
413413
Constant::Units::W,
414414
this->BoilerLoad,
415-
OutputProcessor::SOVTimeStepType::System,
416-
OutputProcessor::SOVStoreType::Average,
415+
OutputProcessor::TimeStepType::System,
416+
OutputProcessor::StoreType::Average,
417417
this->Name);
418418

419419
SetupOutputVariable(state,
420420
"Boiler Heating Energy",
421421
Constant::Units::J,
422422
this->BoilerEnergy,
423-
OutputProcessor::SOVTimeStepType::System,
424-
OutputProcessor::SOVStoreType::Summed,
423+
OutputProcessor::TimeStepType::System,
424+
OutputProcessor::StoreType::Sum,
425425
this->Name,
426426
Constant::eResource::EnergyTransfer,
427-
OutputProcessor::SOVGroup::Plant,
428-
OutputProcessor::SOVEndUseCat::Boilers);
427+
OutputProcessor::Group::Plant,
428+
OutputProcessor::EndUseCat::Boilers);
429429
SetupOutputVariable(state,
430430
format("Boiler {} Rate", sFuelType),
431431
Constant::Units::W,
432432
this->FuelUsed,
433-
OutputProcessor::SOVTimeStepType::System,
434-
OutputProcessor::SOVStoreType::Average,
433+
OutputProcessor::TimeStepType::System,
434+
OutputProcessor::StoreType::Average,
435435
this->Name);
436436
SetupOutputVariable(state,
437437
format("Boiler {} Energy", sFuelType),
438438
Constant::Units::J,
439439
this->FuelConsumed,
440-
OutputProcessor::SOVTimeStepType::System,
441-
OutputProcessor::SOVStoreType::Summed,
440+
OutputProcessor::TimeStepType::System,
441+
OutputProcessor::StoreType::Sum,
442442
this->Name,
443443
Constant::eFuel2eResource[(int)this->FuelType],
444-
OutputProcessor::SOVGroup::Plant,
445-
OutputProcessor::SOVEndUseCat::Heating,
444+
OutputProcessor::Group::Plant,
445+
OutputProcessor::EndUseCat::Heating,
446446
this->EndUseSubcategory);
447447
SetupOutputVariable(state,
448448
"Boiler Steam Efficiency",
449449
Constant::Units::None,
450450
this->BoilerEff,
451-
OutputProcessor::SOVTimeStepType::System,
452-
OutputProcessor::SOVStoreType::Average,
451+
OutputProcessor::TimeStepType::System,
452+
OutputProcessor::StoreType::Average,
453453
this->Name);
454454
SetupOutputVariable(state,
455455
"Boiler Steam Inlet Temperature",
456456
Constant::Units::C,
457457
this->BoilerInletTemp,
458-
OutputProcessor::SOVTimeStepType::System,
459-
OutputProcessor::SOVStoreType::Average,
458+
OutputProcessor::TimeStepType::System,
459+
OutputProcessor::StoreType::Average,
460460
this->Name);
461461
SetupOutputVariable(state,
462462
"Boiler Steam Outlet Temperature",
463463
Constant::Units::C,
464464
this->BoilerOutletTemp,
465-
OutputProcessor::SOVTimeStepType::System,
466-
OutputProcessor::SOVStoreType::Average,
465+
OutputProcessor::TimeStepType::System,
466+
OutputProcessor::StoreType::Average,
467467
this->Name);
468468
SetupOutputVariable(state,
469469
"Boiler Steam Mass Flow Rate",
470470
Constant::Units::kg_s,
471471
this->BoilerMassFlowRate,
472-
OutputProcessor::SOVTimeStepType::System,
473-
OutputProcessor::SOVStoreType::Average,
472+
OutputProcessor::TimeStepType::System,
473+
OutputProcessor::StoreType::Average,
474474
this->Name);
475475
}
476476

0 commit comments

Comments
 (0)