Skip to content

Commit 174f31f

Browse files
authored
[Refactor] Move module_ri to source_lcao/module_ri and module_rdmft to source_lcao/module_rdmft and correct some documents (#6344)
* Move module_ri to source_lcao/module_ri * Modify pathes of file in source_lcao/module_ri * Fix CMakeFiles in test * Move module_rdmft to source_lcao/module_rdmft * Correct documentation * Line up document * Fix document about source_relax
1 parent 2260530 commit 174f31f

File tree

111 files changed

+120
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+120
-122
lines changed

docs/CONTRIBUTING.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ For those who are interested in the source code, the following figure shows the
7171
| |-- module_dftu The module for defining the Hamiltonian in DFT+U calculations.
7272
| |-- module_gint The module for performing grid integral in LCAO calculations.
7373
| |-- module_hcontainer The module for storing the Hamiltonian matrix in LCAO calculations.
74-
| `-- module_tddft The module for defining the Hamiltonian in TDDFT calculations.
74+
| |-- module_tddft The module for defining the Hamiltonian in TDDFT calculations.
75+
| `-- module_ri The module for performing RI calculations.
7576
|-- source_pw The module for defining the Hamiltonian in PW calculations.
7677
| |-- hamilt_ofdft The module for defining the Hamiltonian in OFDFT calculations.
7778
| |-- hamilt_pwdft The module for defining the Hamiltonian in PW-DFT calculations.
@@ -82,10 +83,7 @@ For those who are interested in the source code, the following figure shows the
8283
|-- source_io The module for reading of INPUT files and output properties including band structure, density of states, charge density, etc.
8384
|-- source_md The module for performing molecular dynamics.
8485
|-- source_psi The module for defining the wave function and its operations.
85-
|-- source_relax The module for performing structural optimization.
86-
| |-- relax_new The module for performing structural optimization with new algorithm, optimized for cell and ion simultaneously.
87-
| `-- relax_old The module for performing structural optimization with old algorithm, optimized for cell and ion separately.
88-
|-- module_ri The module for performing RI calculations.
86+
`-- source_relax The module for performing structural optimization, optimized for cell and ion simultaneously.
8987
```
9088

9189
## Submitting an Issue

source/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ add_subdirectory(source_esolver)
1414
add_subdirectory(source_lcao/module_gint)
1515
add_subdirectory(source_io)
1616
add_subdirectory(source_relax)
17-
add_subdirectory(module_ri)
17+
add_subdirectory(source_lcao/module_ri)
1818
add_subdirectory(module_parameter)
1919
add_subdirectory(module_lr)
2020

2121
# add by jghan
22-
add_subdirectory(module_rdmft)
22+
add_subdirectory(source_lcao/module_rdmft)
2323

2424
add_library(
2525
driver

source/Makefile.Objects

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ VPATH=./src_global:\
6767
./source_io:\
6868
./source_io/json_output:\
6969
./src_ri:\
70-
./module_ri:\
70+
./source_lcao/module_ri:\
7171
./module_parameter:\
7272
./module_lr:\
7373
./module_lr/ao_to_mo_transformer:\
7474
./module_lr/dm_trans:\
7575
./module_lr/operator_casida:\
7676
./module_lr/potentials:\
7777
./module_lr/utils:\
78-
./module_rdmft:\
78+
./source_lcao/module_rdmft:\
7979
./\
8080

8181
OBJS_ABACUS_PW=${OBJS_MAIN}\

source/module_lr/esolver_lrtd_lcao.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "source_lcao/module_gint/temp_gint/gint_info.h"
2121
#ifdef __EXX
2222
// #include <RI/physics/Exx.h>
23-
#include "module_ri/Exx_LRI.h"
23+
#include "source_lcao/module_ri/Exx_LRI.h"
2424
#endif
2525
namespace LR
2626
{

source/module_lr/hamilt_casida.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifdef __EXX
1010
#include "module_lr/operator_casida/operator_lr_exx.h"
1111
#include "module_lr/ri_benchmark/operator_ri_hartree.h"
12-
#include "module_ri/LRI_CV_Tools.h"
12+
#include "source_lcao/module_ri/LRI_CV_Tools.h"
1313
#endif
1414
namespace LR
1515
{

source/module_lr/operator_casida/operator_lr_exx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#pragma once
33
#include "source_hamilt/operator.h"
44
#include "source_estate/module_dm/density_matrix.h"
5-
#include "module_ri/Exx_LRI.h"
5+
#include "source_lcao/module_ri/Exx_LRI.h"
66
#include "module_lr/utils/lr_util.h"
77
namespace LR
88
{

source/source_base/abfs-vector3_order.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef ABFS_VECTOR3_ORDER_H
77
#define ABFS_VECTOR3_ORDER_H
88

9-
#include "module_ri/abfs.h"
9+
#include "source_lcao/module_ri/abfs.h"
1010

1111
// mohan comment out 2021-02-06
1212
//#include <boost/archive/binary_oarchive.hpp>

source/source_base/test/abfs-vector3_order_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "source_base/abfs-vector3_order.h"
22
#include "source_base/vector3.h"
33
#include "gtest/gtest.h"
4-
#include "module_ri/abfs.h"
4+
#include "source_lcao/module_ri/abfs.h"
55

66
/************************************************
77
* unit test of functions in class Abfs::vector3_order

source/source_cell/bcast_cell.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "source_base/parallel_common.h"
33
#include "module_parameter/parameter.h"
44
#ifdef __EXX
5-
#include "module_ri/serialization_cereal.h"
5+
#include "source_lcao/module_ri/serialization_cereal.h"
66
#include "source_pw/hamilt_pwdft/global.h"
77
#endif
88
namespace unitcell

source/source_cell/read_atom_species.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "source_base/tool_title.h"
55
#ifdef __EXX
66
#include "source_pw/hamilt_pwdft/global.h"
7-
#include "module_ri/serialization_cereal.h"
7+
#include "source_lcao/module_ri/serialization_cereal.h"
88
#endif
99
namespace unitcell
1010
{

0 commit comments

Comments
 (0)