Feature: DeltaSpin for LCAO and PW base and DFTU for PW, both collinear and noncollinear spin#7304
Open
dyzheng wants to merge 20 commits intodeepmodeling:developfrom
Open
Feature: DeltaSpin for LCAO and PW base and DFTU for PW, both collinear and noncollinear spin#7304dyzheng wants to merge 20 commits intodeepmodeling:developfrom
dyzheng wants to merge 20 commits intodeepmodeling:developfrom
Conversation
…FT+U nspin validation Add sc_lambda_strategy, sc_mu_init, sc_mu_max, sc_mu_growth, sc_mix_beta, and sc_direction_only input parameters for DeltaSpin lambda update strategies. Allow DFT+U PW to accept nspin=1/2/4 (previously rejected nspin!=4). Update print_info for new parameters.
Add uom_mdata Mixing_Data, allocate_mixing_uom(), mix_uom(), and conserve_setting() to Charge_Mixing for DFT+U occupation matrix mixing. Enable mixing_dftu allocation at first SCF iteration for PW. Add init_DM()/get_DM() to ElecStateLCAO for DeltaSpin LCAO subspace path.
… for nspin=1/2 Add typed accessors (get/set_locale, get_orbital_corr, get_hubbard_u, is_locale_initialized, mark_locale_dirty, enable_mixing) to Plus_U. Rewrite cal_occ_pw to handle nspin=1/2/4 with proper becp indexing and occupation mixing via Charge_Mixing::mix_uom. Restructure eff_pot_pw layout: nspin=2 uses split [spin_up|spin_down]. Add get_eff_pot_pw_spin(isk) for nspin-aware access. Add PW unit tests.
…ce, direction_only Port DeltaSpin to PW nspin=1/2: add npol_ member, get_spin_sign(ik), accumulate_Mi_from_becp(), pauli_to_moment(). Add direction_only_ mode for projecting lambda perpendicular to target magnetization. Implement PW-specific update_psi_charge_pw_cpu/gpu() using subspace diagonalization. Add run_lambda_loop_lcao() for LCAO nspin=2 with analytical Jacobian. Add lambda update strategy framework (BFGS, linear_response, augmented_lagrangian, hybrid_delayed). Add PW and strategy unit tests.
Extend force_op, stress_op, and onsite_op functors with npol parameter for nspin=1/2 support on CPU, CUDA, and ROCm. Fix contraction order bug (dbb1<->dbb2 swapped in Pauli matrix expression for npol=2 force/stress). Add npol=1 branching in all kernel paths.
…nspin=1/2 Add nspin-aware VU access (get_eff_pot_pw_spin), ld_psi parameter propagation for correct GEMM strides when ngk[ik]<npwx. Add high-level cal_force/stress_onsite_dftu/dspin delegation methods on OnsiteProjector. Extract setup_pw_dftu_indices() from cal_ps_dftu. Fix DeltaSpin PW to skip re-running lambda loop when moments are already converged. Pass sc_direction_only through setup_pot. Add forcepaw allocation placeholder in forces.
… nspin=1/2 Replace direct Plus_U member accesses with typed accessors in LCAO operator code. Add cal_PI_sub() to DeltaSpin<OperatorLCAO> for computing subspace projector matrices P_I=D_I^dag*D_I. Update ESolver: pass p_chgmix instead of PARAM.inp to iter_init_dftu_pw, add use_paw=false to HSolverPW, add nspin=2-aware lambda loop dispatch in esolver_ks_lcao, pass sc_direction_only to init_sc. Remove TD_MovingGauge from rt-TDDFT esolver.
…updates Remove vkbnc member from pseudopot_cell_vnl; always allocate vkb ComplexMatrix (simplifies GPU path). Remove TD_MovingGauge from rt-TDDFT module (moving spatial gauge logic). Add comm_map2 and set_value_add overloads to RI_2D_Comm for DeltaSpin LCAO. Use Plus_U accessors in DeePKS. Add CUDA cusolver stubs and device check helpers.
Add 52 test cases covering DeltaSpin and DFT+U for PW and LCAO with nspin=1/2/4: SPIN-only, DFTU-only, DeltaSpin-only, DFTU+DeltaSpin combined, ReadLam, threshold variants, BFGS strategy, direction_only, FeO atom-order, and spin-orbit coupling tests. Register 17_DS_DFTU in tests/CMakeLists.txt. Add shared PP_ORB pseudopotential files (O.upf, Bi, Se) for FeO and SO tests.
…lt.ref files CASES_CPU.txt was using old integrate/ numbering (250-366) instead of 17_DS_DFTU/ numbering (01-52). Regenerated result.ref files with etotperatomref entries required by Autotest.sh.
The use_paw parameter was part of a PAW pre-introduction that is no longer relevant (develop removed libpaw in PR deepmodeling#7273). Remove the extra 'false' argument from HSolverPW and DiagoDavid constructors in esolver_ks_pw, esolver_sdft_pw, and hsolver_lrtd to match the develop API.
…s, PW DFT+U support - Add comprehensive DeltaSpin usage guide to spin.md with STRU mag/sc format, INPUT parameters, lambda strategies, direction-only mode, DFT+U combination examples, and citations - Register sc_direction_only and sc_lambda_strategy in parameters.yaml and input-main.md with full descriptions - Update construct_H.md: DFT+U now supports PW basis (nspin=1/2/4) - Update dft_plus_u input-main.md entry with PW availability notes - Delete 4 dead params from input_parameter.h (sc_mu_init, sc_mu_max, sc_mu_growth, sc_mix_beta) that were declared but never registered
mohanchen
added
Refactor
…DeltaSpin declarations - Delete 114 duplicate template definitions in RI_2D_Comm.hpp that caused compilation failure in 'Build extra components with GNU toolchain' CI (comm_map2_first, comm_map2, set_value_add, add_datas all defined twice) - Add LambdaStrategyType enum and strategy_type_/strategy_ members to SpinConstrain class header to fix lambda_strategy_integration.cpp - Add cal_h_lambda, convert, calculate_MW, collect_MW declarations to spin_constrain.h to complete LCAO template specializations - Add 5 missing source files to deltaspin CMakeLists.txt: lambda_update_strategies.cpp, lambda_strategy_integration.cpp, sc_parse_json.cpp, cal_h_lambda.cpp, cal_mw_helper.cpp - Fix timer::tick → timer::start in cal_h_lambda.cpp for develop API compat - Fix reserve→resize UB in basic_funcs.cpp (3 occurrences) - Document cal_VU_pot_pw() stub and add (void)spin to suppress warning
…tions - Fix 50_FeO_O_first_Fe_second/STRU: Fe was at (0.5,0.5,0.5) and O at (0,0,0), while 51 had Fe at (0,0,0) and O at (0.5,0.5,0.5). These are different physical configurations in FCC lattice (body center is not a lattice translation from origin), causing ~3.7 eV energy diff. Now both use Fe at (0,0,0) and O at (0.5,0.5,0.5) as intended. - Update 50's result.ref to match 51's (same physical system). - Remove unnecessary PP_ORB symlinks from 50 and 51: pseudo_dir '../../PP_ORB' already resolves correctly to tests/PP_ORB from tests/17_DS_DFTU/XX_test/, matching all other 01-49 test cases.
…missing stubs The test CMakeLists incorrectly linked dftu.cpp and other dftu source files, causing multiple definition conflicts with the mock implementations in test_dftu.cpp. Restore to develop version which only links dftu_lcao.cpp. Add stub implementations for new PR functions: - Plus_U::get_locale_flat - Plus_U::set_locale_flat
…flat The stub implementations now correctly interact with the locale array, allowing the DFTU unit test to pass.
The script incorrectly included 'TOTAL-PRESSURE:' line when extracting stress matrix values. Changed to use pattern matching for numeric lines only, fixing stress calculation for tests like 099_PW_DJ_SO.
The formula was incorrectly changed from: ps[1] * dbb1 + ps[2] * dbb2 (correct, matches develop) to: ps[1] * dbb2 + ps[2] * dbb1 (incorrect, breaks tests) This change broke force/stress calculations for DFT+U tests like 099_PW_DJ_SO. Restored the correct formula verified by develop branch tests. Files affected: - force_op.cpp/stress_op.cpp (CPU) - force_op.cu/stress_op.cu (CUDA) - force_op.hip.cu/stress_op.hip.cu (ROCm)
Fixed formula errors in multiple kernels that broke SOC tests like 035_PW_15_SO. The incorrect formula was: ps1*dbb2 + ps2*dbb1 (wrong) Correct formula verified from develop branch: ps1*dbb1 + ps2*dbb2 (correct) Affected kernels: - force_op.cpp: nonlocal force (deeq_nc) and DeltaSpin - stress_op.cpp: nonlocal stress (deeq_nc) - CUDA/ROCm versions of above All formulas now match develop branch implementations.
The nonlocal kernel uses deeq_nc with convention: index 1 = σ_↓↑, index 2 = σ_↑↓ (from vnl_pw.cpp:1602-1603) deeq_nc(1) = deeq(1) - i*deeq(2) // σ_↓↑ deeq_nc(2) = deeq(1) + i*deeq(2) // σ_↑↓ For this convention the correct formula is: ps1*dbb1 + ps2*dbb2 (develop version) The DFT+U kernel uses vu with opposite convention: index 1 = σ_↑↓, index 2 = σ_↓↑ (from dftu_pw.cpp:324-325) vu[1] = 0.5*(tmp[1] + i*tmp[2]) // σ_↑↓ vu[2] = 0.5*(tmp[1] - i*tmp[2]) // σ_↓↑ For vu convention the correct formula is: ps[1]*dbb1 + ps[2]*dbb2 (same order, different reason) The DeltaSpin kernel uses lambda_coeff with same convention as deeq_nc: coefficients1 = (λx, λy) = σ_↓↑ coefficients2 = (λx, -λy) = σ_↑↓ For lambda convention the correct formula is: coefficients1*dbb2 + coefficients2*dbb1 (PR version) Key insight: the formula depends on the storage convention of the coefficient array, not on a universal rule.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reminder
Linked Issue
Fix #...
Unit Tests and/or Case Tests for my changes
What's changed?
Any changes of core modules? (ignore if not applicable)