From 96153984289c44a0ed93eda75ff18cec3ac188f1 Mon Sep 17 00:00:00 2001 From: rneder Date: Thu, 16 Jan 2025 17:19:12 +0100 Subject: [PATCH] Macros return to initial directory upon error --- discus/prog/chem.f90 | 2 +- discus/prog/conn_mod.f90 | 2 +- discus/prog/demolec.f90 | 2 +- discus/prog/discus_exp2pdf.f90 | 2 +- discus/prog/discus_loop.f90 | 4 ++-- discus/prog/discus_plot.f90 | 2 +- discus/prog/discus_py.f90 | 2 +- discus/prog/discus_save.f90 | 2 +- discus/prog/discus_super_func.f90 | 2 +- discus/prog/domain.f90 | 2 +- discus/prog/graphic.f90 | 2 +- discus/prog/insert.f90 | 2 +- discus/prog/mmc.f90 | 2 +- discus/prog/patters.f90 | 2 +- discus/prog/pdf.f90 | 2 +- discus/prog/perioditize.f90 | 2 +- discus/prog/place_molecule.f90 | 2 +- discus/prog/powder.f90 | 2 +- discus/prog/prop_para_func.f90 | 2 +- discus/prog/shear.f90 | 2 +- discus/prog/stack.f90 | 2 +- discus/prog/storage.f90 | 2 +- discus/prog/surface_func_mod.f90 | 2 +- discus/prog/symm.f90 | 2 +- discus/prog/transfrm.f90 | 2 +- discus/prog/waves.f90 | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/discus/prog/chem.f90 b/discus/prog/chem.f90 index 5263f589..62235a59 100644 --- a/discus/prog/chem.f90 +++ b/discus/prog/chem.f90 @@ -465,7 +465,7 @@ SUBROUTINE chem RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close (-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/conn_mod.f90 b/discus/prog/conn_mod.f90 index 438de2da..22bb4b6b 100644 --- a/discus/prog/conn_mod.f90 +++ b/discus/prog/conn_mod.f90 @@ -1145,7 +1145,7 @@ SUBROUTINE conn_menu RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close (-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/demolec.f90 b/discus/prog/demolec.f90 index c3b4dfa8..dd2a8ef5 100644 --- a/discus/prog/demolec.f90 +++ b/discus/prog/demolec.f90 @@ -198,7 +198,7 @@ SUBROUTINE demolecularize RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close (-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/discus_exp2pdf.f90 b/discus/prog/discus_exp2pdf.f90 index 8d349d73..cec7086a 100644 --- a/discus/prog/discus_exp2pdf.f90 +++ b/discus/prog/discus_exp2pdf.f90 @@ -62,7 +62,7 @@ SUBROUTINE exp2pdf RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close (-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/discus_loop.f90 b/discus/prog/discus_loop.f90 index 1f7faeb1..83833689 100644 --- a/discus/prog/discus_loop.f90 +++ b/discus/prog/discus_loop.f90 @@ -78,7 +78,7 @@ recursive SUBROUTINE discus_loop CALL errlist IF (ier_sta.ne.ER_S_LIVE) then IF (lmakro.AND. lmacro_close) then - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF lblock = .false. @@ -102,7 +102,7 @@ recursive SUBROUTINE discus_loop EXIT main ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) lmakro_error = .FALSE. PROMPT_STATUS = PROMPT_ON sprompt = ' ' diff --git a/discus/prog/discus_plot.f90 b/discus/prog/discus_plot.f90 index 8b55fe65..e2f6c9f6 100644 --- a/discus/prog/discus_plot.f90 +++ b/discus/prog/discus_plot.f90 @@ -810,7 +810,7 @@ SUBROUTINE plot prompt = orig_prompt RETURN ELSE - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/discus_py.f90 b/discus/prog/discus_py.f90 index f7b8bf38..1405aa40 100644 --- a/discus/prog/discus_py.f90 +++ b/discus/prog/discus_py.f90 @@ -98,7 +98,7 @@ SUBROUTINE command (incomming, ier_status) IF( ier_num /= 0 ) THEN ! Handle error messages CALL errlist ier_status = -1 - CALL macro_close + CALL macro_close(-1) CALL no_error ELSE main: DO WHILE( lmakro ) ! Initial command was a macro, run this macro diff --git a/discus/prog/discus_save.f90 b/discus/prog/discus_save.f90 index 67164048..c86a47d2 100644 --- a/discus/prog/discus_save.f90 +++ b/discus/prog/discus_save.f90 @@ -146,7 +146,7 @@ SUBROUTINE save_struc (string, lcomm) RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/discus_super_func.f90 b/discus/prog/discus_super_func.f90 index 6618a316..1ab17a4a 100644 --- a/discus/prog/discus_super_func.f90 +++ b/discus/prog/discus_super_func.f90 @@ -57,7 +57,7 @@ subroutine super_menu RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/domain.f90 b/discus/prog/domain.f90 index c9489ed1..47ee016b 100644 --- a/discus/prog/domain.f90 +++ b/discus/prog/domain.f90 @@ -304,7 +304,7 @@ SUBROUTINE do_domain RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/graphic.f90 b/discus/prog/graphic.f90 index 4288f082..262fde9b 100644 --- a/discus/prog/graphic.f90 +++ b/discus/prog/graphic.f90 @@ -922,7 +922,7 @@ SUBROUTINE do_niplps (linverse) RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/insert.f90 b/discus/prog/insert.f90 index d138485f..37cea15a 100644 --- a/discus/prog/insert.f90 +++ b/discus/prog/insert.f90 @@ -622,7 +622,7 @@ SUBROUTINE insert (itype) RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/mmc.f90 b/discus/prog/mmc.f90 index e0bc8f78..dcb8cabd 100644 --- a/discus/prog/mmc.f90 +++ b/discus/prog/mmc.f90 @@ -256,7 +256,7 @@ SUBROUTINE mmc RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/patters.f90 b/discus/prog/patters.f90 index daf3deda..403457ce 100644 --- a/discus/prog/patters.f90 +++ b/discus/prog/patters.f90 @@ -1184,7 +1184,7 @@ SUBROUTINE patterson (inverse_type) RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/pdf.f90 b/discus/prog/pdf.f90 index 72516569..4b018a63 100644 --- a/discus/prog/pdf.f90 +++ b/discus/prog/pdf.f90 @@ -302,7 +302,7 @@ SUBROUTINE pdf RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/perioditize.f90 b/discus/prog/perioditize.f90 index fce86e29..8a87c689 100644 --- a/discus/prog/perioditize.f90 +++ b/discus/prog/perioditize.f90 @@ -99,7 +99,7 @@ subroutine perioditize_menu RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/place_molecule.f90 b/discus/prog/place_molecule.f90 index 777a6d25..111e4ab1 100644 --- a/discus/prog/place_molecule.f90 +++ b/discus/prog/place_molecule.f90 @@ -269,7 +269,7 @@ SUBROUTINE do_place_molecule RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/powder.f90 b/discus/prog/powder.f90 index 133d4ac1..a92f264f 100644 --- a/discus/prog/powder.f90 +++ b/discus/prog/powder.f90 @@ -268,7 +268,7 @@ SUBROUTINE do_powder RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/prop_para_func.f90 b/discus/prog/prop_para_func.f90 index 77667e2e..cacbe76c 100644 --- a/discus/prog/prop_para_func.f90 +++ b/discus/prog/prop_para_func.f90 @@ -176,7 +176,7 @@ SUBROUTINE property_menu RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/shear.f90 b/discus/prog/shear.f90 index 391f5608..6af81ab3 100644 --- a/discus/prog/shear.f90 +++ b/discus/prog/shear.f90 @@ -659,7 +659,7 @@ SUBROUTINE shear_menue RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/stack.f90 b/discus/prog/stack.f90 index 1ca691ac..95c8db1f 100644 --- a/discus/prog/stack.f90 +++ b/discus/prog/stack.f90 @@ -90,7 +90,7 @@ SUBROUTINE stack RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/storage.f90 b/discus/prog/storage.f90 index 1dfd5ba4..1ea7daa6 100644 --- a/discus/prog/storage.f90 +++ b/discus/prog/storage.f90 @@ -165,7 +165,7 @@ SUBROUTINE storage RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/surface_func_mod.f90 b/discus/prog/surface_func_mod.f90 index 10516012..ca6e7db0 100644 --- a/discus/prog/surface_func_mod.f90 +++ b/discus/prog/surface_func_mod.f90 @@ -163,7 +163,7 @@ SUBROUTINE surface_menu RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/symm.f90 b/discus/prog/symm.f90 index 71eb6aef..5fe52261 100644 --- a/discus/prog/symm.f90 +++ b/discus/prog/symm.f90 @@ -120,7 +120,7 @@ SUBROUTINE symm RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/transfrm.f90 b/discus/prog/transfrm.f90 index a132048c..856b7dce 100644 --- a/discus/prog/transfrm.f90 +++ b/discus/prog/transfrm.f90 @@ -793,7 +793,7 @@ SUBROUTINE transform RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF diff --git a/discus/prog/waves.f90 b/discus/prog/waves.f90 index 76b2bfa5..527c9c65 100644 --- a/discus/prog/waves.f90 +++ b/discus/prog/waves.f90 @@ -540,7 +540,7 @@ SUBROUTINE waves_menu RETURN ELSE IF(lmacro_close) THEN - CALL macro_close + CALL macro_close(-1) prompt_status = PROMPT_ON ENDIF ENDIF