Skip to content

Commit da10074

Browse files
committed
BUG FIX internal corefile did not save molecuel settings
1 parent ff32df8 commit da10074

1 file changed

Lines changed: 24 additions & 55 deletions

File tree

‎discus/prog/place_molecule.f90‎

Lines changed: 24 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,7 @@ SUBROUTINE deco_run
784784
USE param_mod
785785
USE random_mod
786786
USE prompt_mod
787+
USE discus_show_menu
787788
!
788789
IMPLICIT none
789790
!
@@ -885,75 +886,35 @@ SUBROUTINE deco_run
885886
CALL property_select(line, length, cr_sel_prop)
886887
!
887888
corefile = 'internal.decorate' ! internal user files always start with 'internal'
888-
shellfile = 'internal.decoshell'
889-
sav_w_scat = .TRUE.
890-
sav_w_adp = .TRUE.
891-
sav_w_occ = .TRUE.
892-
sav_r_ncell = .TRUE.
893-
sav_w_ncell = .TRUE.
894-
sav_w_gene = .FALSE.
895-
sav_w_symm = .FALSE.
896-
sav_w_mole = .FALSE.
897-
sav_w_obje = .FALSE.
898-
sav_w_doma = .FALSE.
899-
sav_w_prop = .TRUE.
900-
sav_latom(:) = .TRUE.
889+
!!call save_show
901890
CALL save_internal(corefile) ! thus this file name is unique
891+
!
892+
shellfile = 'internal.decoshell'
902893
line = 'present, external' ! Force atom to be close to a surface
903894
length = 17
904895
CALL property_select(line, length, sav_sel_prop)
905896
line = 'absent, outside' ! Force atom to be inside
906897
length = 15
907898
CALL property_select(line, length, sav_sel_prop)
908-
sav_w_scat = .TRUE.
909-
sav_w_adp = .TRUE.
910-
sav_w_occ = .TRUE.
911-
sav_r_ncell = .TRUE.
912-
sav_w_ncell = .TRUE.
913-
sav_w_gene = .FALSE.
914-
sav_w_symm = .FALSE.
915-
sav_w_mole = .FALSE.
916-
sav_w_obje = .FALSE.
917-
sav_w_doma = .FALSE.
918-
sav_w_prop = .TRUE.
919-
sav_latom(:) = .FALSE.
920-
DO k=1, dcc_num
921-
DO j=1,2
922-
DO i=1, dcc_surf(j,0,k)
923-
sav_latom(dcc_surf(j,i,k)) = .TRUE.
924-
ENDDO
925-
ENDDO
926-
ENDDO
927899
!
928-
sav_w_scat = .TRUE.
929-
sav_w_adp = .TRUE.
930-
sav_w_occ = .TRUE.
931-
sav_r_ncell = .TRUE.
932-
sav_w_ncell = .TRUE.
933-
sav_w_gene = .FALSE.
934-
sav_w_symm = .FALSE.
935-
sav_w_mole = .FALSE.
936-
sav_w_obje = .FALSE.
937-
sav_w_doma = .FALSE.
938-
sav_w_prop = .TRUE.
939-
sav_latom(:) = .TRUE.
900+
sav_w_scat = .TRUE.
901+
sav_w_adp = .TRUE.
902+
sav_w_occ = .TRUE.
903+
sav_r_ncell = .TRUE.
904+
sav_w_ncell = .TRUE.
905+
sav_w_gene = .FALSE.
906+
sav_w_symm = .FALSE.
907+
sav_w_mole = .FALSE.
908+
sav_w_obje = .FALSE.
909+
sav_w_doma = .FALSE.
910+
sav_w_prop = .TRUE.
911+
sav_latom(:) = .TRUE.
940912
CALL save_internal(shellfile)
941913
! RBN DECO NEEDS ERROR CHECK !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
942914
!
943915
! Make single atom "structure" for domain list file
944916
! Should be obsolete
945917
CALL rese_cr
946-
! cr_natoms = 1
947-
! cr_ncatoms = 1
948-
! cr_nscat = 1
949-
! cr_pos(:,1) = 0.0
950-
! cr_iscat(1) = 1
951-
! cr_at_lis(1) = 'CORE'
952-
! corelist = 'internal.core.list'
953-
! line = 'ignore, all' ! Ignore all properties
954-
! length = 11
955-
! CALL property_select(line, length, sav_sel_prop)
956-
! CALL save_internal(corelist) ! Save the core list
957918
!
958919
! Load the molecules into temporary structures to reduce disk I/O
959920
!
@@ -1315,7 +1276,15 @@ SUBROUTINE deco_run
13151276
CALL rese_cr
13161277
CALL save_restore_setting
13171278
CALL no_error
1279+
CALL save_default_setting ! Default to full saving
1280+
line = 'ignore, all' ! Ignore all properties
1281+
length = 11
1282+
CALL property_select(line, length, sav_sel_prop)
1283+
line = 'ignore, all' ! Ignore all properties for global as well
1284+
length = 11
1285+
CALL property_select(line, length, cr_sel_prop)
13181286
CALL readstru_internal( corefile) ! Read original core file
1287+
!
13191288
IF(cr_natoms == 0 ) THEN
13201289
ier_num = -27
13211290
ier_typ = ER_CHEM

0 commit comments

Comments
 (0)