Skip to content

Commit

Permalink
[feat]: Integrating the io module
Browse files Browse the repository at this point in the history
  • Loading branch information
hentt30 committed Sep 28, 2021
1 parent 5a73d03 commit 34fea46
Show file tree
Hide file tree
Showing 21 changed files with 85 additions and 664 deletions.
5 changes: 3 additions & 2 deletions minushalf/commands/correct_potfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
from loguru import logger
from minushalf.softwares import Vasp
from minushalf.data import Softwares
from minushalf.utils import (welcome_message, end_message, Vtotal,
AtomicPotential, parse_cut)
from minushalf.io import (Vtotal)
from minushalf.utils import (welcome_message, end_message, AtomicPotential,
parse_cut)


@click.command()
Expand Down
3 changes: 2 additions & 1 deletion minushalf/commands/create_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
import click
from loguru import logger
from minushalf.data import (CalculationCode, ExchangeCorrelation)
from minushalf.utils import (welcome_message, end_message, InputFile)
from minushalf.io import (InputFile)
from minushalf.utils import (welcome_message, end_message)


@click.command()
Expand Down
3 changes: 1 addition & 2 deletions minushalf/commands/execute.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
import pandas as pd
import click
from loguru import logger
from minushalf.io import (MinushalfYaml, make_minushalf_results)
from minushalf.utils import (
MinushalfYaml,
BandStructure,
projection_to_df,
welcome_message,
end_message,
make_minushalf_results,
get_fractionary_correction_indexes,
get_simple_correction_indexes,
)
Expand Down
3 changes: 2 additions & 1 deletion minushalf/commands/fractional_occupation.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
import click
import numpy as np
from loguru import logger
from minushalf.utils import (welcome_message, end_message, InputFile)
from minushalf.io import (InputFile)
from minushalf.utils import (welcome_message, end_message)
from minushalf import atomic_program


Expand Down
6 changes: 3 additions & 3 deletions minushalf/corrections/vasp_correction.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
from minushalf.data import (CorrectionDefaultParams,
AtomicProgramDefaultParams, OrbitalType,
CutInitialGuessMethods)
from minushalf.utils import (InputFile, Vtotal, MinushalfYaml, AtomicPotential,
BandStructure, find_negative_band_gap,
CutInitialGuess)
from minushalf.io import (InputFile, Vtotal, MinushalfYaml)
from minushalf.utils import (AtomicPotential, BandStructure,
find_negative_band_gap, CutInitialGuess)
from minushalf.interfaces import (Correction, Runner, SoftwaresAbstractFactory)


Expand Down
1 change: 1 addition & 0 deletions minushalf/io/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
from .minushalf_yaml import MinushalfYaml
from .input_file import InputFile
from .vtotal import Vtotal
from .make_minushalf_results import make_minushalf_results
56 changes: 56 additions & 0 deletions minushalf/io/correction.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,58 @@ def replace_cbm(self, characters: list) -> None:

self._replace_cbm = characters

@property
def valence_cut_guess(self) -> list:
"""
Returns:
CUT guess for nelder mead algorithm
"""
return self._valence_cut_guess

@valence_cut_guess.setter
def valence_cut_guess(self, cut_guess: list) -> None:
"""
Set valence_cut_guess
"""

try:
if cut_guess != None:
for element in cut_guess:
element[0] = element[0].capitalize()
element[1] = element[1].lower()
element[2] = float(element[2])
except:
loguru.logger.error("valence_cut_guess incorrectly specified")
raise Error("valence_cut_guess incorrectly specified")

self._valence_cut_guess = cut_guess

@property
def conduction_cut_guess(self) -> list:
"""
Returns:
CUT guess for nelder mead algorithm
"""
return self._conduction_cut_guess

@conduction_cut_guess.setter
def conduction_cut_guess(self, cut_guess: list) -> None:
"""
Set conduction_cut_guess
"""

try:
if cut_guess != None:
for element in cut_guess:
element[0] = element[0].capitalize()
element[1] = element[1].lower()
element[2] = float(element[2])
except:
loguru.logger.error("conduction_cut_guess incorrectly specified")
raise Error("conduction_cut_guess incorrectly specified")

self._conduction_cut_guess = cut_guess

@property
def correction_code(self) -> dict:
"""
Expand Down Expand Up @@ -204,5 +256,9 @@ def to_dict(self):
"_replace_cbm", None)
parameters_dict["divide_character"] = parameters_dict.pop(
"_divide_character", None)
parameters_dict["valence_cut_guess"] = parameters_dict.pop(
"_valence_cut_guess", None)
parameters_dict["conduction_cut_guess"] = parameters_dict.pop(
"_conduction_cut_guess", None)

return parameters_dict
File renamed without changes.
4 changes: 0 additions & 4 deletions minushalf/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
"""
Init file for utils module
"""
from .input_file import InputFile
from .vtotal import Vtotal
from .cli_messages import welcome_message, end_message
from .drop_comments import drop_comments
from .parse_valence_orbital_line import parse_valence_orbitals
Expand All @@ -15,8 +13,6 @@
check_procar_exists, check_potcar_exists,
check_outcar_exists)
from .parse_cut import parse_cut
from .minushalf_yaml import MinushalfYaml
from .make_minushalf_results import make_minushalf_results
from .negative_band_gap import find_negative_band_gap
from .fractionary_correction_indexes import get_fractionary_correction_indexes
from .simple_correction_indexes import get_simple_correction_indexes
Expand Down
2 changes: 1 addition & 1 deletion minushalf/utils/atomic_potential.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import copy
import numpy as np
from minushalf.interfaces import PotentialFile
from .vtotal import Vtotal
from minushalf.io import Vtotal
from .trimming_function import trimming_function
from .correct_potential_fourier_transform import correct_potential_fourier_transform

Expand Down

0 comments on commit 34fea46

Please sign in to comment.