diff --git a/Readme.md b/Readme.md index ae35d0e..4b03624 100644 --- a/Readme.md +++ b/Readme.md @@ -62,6 +62,15 @@ The application will prefer that bundled copy when running from a packaged install. During development it can still use a local checkout copy or a `trimspNL` binary found in the configured path or in `PATH`. +`trimspNL` now requires an explicit run basename when called directly, for +example: + +```bash +./trimspNL myrun +``` + +This reads `myrun.inp` and writes `myrun.out`, `myrun.rge`, and `myrun.err`. + ###### Running the GUI ###### Install [Node.js] (`nodejs`, `nodejs-libs` and `npm`), diff --git a/TrimSPlib.js b/TrimSPlib.js index fe8e3c2..9220187 100644 --- a/TrimSPlib.js +++ b/TrimSPlib.js @@ -3715,18 +3715,14 @@ async function startSequence() { await yieldToRenderer(); // Single run: Start - let eingabe1=CreateInpFile(); - if (eingabe1=="ERROR") {return(0);} + let inputFileContent=CreateInpFile(); + if (inputFileContent=="ERROR") {return(0);} let FILENAME=All["fileNamePrefix"]+"_"+ScanName+SValue; - writeAsciiFile(All["workPath"]+"/"+FILENAME+".inp",eingabe1); + writeAsciiFile(All["workPath"]+"/"+FILENAME+".inp",inputFileContent); if (!webOrApp) { // Prepare command and execute cmd = "cd " + All["workPath"]; - //cmd += ";cp " + FILENAME + ".inp eingabe1.inp"; cmd += ";" + trimBin + ' ' + FILENAME; - //cmd += "; mv -f ausgabe1.rge " + FILENAME + ".rge"; - //cmd += "; mv -f ausgabe1.out " + FILENAME + ".out"; - //cmd += "; mv -f ausgabe1.err " + FILENAME + ".err"; execute(cmd); } // Single run: End @@ -3792,7 +3788,6 @@ async function startSequence() { // Remove redundant files and change the name fort.33 if (!webOrApp) { - // cmd="cd " + All["workPath"] + ";rm -f eingabe1.inp; mv -f fort.33 " + seq_file; cmd="cd " + All["workPath"] + "; mv -f fort.33 " + seq_file; execute(cmd); }