GSAGH-560: Analysis task is missing when adding 1D geometries or Loads from other models #722
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
SandeepArup
commented
Nov 7, 2024
SandeepArup
commented
…s from other models
psarras
requested changes
Nov 18, 2024
| } | ||
| } catch { | ||
| //not modal analysis task | ||
| return 0; |
There was a problem hiding this comment.
can you create a test, where we return zero? Why the try catch? Perhaps we do catch on the method above and leave this private one to throw the error?
Comment on lines
+139
to
+188
| public void ModalAnalysisTaskAreCopiedInDuplicateModel(int methodId) { | ||
| var original = new GsaModel(); | ||
| int numberOfMode = 5; | ||
| // Task | ||
| var massOption = new MassOption(ModalMassOption.LumpMassAtNode, 1); | ||
| var additionalMassDerivedFromLoads = new AdditionalMassDerivedFromLoads( | ||
| "L1", | ||
| Direction.Z, | ||
| 1 | ||
| ); | ||
| var ModalDamping = new ModalDamping(0.5); | ||
| var modalDynamicTaskParameter = new ModalDynamicTaskParameter( | ||
| ModeCalculationMethod(methodId, numberOfMode), | ||
| massOption, | ||
| additionalMassDerivedFromLoads, | ||
| ModalDamping | ||
| ); | ||
|
|
||
| int taskId = original.ApiModel.AddAnalysisTask( | ||
| AnalysisTaskFactory.CreateModalDynamicAnalysisTask( | ||
| "task1", | ||
| modalDynamicTaskParameter | ||
| ) | ||
| ); | ||
| for (int mode = 1; mode <= numberOfMode; mode++) { | ||
| original.ApiModel.AddAnalysisCaseToTask(taskId, "test case", mode); | ||
| } | ||
| System.Collections.ObjectModel.ReadOnlyDictionary<int, AnalysisTask> taskIn = original.ApiModel.AnalysisTasks(); | ||
|
|
||
| //assemble model and get task | ||
| var analysis = new GsaAnalysis(); | ||
| foreach (KeyValuePair<int, AnalysisTask> analysisTask in taskIn) { | ||
| analysis.AnalysisTasks.Add(new GsaAnalysisTask(analysisTask.Key, analysisTask.Value, original.ApiModel)); | ||
| } | ||
| var assembly = new ModelAssembly(new GsaModel(), null, null, null, null, null, analysis, | ||
| LengthUnit.Meter, Length.Zero, false, null); | ||
| var assembled = new GsaModel() { | ||
| ApiModel = assembly.GetModel() | ||
| }; | ||
| System.Collections.ObjectModel.ReadOnlyDictionary<int, AnalysisTask> taskOut = assembled.ApiModel.AnalysisTasks(); | ||
|
|
||
| Assert.Equal(taskIn.Count, taskIn.Count); | ||
| foreach (int key in taskIn.Keys) { | ||
| Assert.Equal(taskIn[key].Name, taskOut[key].Name); | ||
| foreach (int caseId in taskIn[key].Cases) { | ||
| Assert.Equal(assembled.ApiModel.AnalysisCaseName(caseId), original.ApiModel.AnalysisCaseName(caseId)); | ||
| Assert.Equal(assembled.ApiModel.AnalysisCaseDescription(caseId), original.ApiModel.AnalysisCaseDescription(caseId)); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
this is too big
Can you create one test per exist condition of your new method?
You need 3 tests where the numberOfDynamicMode is larger that 0 but comes from the 3 different type of modelCalculationStrategy that it should have the analysisCaseToTask being added like that _model.AddAnalysisCaseToTask(task.Id, ca.Name, mode); and another case where the numberOfDynamicMode is Zero and the analysisCastToTask has been added through _model.AddAnalysisCaseToTask(task.Id, ca.Name, ca.Definition);
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## release/10.2.14 #722 +/- ##
=================================================
- Coverage 90.1% 90.1% -0.1%
=================================================
Files 520 520
Lines 39291 39324 +33
Branches 4902 4911 +9
=================================================
+ Hits 35436 35465 +29
- Misses 2582 2585 +3
- Partials 1273 1274 +1
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.