Merge pull request #8 from spidasoftware/add-include-strength-support…

…-162248054 [Delivers #162248054] add load case useStrengthResults support
spidasoftware · Dec 13, 2018 · a4b6ed2 · a4b6ed2
2 parents cd63e52 + 2667c03
commit a4b6ed2
Show file tree

Hide file tree

Showing 4 changed files with 7,291 additions and 5 deletions.
diff --git a/cmds/analyze.js b/cmds/analyze.js
@@ -193,7 +193,7 @@ function resolvePayload(partialPayloadP, structure) {
         return {
             analysisCase,
             structure,
-            clientData: clientData.clientItemsForStructure(structure)
+            clientData: maybeAddStrengthCase(analysisCase, clientData, clientData.clientItemsForStructure(structure))
         };
     });
 }
@@ -251,7 +251,6 @@ function createPartialPayload(argv) {
             return clientDataP.then(clientData => {
                 let name;
                 let type;
-
                 if (argv.loadCaseName) {
                     type = 'load';
                     name = argv.loadCaseName;
@@ -277,6 +276,25 @@ function createPartialPayload(argv) {
     return false;
 }
 
+// We assume only a single strength case in client data
+function maybeAddStrengthCase(analysisCase, clientData, structureComponents){
+    if(analysisCase.useStrengthResults === true){
+        if(Object.keys(clientData.analysisCases.strength).length < 1){
+            throw("\nLoad case has useStrengthResults: TRUE, but no strength case exists in client data");
+        } else if (Object.keys(clientData.analysisCases.strength).length > 1) {
+            throw("\nClient data contains more than one strength case. Only one strength case was expected");
+        }
+        let useCaseKey;
+        for(let key in clientData.analysisCases.strength){
+            if(key !== undefined) {
+                useCaseKey = key;
+            }
+        }
+        structureComponents.analysisCases = [clientData.analysisCases.strength[useCaseKey]];
+    }
+    return structureComponents;
+}
+
 function batchJobs(argv) {
     const batch = _.partialRight(_.chunk,BATCH_SIZE);
 

diff --git a/lib/clientData.js b/lib/clientData.js
@@ -130,19 +130,25 @@ function extractAnalysisCases(clientData) {
     const strength = {};
 
     const { analysisCases } = clientData;
-
+    let includeStrengthAnalsyis = false;
     if (analysisCases) {
         for (let analysisCase of analysisCases) {
             if (isStrengthCase(analysisCase)) {
                 strength[analysisCase.name]=analysisCase;
             } else {
                 load[analysisCase.name]=analysisCase;
+                if(analysisCase.useStrengthResults){
+                    includeStrengthAnalsyis = true;
+                }
             }
         }
 
-        delete clientData.analysisCases;
+        if(includeStrengthAnalsyis){
+            clientData.analysisCases = strength;
+        } else {
+            delete clientData.analysisCases;
+        }
     }
-
     return { load, strength };
 }