Skip to content

[Dynamic Simulation] Mix set/get provider with other parameters #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thangqp merged 1 commit into from
Feb 27, 2026
Merged

[Dynamic Simulation] Mix set/get provider with other parameters #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...va/org/gridsuite/study/server/dto/dynamicsimulation/DynamicSimulationParametersInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.experimental.Accessors;
import org.gridsuite.study.server.dto.dynamicsimulation.curve.CurveInfos;
import org.gridsuite.study.server.dto.dynamicsimulation.event.EventInfos;
import org.gridsuite.study.server.dto.dynamicsimulation.network.NetworkInfos;
Expand All @@ -27,8 +28,10 @@
@AllArgsConstructor
@Getter
@Setter
@Accessors(chain = true)
@JsonIgnoreProperties(ignoreUnknown = true)
public class DynamicSimulationParametersInfos {
private String provider;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private Double startTime;
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down
15 changes: 11 additions & 4 deletions src/main/java/org/gridsuite/study/server/service/StudyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,9 @@ private StudyEntity duplicateStudyEntity(StudyEntity sourceStudyEntity, UUID new
copiedWorkspacesConfigUuid = studyConfigService.duplicateWorkspacesConfig(sourceStudyEntity.getWorkspacesConfigUuid());
}

DynamicSimulationParametersInfos dynamicSimulationParameters = sourceStudyEntity.getDynamicSimulationParameters() != null ? DynamicSimulationService.fromEntity(sourceStudyEntity.getDynamicSimulationParameters(), objectMapper) : DynamicSimulationService.getDefaultDynamicSimulationParameters();
DynamicSimulationParametersInfos dynamicSimulationParameters = sourceStudyEntity.getDynamicSimulationParameters() != null ?
DynamicSimulationService.fromEntity(sourceStudyEntity.getDynamicSimulationParameters(), objectMapper).setProvider(sourceStudyEntity.getDynamicSimulationProvider()) :
DynamicSimulationService.getDefaultDynamicSimulationParameters().setProvider(defaultDynamicSimulationProvider);

UUID copiedStateEstimationParametersUuid = null;
if (sourceStudyEntity.getStateEstimationParametersUuid() != null) {
Expand Down Expand Up @@ -1615,10 +1617,11 @@ private void removeLoadFlowParameters(@Nullable UUID lfParametersUuid) {
}
}

public void updateDynamicSimulationParameters(UUID studyUuid, DynamicSimulationParametersEntity dynamicSimulationParametersEntity) {
public void updateDynamicSimulationParameters(UUID studyUuid, DynamicSimulationParametersEntity dynamicSimulationParametersEntity, String provider) {
Optional<StudyEntity> studyEntity = studyRepository.findById(studyUuid);
studyEntity.ifPresent(studyEntity1 -> {
studyEntity1.setDynamicSimulationParameters(dynamicSimulationParametersEntity);
studyEntity1.setDynamicSimulationProvider(provider);
invalidateDynamicSimulationStatusOnAllNodes(studyUuid);
notificationService.emitStudyChanged(studyUuid, null, null, NotificationService.UPDATE_TYPE_DYNAMIC_SIMULATION_STATUS);
});
Expand Down Expand Up @@ -2880,7 +2883,9 @@ public List<ModelInfos> getDynamicSimulationModels(UUID studyUuid) {

@Transactional
public void setDynamicSimulationParameters(UUID studyUuid, DynamicSimulationParametersInfos dsParameter, String userId) {
updateDynamicSimulationParameters(studyUuid, DynamicSimulationService.toEntity(dsParameter != null ? dsParameter : DynamicSimulationService.getDefaultDynamicSimulationParameters(), objectMapper));
updateDynamicSimulationParameters(studyUuid,
DynamicSimulationService.toEntity(dsParameter != null ? dsParameter : DynamicSimulationService.getDefaultDynamicSimulationParameters(), objectMapper),
dsParameter != null ? dsParameter.getProvider() : this.defaultDynamicSimulationProvider);

// Dynamic security analysis depends on dynamic simulation => must invalidate
invalidateDynamicSecurityAnalysisStatusOnAllNodes(studyUuid);
Expand All @@ -2897,7 +2902,9 @@ public DynamicSimulationParametersInfos getDynamicSimulationParameters(UUID stud
}

private DynamicSimulationParametersInfos getDynamicSimulationParameters(StudyEntity studyEntity) {
return studyEntity.getDynamicSimulationParameters() != null ? DynamicSimulationService.fromEntity(studyEntity.getDynamicSimulationParameters(), objectMapper) : DynamicSimulationService.getDefaultDynamicSimulationParameters();
return studyEntity.getDynamicSimulationParameters() != null ?
DynamicSimulationService.fromEntity(studyEntity.getDynamicSimulationParameters(), objectMapper).setProvider(studyEntity.getDynamicSimulationProvider()) :
DynamicSimulationService.getDefaultDynamicSimulationParameters().setProvider(this.defaultDynamicSimulationProvider);
}

@Transactional(readOnly = true)
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/org/gridsuite/study/server/service/dynamicsimulation/DynamicSimulationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import com.powsybl.timeseries.DoubleTimeSeries;
import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.dto.dynamicmapping.MappingInfos;
import org.gridsuite.study.server.dto.dynamicmapping.ModelInfos;
import org.gridsuite.study.server.dto.dynamicsimulation.DynamicSimulationParametersInfos;
Expand All @@ -22,6 +21,7 @@
import org.gridsuite.study.server.dto.dynamicsimulation.solver.SolverTypeInfos;
import org.gridsuite.study.server.dto.timeseries.TimeSeriesMetadataInfos;
import org.gridsuite.study.server.dto.timeseries.TimelineEventInfos;
import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.repository.DynamicSimulationParametersEntity;

import java.util.Collections;
Expand Down Expand Up @@ -96,7 +96,7 @@ static DynamicSimulationParametersInfos getDefaultDynamicSimulationParameters()
List<SolverInfos> solvers = List.of(idaSolver, simSolver);

NetworkInfos network = getDefaultNetwork();
return new DynamicSimulationParametersInfos(0.0, 500.0, "", idaSolver.getId(), solvers, network, null, null);
return new DynamicSimulationParametersInfos(null, 0.0, 500.0, "", idaSolver.getId(), solvers, network, null, null);
}

static IdaSolverInfos getDefaultIdaSolver() {
Expand Down