fix : support both element magnetization and atomic magnetization for initial

Author: dyzheng

source/module_cell/read_atoms.cpp

@@ -589,7 +589,7 @@ bool UnitCell_pseudo::read_atom_positions(std::ifstream &ifpos, std::ofstream &o
                                         mv.z = true ;
                                         atoms[it].vel[ia].set(0,0,0);
 #ifndef __CMD
-										//atoms[it].mag[ia]=magnet.start_magnetization[it];//if this line is used, default startmag_type would be 2
+										atoms[it].mag[ia]=magnet.start_magnetization[it];//if this line is used, default startmag_type would be 2
 #endif										
 										atoms[it].angle1[ia]=0;
 										atoms[it].angle2[ia]=0;
@@ -633,7 +633,6 @@ bool UnitCell_pseudo::read_atom_positions(std::ifstream &ifpos, std::ofstream &o
 														tmp=ifpos.get();
 													}
 
-													cout<<"tmp"<<tmp<<'\n';
 													if((tmp >= 48 && tmp <= 57) or tmp=='-')
 													{
 														ifpos.putback(tmp);

source/src_pw/charge.cpp

@@ -212,13 +212,11 @@ void Charge::atomic_rho(const int spin_number_need, double** rho_in)const		// Pe
 		// check the start magnetization
 		const int startmag_type = [&]()->int
 		{
-			if(GlobalV::NSPIN==4)		//zhengdy-soc, type 2 is still wrong.
-				return 1;
 			for(int it=0; it<GlobalC::ucell.ntype; it++)
-				for(int ia=0; ia<GlobalC::ucell.atoms[it].na; ia++)
-					if(GlobalC::ucell.atoms[it].mag[ia]!=0.0)
-						return 2;
-			return 1;
+			{
+				if( GlobalC::ucell.magnet.start_magnetization[it] != 0.0) return 1;
+			}
+			return 2;
 		}();
 		ModuleBase::GlobalFunc::OUT(GlobalV::ofs_warning,"startmag_type",startmag_type);