+ Batch-Mode-Ausgabe der gewählten D-Matrix-Option sowie der entsprec…

…henden D-Matrix für Modul Plattenbeulen ergänzt;
AndiMb · May 10, 2024 · fed84d1 · fed84d1
1 parent 734f120
commit fed84d1
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/..._Plate_UI/src/de/elamx/clt/plateui/buckling/batchrun/BucklingOutputWriterServiceImpl.java b/..._Plate_UI/src/de/elamx/clt/plateui/buckling/batchrun/BucklingOutputWriterServiceImpl.java
@@ -26,12 +26,14 @@
 package de.elamx.clt.plateui.buckling.batchrun;
 
 import de.elamx.clt.CLT_Laminate;
+import de.elamx.clt.calculation.dmatrix.DMatrixPanel;
 import de.elamx.clt.plate.BucklingResult;
 import de.elamx.clt.plateui.buckling.BucklingModuleData;
 import de.elamx.laminate.Laminat;
 import de.elamx.utilities.Utilities;
 import java.io.PrintStream;
 import java.util.Locale;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 
 /**
@@ -44,6 +46,18 @@ public class BucklingOutputWriterServiceImpl implements BucklingOutputWriterServ
     @Override
     public void writeResults(PrintStream out, BucklingModuleData data, Laminat laminate, BucklingResult result){
         Locale lo = Locale.ENGLISH;      
+        double [][] dmat;
+        String dMatrixOption;
+        if (data.getBucklingInput().isDtilde()) {
+            dmat = data.getLaminat().getLookup().lookup(CLT_Laminate.class).getDtildeMatrix();
+            dMatrixOption = NbBundle.getBundle(DMatrixPanel.class).getString("DtildeMatrix.name");
+        } else if(!data.getBucklingInput().isWholeD()) {
+            dmat = data.getLaminat().getLookup().lookup(CLT_Laminate.class).getDMatrixWithZeroD12D16();
+            dMatrixOption = NbBundle.getBundle(DMatrixPanel.class).getString("DmatrixD16D26zero.name");
+        } else {
+            dmat = data.getLaminat().getLookup().lookup(CLT_Laminate.class).getDMatrix();
+            dMatrixOption = NbBundle.getBundle(DMatrixPanel.class).getString("Dmatrix.name");
+        }
         out.println("********************************************************************************");
         out.println(Utilities.centeredText("BUCKLING", 80));
         out.println(Utilities.centeredText(data.getName(), 80));
@@ -52,6 +66,12 @@ public void writeResults(PrintStream out, BucklingModuleData data, Laminat lamin
         out.println("Laminat: " + laminate.getName());
         out.println();
         if (! data.getLaminat().getLookup().lookup(CLT_Laminate.class).hasNegativeDtildeEntries()) {
+            out.println("D-matrix option: " + dMatrixOption);
+            out.println("D-matrix used:");
+            for (int ii=0; ii<3; ii++) {
+            out.printf(lo,"  %10.1f    %10.1f    %10.1f%n"  , dmat[ii][0], dmat[ii][1], dmat[ii][2]);
+            };
+            out.println();
             out.println("critical load");
             double[] ncrit = result.getN_crit();
             out.printf(lo,"  nx_crit  = %17.10E%n"  , ncrit[0]);