@@ -153,42 +153,59 @@ def __init__(
153
153
154
154
# when mode = "static"
155
155
elif mode == "STATIC" :
156
+ static_incar = {"LWAVE" : True ,
157
+ "ENCUT" : 500 ,
158
+ "ISMEAR" : 0 ,
159
+ "SIGMA" : 0.01 ,
160
+ "LREAL" : False ,
161
+ "GGA" : "PE" ,
162
+ "LCHARG" : False ,
163
+ "LAECHG" : False ,
164
+ "METAGGA" : "None" ,
165
+ "LMIXTAU" : False }
166
+
156
167
if prev_calc_dir :
157
168
# Copy only the CONTCAR from previous calc directory (often a relaxation run)
158
- t .append (CopyVaspOutputs (
159
- calc_dir = prev_calc_dir ,
160
- contcar_to_poscar = True ,
161
- additional_files = wavecars )
162
- )
163
-
164
- t .append (WriteVaspStaticFromPrev (other_params = {"user_incar_settings" : {"LWAVE" : "TRUE" }}))
165
-
166
- elif parents :
167
- # Copy only the CONTCAR from previous calc
168
169
t .append (
169
170
CopyVaspOutputs (
170
- calc_loc = True ,
171
+ calc_dir = prev_calc_dir ,
171
172
contcar_to_poscar = True ,
172
173
additional_files = wavecars
173
174
)
174
175
)
175
176
176
177
t .append (
177
- WriteVaspStaticFromPrev (other_params = {"user_incar_settings" : {"LWAVE" : "TRUE" }}))
178
-
179
- elif structure :
180
- vasp_input_set = MPStaticSet (
181
- structure , user_incar_settings = {"LWAVE" : "TRUE" }
178
+ WriteVaspStaticFromPrev (structure = structure ,
179
+ reciprocal_density = reciprocal_density ,
180
+ other_params = {"user_incar_settings" : static_incar })
182
181
)
182
+
183
+ elif parents :
184
+ # Copy only the CONTCAR from previous calc
185
+ t .append (CopyVaspOutputs (calc_loc = True ,
186
+ additional_files = wavecars ,
187
+ contcar_to_poscar = True )
188
+ )
189
+
183
190
t .append (
184
- WriteVaspFromIOSet (structure = structure , vasp_input_set = vasp_input_set )
191
+ WriteVaspStaticFromPrev (structure = structure ,
192
+ reciprocal_density = reciprocal_density ,
193
+ other_params = {"user_incar_settings" : static_incar })
185
194
)
186
195
196
+ elif structure :
197
+ static_input_set = MPStaticSet (structure = structure ,
198
+ reciprocal_density = reciprocal_density ,
199
+ user_incar_settings = static_incar )
200
+
201
+ t .append (WriteVaspFromIOSet (structure = structure , vasp_input_set = static_input_set )
202
+ )
203
+
187
204
else :
188
205
raise ValueError ("Must specify structure or previous calculation for static calculation" )
189
206
190
207
else :
191
- raise ValueEroor ("Must specify a mode from 'STATIC', 'IPA', or 'RPA'" )
208
+ raise ValueError ("Must specify a mode from 'STATIC', 'IPA', or 'RPA'" )
192
209
193
210
# use the 'default' custodian handler group
194
211
handler_group = "default"
0 commit comments