diff --git a/TrimSPlib.js b/TrimSPlib.js index 62f4206..173b76e 100644 --- a/TrimSPlib.js +++ b/TrimSPlib.js @@ -1160,7 +1160,7 @@ function CreateInpFile(All) { // Then loop over the layers and for each give the following structure // thickness, density, correction factor, chemical formula - var TemplateLayer = "L1d L1rho L1CK L1Comp\n"; + var TemplateLayer = "L1Comp L1d L1rho L1CK\n"; // Z number of elements TemplateLayer += "L1ELZ1 L1ELZ2 L1ELZ3 L1ELZ4 L1ELZ5\n"; // A number of elements @@ -1315,7 +1315,6 @@ function startSequence(All) { trimBin = "trimspNL"; } } - // Check if workPath exists otherwise create it checkDir(All['workPath']); // from TrimSPelec.js, Electron/Node specific } else { diff --git a/fortran/trimspNL.F b/fortran/trimspNL.F index 606a836..428199e 100644 --- a/fortran/trimspNL.F +++ b/fortran/trimspNL.F @@ -289,7 +289,7 @@ C CHARACTER Variables CHARACTER month_start*4,month_stop*4,day_start*2,day_stop*2 CHARACTER year_start*4,year_stop*4,hour_start*2,hour_stop*2 CHARACTER min_start*2,min_stop*2,sec_start*2,sec_stop*2 - CHARACTER*18 chem(MAXNL) + CHARACTER*50 chem(MAXNL) COMMON /A/ M1,VELC,ZARG COMMON /B/ TI,SHEATH,CALFA @@ -411,7 +411,7 @@ C Here we read the NLayers structure DO I=1,NLayers C Thickness (DX), density (RHO), and correction factor (CK, it is C always 1.0??), chemical formula (chem) - READ(11,*) DX(I),RHO(I),CK(I),chem(I) + READ(11,*) chem(I),DX(I),RHO(I),CK(I) C Atomic numbers READ(11,*) ZT(I,1),ZT(I,2),ZT(I,3),ZT(I,4),ZT(I,5) C Mass numbers (amu) diff --git a/out/make/deb/x64/trimsp_1.0.0_amd64.deb b/out/make/deb/x64/trimsp_1.0.1_amd64.deb similarity index 89% rename from out/make/deb/x64/trimsp_1.0.0_amd64.deb rename to out/make/deb/x64/trimsp_1.0.1_amd64.deb index 6b30b36..01bbd29 100644 Binary files a/out/make/deb/x64/trimsp_1.0.0_amd64.deb and b/out/make/deb/x64/trimsp_1.0.1_amd64.deb differ diff --git a/out/make/rpm/x64/TrimSP-1.0.0-1.x86_64.rpm b/out/make/rpm/x64/TrimSP-1.0.1-1.x86_64.rpm similarity index 82% rename from out/make/rpm/x64/TrimSP-1.0.0-1.x86_64.rpm rename to out/make/rpm/x64/TrimSP-1.0.1-1.x86_64.rpm index 0544429..26adf38 100644 Binary files a/out/make/rpm/x64/TrimSP-1.0.0-1.x86_64.rpm and b/out/make/rpm/x64/TrimSP-1.0.1-1.x86_64.rpm differ diff --git a/package.json b/package.json index d13b8c2..c175c51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "TrimSP", - "version": "1.0.0", + "version": "1.0.1", "description": "Trim.SP simulation to calculate stopping profile of implanted probes.", "main": "main.js", "scripts": { @@ -23,9 +23,7 @@ "electron": "^11.2.1" }, "dependencies": { - "child_process": "^1.0.2", "electron-squirrel-startup": "^1.0.0", - "fs": "^0.0.1-security", "plotly.js-dist": "^1.58.4" }, "config": { diff --git a/trimspNL b/trimspNL index 784349d..3cbb71d 100755 Binary files a/trimspNL and b/trimspNL differ