Skip to content
  • Daniel Wortmann's avatar
    Merge branch 'develop' into inpgen · c1ac7f56
    Daniel Wortmann authored
    Conflicts:
    	cdn/cdnval.F90
    	cdn_mt/cdnmt.F90
    	cdn_mt/magnMomFromDen.f90
    	cmake/Files_and_Targets.txt
    	dos/evaldos.f90
    	eigen/eigen.F90
    	eigen/mt_setup.F90
    	eigen/tlmplm.F90
    	eigen/tlmplm_cholesky.F90
    	eigen_soc/eigenso.F90
    	init/initParallelProcesses.F90
    	init/postprocessInput.F90
    	io/r_inpXML.F90
    	main/cdngen.F90
    	main/fleur.F90
    	main/fleur_init.F90
    	math/lh_tofrom_lm.f90
    	mix/type_mixvector.F90
    	mpi/mpi_bc_all.F90
    	mpi/mpi_make_groups.F90
    	optional/plot.f90
    	optional/stden.f90
    	tests/tests/gw1Interface/files/inp.xml
    	tests/tests/gw2Interface/files/inp.xml
    	tests/tests_old.cmake
    	types/CMakeLists.txt
    	types/types_cdnval.f90
    	types/types_enpara.F90
    	types/types_setup.F90
    	vgen/sfTests.f90
    	vgen/xcBfield.f90
    c1ac7f56