From 51784359200ddfaabd71c71a9153b3dfb33c39cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Wed, 21 Oct 2015 17:18:15 +0000 Subject: [PATCH] Remove cp_common_uses.f90 svn-origin-rev: 16197 --- src/admm_dm_methods.F | 2 +- src/admm_dm_types.F | 1 - src/admm_methods.F | 3 ++- src/admm_types.F | 1 - src/admm_utils.F | 1 - src/al_system_types.F | 1 - src/almo_scf.F | 4 +++- src/almo_scf_diis_types.F | 4 +++- src/almo_scf_methods.F | 4 +++- src/almo_scf_optimizer.F | 4 +++- src/almo_scf_qs.F | 4 +++- src/almo_scf_types.F | 1 - src/aobasis/ai_angmom.F | 1 - src/aobasis/ai_contraction.F | 1 - src/aobasis/ai_coulomb.F | 1 - src/aobasis/ai_coulomb_test.F | 1 - src/aobasis/ai_derivatives.F | 1 - src/aobasis/ai_elec_field.F | 1 - src/aobasis/ai_eri_debug.F | 1 - src/aobasis/ai_fermi_contact.F | 1 - src/aobasis/ai_kinetic.F | 1 - src/aobasis/ai_moments.F | 1 - src/aobasis/ai_onecenter.F | 1 - src/aobasis/ai_oneelectron.F | 1 - src/aobasis/ai_os_rr.F | 1 - src/aobasis/ai_overlap.F | 1 - src/aobasis/ai_overlap3.F | 1 - src/aobasis/ai_overlap3_debug.F | 1 - src/aobasis/ai_overlap_aabb.F | 1 - src/aobasis/ai_overlap_debug.F | 1 - src/aobasis/ai_overlap_ppl.F | 1 - src/aobasis/ai_shg_overlap.F | 1 - src/aobasis/ai_spin_orbit.F | 1 - src/aobasis/ai_verfc.F | 1 - src/aobasis/ao_util.F | 1 - src/aobasis/basis_set_container_types.F | 1 - src/aobasis/basis_set_types.F | 1 - src/aobasis/orbital_pointers.F | 1 - src/aobasis/orbital_symbols.F | 1 - src/aobasis/orbital_transformation_matrices.F | 1 - src/aobasis/soft_basis_set.F | 1 - src/aobasis/sto_ng.F | 1 - src/atom.F | 3 ++- src/atom_basis.F | 3 ++- src/atom_electronic_structure.F | 1 - src/atom_energy.F | 3 ++- src/atom_fit.F | 1 - src/atom_kind_orbitals.F | 1 - src/atom_operators.F | 1 - src/atom_optimization.F | 1 - src/atom_output.F | 1 - src/atom_pseudo.F | 3 ++- src/atom_types.F | 1 - src/atom_utils.F | 1 - src/atom_xc.F | 1 - src/atomic_charges.F | 1 - src/atoms_input.F | 3 ++- src/beta_gamma_psi.F | 1 - src/block_p_types.F | 1 - src/bsse.F | 3 ++- src/cell_methods.F | 3 ++- src/colvar_methods.F | 5 ++++- src/colvar_utils.F | 1 - src/common/bessel_lib.F | 1 - src/common/bibliography.F | 1 - src/common/cg_test.F | 2 +- src/common/cp_array_sort_i4.F | 2 -- src/common/cp_array_sort_i8.F | 2 -- src/common/cp_array_sort_r.F | 2 -- src/common/cp_array_utils_i.F | 2 +- src/common/cp_array_utils_logical.F | 2 +- src/common/cp_array_utils_r.F | 2 +- src/common/cp_common_uses.f90 | 8 -------- src/common/cp_para_env.F | 1 - src/common/cp_result_methods.F | 1 - src/common/cp_result_types.F | 1 - src/common/cp_units.F | 2 +- src/common/distribution_1d_types.F | 1 - src/common/eigenvalueproblems.F | 1 - src/common/erf_fn.F | 1 - src/common/fparser.F | 1 - src/common/gamma.F | 1 - src/common/lebedev.F | 1 - src/common/linear_systems.F | 1 - src/common/mathlib.F | 1 - src/common/memory_utilities.F | 1 - src/common/parallel_rng_types.F | 1 - src/common/periodic_table.F | 1 - src/common/powell.F | 1 - src/common/reference_manager.F | 1 - src/common/spherical_harmonics.F | 1 - src/common/string_table.F | 1 - src/common/structure_factor_types.F | 1 - src/common/structure_factors.F | 1 - src/common/whittaker.F | 1 - src/constraint.F | 2 +- src/constraint_3x3.F | 1 - src/constraint_4x6.F | 1 - src/constraint_clv.F | 1 - src/constraint_fxd.F | 1 - src/constraint_util.F | 1 - src/constraint_vsite.F | 1 - src/core_ae.F | 1 - src/core_ppl.F | 1 - src/core_ppnl.F | 1 - src/cp2k_debug.F | 3 ++- src/cp_control_types.F | 1 - src/cp_control_utils.F | 3 ++- src/cp_dbcsr_cholesky.F | 1 - src/cp_dbcsr_cp2k_link.F | 6 ++++-- src/cp_dbcsr_diag.F | 1 - src/cp_dbcsr_operations.F | 1 - src/cp_dbcsr_output.F | 3 ++- src/cp_ddapc.F | 3 ++- src/cp_ddapc_forces.F | 1 - src/cp_ddapc_methods.F | 2 +- src/cp_ddapc_types.F | 4 +++- src/cp_ddapc_util.F | 3 ++- src/cp_external_control.F | 4 +++- src/cp_gemm_interface.F | 1 - src/cp_realspace_grid_cube.F | 1 - src/cp_realspace_grid_init.F | 1 - src/cp_spline_utils.F | 1 - src/cp_subsys_methods.F | 1 - src/cp_symmetry.F | 3 ++- src/csvr_system_types.F | 1 - src/csvr_system_utils.F | 1 - src/ct_methods.F | 4 +++- src/ct_types.F | 1 - src/d3_poly.F | 1 - src/dbcsr/base/dbcsr_array_sort_d.F | 1 - src/dbcsr/base/dbcsr_array_sort_i4.F | 1 - src/dbcsr/base/dbcsr_array_sort_i8.F | 1 - src/dbcsr/base/dbcsr_array_sort_s.F | 1 - src/dbcsrwrap/cp_dbcsr_interface.F | 1 - src/dft_plus_u.F | 3 ++- src/distribution_2d_types.F | 3 ++- src/distribution_methods.F | 5 ++++- src/dkh_main.F | 1 - src/dm_ls_chebyshev.F | 4 +++- src/dm_ls_scf.F | 4 +++- src/dm_ls_scf_curvy.F | 4 +++- src/dm_ls_scf_methods.F | 4 +++- src/dm_ls_scf_qs.F | 4 +++- src/dm_ls_scf_types.F | 1 - src/domain_submatrix_methods.F | 4 +++- src/domain_submatrix_types.F | 1 - src/efield_utils.F | 1 - src/eip_environment.F | 1 - src/eip_environment_types.F | 1 - src/eip_silicon.F | 3 ++- src/emd/rt_delta_pulse.F | 1 - src/emd/rt_hfx_utils.F | 1 - src/emd/rt_make_propagators.F | 1 - src/emd/rt_propagation_methods.F | 5 ++++- src/emd/rt_propagation_output.F | 5 ++++- src/emd/rt_propagation_utils.F | 4 +++- src/emd/rt_propagator_init.F | 4 +++- src/environment.F | 4 +--- src/eri_mme_methods.F | 3 ++- src/eri_mme_methods_low.F | 3 ++- src/eri_mme_test.F | 1 - src/eri_mme_types.F | 3 ++- src/et_coupling.F | 4 +++- src/et_coupling_types.F | 1 - src/ewald_environment_types.F | 3 ++- src/ewald_pw_methods.F | 1 - src/ewald_pw_types.F | 3 ++- src/ewald_spline_util.F | 3 ++- src/ewalds.F | 1 - src/ewalds_multipole.F | 1 - src/ewalds_multipole_debug.F | 9 ++++++--- src/ewalds_multipole_debug.h | 3 --- src/exclusion_types.F | 1 - src/extended_system_types.F | 1 - src/external_potential_methods.F | 4 +++- src/f77_interface.F | 13 +++++-------- src/farming_methods.F | 3 ++- src/farming_types.F | 1 - src/fermi_utils.F | 1 - src/fist_energy_types.F | 1 - src/fist_environment.F | 3 ++- src/fist_environment_types.F | 1 - src/fist_force.F | 3 ++- src/fist_intra_force.F | 3 ++- src/fist_main.F | 1 - src/fist_neighbor_list_control.F | 3 ++- src/fist_neighbor_list_types.F | 1 - src/fist_neighbor_lists.F | 4 +++- src/fist_nonbond_env_types.F | 1 - src/fist_nonbond_force.F | 3 ++- src/fist_pol_scf.F | 3 ++- src/fm/cp_blacs_calls.F | 1 - src/fm/cp_blacs_env.F | 1 - src/fm/cp_cfm_basic_linalg.F | 1 - src/fm/cp_cfm_diag.F | 1 - src/fm/cp_cfm_types.F | 2 +- src/fm/cp_fm_basic_linalg.F | 2 +- src/fm/cp_fm_cholesky.F | 2 +- src/fm/cp_fm_diag.F | 2 +- src/fm/cp_fm_pool_types.F | 2 +- src/fm/cp_fm_struct.F | 5 ++++- src/fm/cp_fm_types.F | 2 +- src/fm/cp_fm_vect.F | 1 - src/fm/cp_linked_list_fm.F | 1 - src/force_env_methods.F | 6 ++++-- src/force_env_types.F | 2 +- src/force_env_utils.F | 1 - src/force_field_types.F | 1 - src/force_fields.F | 3 ++- src/force_fields_all.F | 2 +- src/force_fields_ext.F | 3 ++- src/force_fields_input.F | 4 +++- src/force_fields_util.F | 4 +++- src/fp_methods.F | 3 ++- src/fp_types.F | 3 ++- src/free_energy_types.F | 1 - src/gauss_colloc.F | 1 - src/gaussian_gridlevels.F | 3 ++- src/gle_system_types.F | 1 - src/global_types.F | 1 - src/graphcon.F | 1 - src/hartree_local_methods.F | 1 - src/hartree_local_types.F | 1 - src/header.F | 1 - src/helium_common.F | 1 - src/helium_io.F | 4 +++- src/helium_types.F | 2 +- src/hfx_admm_utils.F | 3 ++- src/hfx_communication.F | 1 - src/hfx_compression_methods.F | 1 - src/hfx_derivatives.F | 3 ++- src/hfx_energy_potential.F | 3 ++- src/hfx_helpers.F | 1 - src/hfx_libint_interface.F | 1 - src/hfx_libint_wrapper.F | 1 - src/hfx_load_balance_methods.F | 1 - src/hfx_pair_list_methods.F | 1 - src/hfx_screening_methods.F | 1 - src/hfx_types.F | 3 ++- src/hfxbase/hfx_compression_core_methods.F | 1 - src/hfxbase/hfx_contract_block.F | 1 - src/hfxbase/hfx_contraction_methods.F | 1 - src/hirshfeld_methods.F | 1 - src/hirshfeld_types.F | 1 - src/input/cp_linked_list_char.F | 1 - src/input/cp_linked_list_int.F | 1 - src/input/cp_linked_list_logical.F | 1 - src/input/cp_linked_list_real.F | 1 - src/input/cp_linked_list_val.F | 1 - src/input/cp_output_handling.F | 7 +++++-- src/input/cp_parser_buffer_types.F | 1 - src/input/cp_parser_ilist_methods.F | 2 +- src/input/cp_parser_ilist_types.F | 1 - src/input/cp_parser_inpp_methods.F | 2 +- src/input/cp_parser_inpp_types.F | 1 - src/input/cp_parser_methods.F | 2 +- src/input/cp_parser_status_types.F | 1 - src/input/cp_parser_types.F | 1 - src/input/input_enumeration_types.F | 2 +- src/input/input_keyword_types.F | 1 - src/input/input_parsing.F | 3 ++- src/input/input_section_types.F | 2 +- src/input/input_val_types.F | 1 - src/input_cp2k_almo.F | 1 - src/input_cp2k_atom.F | 1 - src/input_cp2k_atprop.F | 1 - src/input_cp2k_binary_restarts.F | 5 ++++- src/input_cp2k_check.F | 2 +- src/input_cp2k_colvar.F | 1 - src/input_cp2k_constraints.F | 1 - src/input_cp2k_dft.F | 1 - src/input_cp2k_distribution.F | 1 - src/input_cp2k_eip.F | 1 - src/input_cp2k_force_eval.F | 1 - src/input_cp2k_free_energy.F | 1 - src/input_cp2k_global.F | 1 - src/input_cp2k_hfx.F | 1 - src/input_cp2k_kpoints.F | 1 - src/input_cp2k_ls.F | 1 - src/input_cp2k_mixed.F | 1 - src/input_cp2k_mm.F | 1 - src/input_cp2k_motion_print.F | 1 - src/input_cp2k_mp2.F | 1 - src/input_cp2k_neb.F | 1 - src/input_cp2k_poisson.F | 1 - src/input_cp2k_properties_dft.F | 1 - src/input_cp2k_qmmm.F | 1 - src/input_cp2k_read.F | 1 - src/input_cp2k_resp.F | 1 - src/input_cp2k_restarts_util.F | 1 - src/input_cp2k_rsgrid.F | 1 - src/input_cp2k_subsys.F | 1 - src/input_cp2k_thermostats.F | 1 - src/input_cp2k_transport.F | 1 - src/input_cp2k_xc.F | 1 - src/input_optimize_basis.F | 1 - src/input_optimize_input.F | 1 - src/input_restart_force_eval.F | 1 - src/input_restart_rng.F | 1 - src/ipi_driver.F | 2 +- src/iterate_matrix.F | 4 +++- src/k290.F | 1 - src/kg_correction.F | 1 - src/kg_environment.F | 1 - src/kg_environment_types.F | 1 - src/kg_tnadd_mat.F | 1 - src/kg_vertex_coloring_methods.F | 4 +++- src/kpoint_io.F | 4 +++- src/kpoint_methods.F | 2 +- src/kpoint_transitional.F | 1 - src/kpoint_types.F | 3 ++- src/library_tests.F | 3 ++- src/linesearch.F | 3 ++- src/lri_debug_integrals.F | 1 - src/lri_environment_init.F | 1 - src/lri_environment_methods.F | 3 ++- src/lri_environment_types.F | 1 - src/lri_forces.F | 1 - src/lri_ks_methods.F | 4 +++- src/lri_optimize_ri_basis.F | 3 ++- src/lri_optimize_ri_basis_types.F | 1 - src/lri_os_integrals.F | 1 - src/lri_shg_integrals.F | 1 - src/ls_matrix_exp.F | 2 +- src/manybody_eam.F | 1 - src/manybody_potential.F | 1 - src/manybody_quip.F | 2 +- src/manybody_siepmann.F | 3 ++- src/manybody_tersoff.F | 1 - src/matrix_exp.F | 2 +- src/mdctrl_types.F | 1 - src/metadyn_tools/graph.F | 1 - src/metadyn_tools/graph_methods.F | 1 - src/metadyn_tools/graph_utils.F | 1 - src/metadynamics.F | 2 +- src/metadynamics_types.F | 1 - src/metadynamics_utils.F | 4 +++- src/minimax.F | 1 - src/minimax_rpa.F | 1 - src/mixed_energy_types.F | 1 - src/mixed_environment.F | 1 - src/mixed_environment_types.F | 1 - src/mixed_environment_utils.F | 1 - src/mixed_main.F | 8 +++++--- src/mm_collocate_potential.F | 1 - src/mm_mapping_library.F | 1 - src/mode_selective.F | 4 +++- src/mol_force.F | 1 - src/molden_utils.F | 2 +- src/molecular_states.F | 4 +++- src/molsym.F | 1 - src/moments_utils.F | 1 - src/motion/averages_types.F | 4 +++- src/motion/bfgs_optimizer.F | 4 +++- src/motion/cell_opt.F | 3 ++- src/motion/cell_opt_types.F | 1 - src/motion/cell_opt_utils.F | 9 ++++++--- src/motion/cg_optimizer.F | 3 ++- src/motion/cg_utils.F | 1 - src/motion/cp_lbfgs.F | 1 - src/motion/cp_lbfgs_geo.F | 3 ++- src/motion/cp_lbfgs_optimizer_gopt.F | 4 +++- src/motion/dimer_methods.F | 3 ++- src/motion/dimer_types.F | 2 +- src/motion/dimer_utils.F | 2 +- src/motion/free_energy_methods.F | 5 ++++- src/motion/geo_opt.F | 3 ++- src/motion/glbopt_callback.F | 1 - src/motion/gopt_f77_methods.F | 2 +- src/motion/gopt_f77_methods.h | 2 -- src/motion/gopt_f_methods.F | 2 +- src/motion/gopt_f_types.F | 1 - src/motion/gopt_param_types.F | 1 - src/motion/helium_interactions.F | 1 - src/motion/helium_methods.F | 3 ++- src/motion/helium_sampling.F | 3 ++- src/motion/input_cp2k_md.F | 1 - src/motion/input_cp2k_restarts.F | 5 ++++- src/motion/input_cp2k_vib.F | 1 - src/motion/integrator.F | 2 +- src/motion/integrator_utils.F | 1 - src/motion/mc/mc_control.F | 2 +- src/motion/mc/mc_coordinates.F | 1 - src/motion/mc/mc_ensembles.F | 2 +- src/motion/mc/mc_environment_types.F | 1 - src/motion/mc/mc_ge_moves.F | 1 - src/motion/mc/mc_misc.F | 1 - src/motion/mc/mc_move_control.F | 1 - src/motion/mc/mc_moves.F | 4 +++- src/motion/mc/mc_run.F | 2 +- src/motion/mc/mc_types.F | 2 +- src/motion/mc/tamc_run.F | 4 +++- src/motion/md_conserved_quantities.F | 1 - src/motion/md_ener_types.F | 1 - src/motion/md_energies.F | 4 +++- src/motion/md_environment_types.F | 1 - src/motion/md_run.F | 3 ++- src/motion/md_util.F | 1 - src/motion/md_vel_utils.F | 3 ++- src/motion/mdctrl_methods.F | 1 - src/motion/neb_io.F | 6 ++++-- src/motion/neb_md_utils.F | 1 - src/motion/neb_methods.F | 4 +++- src/motion/neb_opt_utils.F | 3 ++- src/motion/neb_types.F | 1 - src/motion/neb_utils.F | 3 ++- src/motion/pint_gle.F | 1 - src/motion/pint_io.F | 4 +++- src/motion/pint_methods.F | 5 ++++- src/motion/pint_normalmode.F | 1 - src/motion/pint_public.F | 1 - src/motion/pint_staging.F | 1 - src/motion/pint_transformations.F | 1 - src/motion/pint_types.F | 2 +- src/motion/reftraj_types.F | 1 - src/motion/reftraj_util.F | 4 +++- src/motion/rt_propagation.F | 4 +++- src/motion/shell_opt.F | 3 ++- src/motion/simpar_methods.F | 3 ++- src/motion/thermal_region_types.F | 1 - src/motion/thermal_region_utils.F | 4 +++- src/motion/thermostat/al_system_dynamics.F | 1 - src/motion/thermostat/al_system_init.F | 1 - src/motion/thermostat/al_system_mapping.F | 1 - src/motion/thermostat/barostat_types.F | 1 - src/motion/thermostat/barostat_utils.F | 3 ++- src/motion/thermostat/csvr_system_dynamics.F | 1 - src/motion/thermostat/csvr_system_init.F | 1 - src/motion/thermostat/csvr_system_mapping.F | 1 - src/motion/thermostat/extended_system_dynamics.F | 1 - src/motion/thermostat/extended_system_init.F | 1 - src/motion/thermostat/extended_system_mapping.F | 1 - src/motion/thermostat/gle_system_dynamics.F | 1 - src/motion/thermostat/input_cp2k_barostats.F | 1 - src/motion/thermostat/thermostat_mapping.F | 1 - src/motion/thermostat/thermostat_methods.F | 3 ++- src/motion/thermostat/thermostat_types.F | 1 - src/motion/thermostat/thermostat_utils.F | 5 ++++- src/motion/velocity_verlet_control.F | 1 - src/motion/vibrational_analysis.F | 4 +++- src/motion/wiener_process.F | 1 - src/motion_utils.F | 3 ++- src/mp2.F | 4 +++- src/mp2_cphf.F | 1 - src/mp2_direct_method.F | 3 ++- src/mp2_gpw.F | 4 +++- src/mp2_laplace.F | 1 - src/mp2_optimize_ri_basis.F | 4 +++- src/mp2_ri_gpw.F | 1 - src/mp2_ri_grad.F | 1 - src/mp2_ri_grad_util.F | 1 - src/mp2_ri_libint.F | 3 ++- src/mp2_setup.F | 3 ++- src/mp2_types.F | 1 - src/mscfg_methods.F | 4 +++- src/mscfg_types.F | 1 - src/mulliken.F | 1 - src/optbas_fenv_manipulation.F | 2 +- src/optbas_opt_utils.F | 1 - src/optimize_basis.F | 4 +++- src/optimize_basis_types.F | 1 - src/optimize_basis_utils.F | 5 ++++- src/optimize_input.F | 4 +++- src/pair_potential.F | 4 +++- src/pair_potential_coulomb.F | 1 - src/pair_potential_types.F | 1 - src/pair_potential_util.F | 1 - src/pao_input.F | 3 ++- src/pao_io.F | 3 ++- src/pao_linpot_full.F | 1 - src/pao_linpot_rotinv.F | 1 - src/pao_main.F | 1 - src/pao_param.F | 2 +- src/pao_param_exp.F | 1 - src/pao_param_fock.F | 1 - src/pao_param_linpot.F | 2 +- src/pao_types.F | 1 - src/pao_utils.F | 1 - src/particle_methods.F | 3 ++- src/paw_proj_set_types.F | 3 ++- src/pexsi_interface.F | 1 - src/pexsi_methods.F | 4 +++- src/pexsi_types.F | 4 +++- src/pme.F | 1 - src/pme_tools.F | 1 - src/population_analyses.F | 1 - src/preconditioner.F | 1 - src/preconditioner_apply.F | 1 - src/preconditioner_makes.F | 1 - src/preconditioner_solvers.F | 1 - src/preconditioner_types.F | 1 - src/pw/cp_linked_list_3d_r.F | 1 - src/pw/cp_linked_list_pw.F | 1 - src/pw/cp_linked_list_rs.F | 1 - src/pw/cube_utils.F | 1 - src/pw/dct.F | 1 - src/pw/dg_rho0_types.F | 1 - src/pw/dg_types.F | 1 - src/pw/dgs.F | 1 - src/pw/dielectric_methods.F | 1 - src/pw/dielectric_types.F | 1 - src/pw/dirichlet_bc_methods.F | 4 +++- src/pw/dirichlet_bc_types.F | 1 - src/pw/dirichlet_bc_utils.F | 1 - src/pw/fft/fft_lib.F | 1 - src/pw/fft/fftw3_lib.F | 1 - src/pw/fft/mltfftsg_tools.F | 1 - src/pw/fft_tools.F | 2 +- src/pw/lazy.F | 1 - src/pw/lgrid_types.F | 1 - src/pw/mt_util.F | 1 - src/pw/ps_implicit_methods.F | 4 +++- src/pw/ps_implicit_types.F | 1 - src/pw/ps_wavelet_base.F | 1 - src/pw/ps_wavelet_fft3d.F | 1 - src/pw/ps_wavelet_kernel.F | 1 - src/pw/ps_wavelet_methods.F | 1 - src/pw/ps_wavelet_scaling_function.F | 1 - src/pw/ps_wavelet_types.F | 1 - src/pw/ps_wavelet_util.F | 1 - src/pw/pw_cuda.F | 1 - src/pw/pw_grid_info.F | 1 - src/pw/pw_grid_types.F | 1 - src/pw/pw_grids.F | 1 - src/pw/pw_methods.F | 3 ++- src/pw/pw_poisson_methods.F | 2 +- src/pw/pw_poisson_types.F | 1 - src/pw/pw_pool_types.F | 4 +++- src/pw/pw_spline_utils.F | 4 +++- src/pw/pw_types.F | 5 ++++- src/pw/realspace_grid_cube.F | 2 +- src/pw/realspace_grid_types.F | 2 +- src/pw/rs_methods.F | 1 - src/pw_env_methods.F | 3 ++- src/pw_env_types.F | 1 - src/pw_poisson_read_input.F | 1 - src/qmmm_create.F | 3 ++- src/qmmm_elpot.F | 4 +++- src/qmmm_ff_fist.F | 1 - src/qmmm_force.F | 4 +++- src/qmmm_gaussian_data.F | 1 - src/qmmm_gaussian_init.F | 3 ++- src/qmmm_gaussian_input.F | 2 +- src/qmmm_gaussian_types.F | 1 - src/qmmm_gpw_energy.F | 3 ++- src/qmmm_gpw_forces.F | 3 ++- src/qmmm_image_charge.F | 3 ++- src/qmmm_init.F | 3 ++- src/qmmm_links_methods.F | 2 +- src/qmmm_per_elpot.F | 4 +++- src/qmmm_pw_grid.F | 1 - src/qmmm_se_energy.F | 3 ++- src/qmmm_se_forces.F | 1 - src/qmmm_topology_util.F | 4 +++- src/qmmm_types.F | 1 - src/qmmm_types_low.F | 1 - src/qmmm_util.F | 2 +- src/qmmmx_create.F | 1 - src/qmmmx_force.F | 1 - src/qmmmx_types.F | 1 - src/qmmmx_update.F | 1 - src/qmmmx_util.F | 3 ++- src/qs_block_davidson_types.F | 1 - src/qs_charges_types.F | 1 - src/qs_collocate_density.F | 1 - src/qs_core_energies.F | 1 - src/qs_core_hamiltonian.F | 3 ++- src/qs_density_mixing_types.F | 1 - src/qs_dftb3_methods.F | 1 - src/qs_dftb_coulomb.F | 1 - src/qs_dftb_dispersion.F | 1 - src/qs_dftb_matrices.F | 3 ++- src/qs_dftb_parameters.F | 3 ++- src/qs_dftb_types.F | 1 - src/qs_dftb_utils.F | 3 ++- src/qs_diis.F | 4 +++- src/qs_diis_types.F | 1 - src/qs_dispersion_nonloc.F | 1 - src/qs_dispersion_pairpot.F | 3 ++- src/qs_dispersion_types.F | 1 - src/qs_dispersion_utils.F | 3 ++- src/qs_efield_berry.F | 1 - src/qs_efield_local.F | 1 - src/qs_elec_field.F | 3 ++- src/qs_electric_field_gradient.F | 3 ++- src/qs_energy.F | 1 - src/qs_energy_types.F | 1 - src/qs_energy_utils.F | 1 - src/qs_environment.F | 4 +++- src/qs_environment_methods.F | 1 - src/qs_environment_types.F | 1 - src/qs_epr_hyp.F | 3 ++- src/qs_external_density.F | 1 - src/qs_external_potential.F | 2 +- src/qs_fb_atomic_halo_types.F | 3 ++- src/qs_fb_atomic_matrix_methods.F | 1 - src/qs_fb_com_tasks_types.F | 1 - src/qs_fb_distribution_methods.F | 3 ++- src/qs_fb_env_methods.F | 3 ++- src/qs_fb_env_types.F | 1 - src/qs_fb_filter_matrix_methods.F | 1 - src/qs_fb_hash_table_types.F | 1 - src/qs_fb_input.F | 1 - src/qs_fb_matrix_data_types.F | 1 - src/qs_fb_trial_fns_types.F | 1 - src/qs_fermi_contact.F | 3 ++- src/qs_force.F | 3 ++- src/qs_force_types.F | 1 - src/qs_gapw_densities.F | 2 +- src/qs_grid_atom.F | 1 - src/qs_gspace_mixing.F | 1 - src/qs_harmonics_atom.F | 1 - src/qs_initial_guess.F | 5 ++++- src/qs_integral_utils.F | 1 - src/qs_integrate_potential.F | 1 - src/qs_integrate_potential_low.F | 1 - src/qs_integrate_potential_product.F | 1 - src/qs_integrate_potential_single.F | 1 - src/qs_interactions.F | 3 ++- src/qs_kind_types.F | 3 ++- src/qs_kinetic.F | 1 - src/qs_kpp1_env_methods.F | 4 +++- src/qs_kpp1_env_types.F | 1 - src/qs_ks_apply_restraints.F | 1 - src/qs_ks_atom.F | 1 - src/qs_ks_methods.F | 4 +++- src/qs_ks_qmmm_methods.F | 3 ++- src/qs_ks_qmmm_types.F | 1 - src/qs_ks_types.F | 1 - src/qs_ks_utils.F | 4 +++- src/qs_linres_atom_current.F | 2 +- src/qs_linres_current.F | 5 ++++- src/qs_linres_current_utils.F | 4 +++- src/qs_linres_epr_nablavks.F | 3 ++- src/qs_linres_epr_ownutils.F | 3 ++- src/qs_linres_epr_utils.F | 3 ++- src/qs_linres_issc_utils.F | 4 +++- src/qs_linres_methods.F | 4 +++- src/qs_linres_module.F | 3 ++- src/qs_linres_nmr_epr_common_utils.F | 1 - src/qs_linres_nmr_shift.F | 4 +++- src/qs_linres_nmr_utils.F | 3 ++- src/qs_linres_op.F | 4 +++- src/qs_linres_polar_utils.F | 4 +++- src/qs_linres_types.F | 1 - src/qs_loc_methods.F | 4 +++- src/qs_loc_molecules.F | 3 ++- src/qs_loc_types.F | 1 - src/qs_loc_utils.F | 5 ++++- src/qs_local_rho_types.F | 1 - src/qs_localization_methods.F | 3 ++- src/qs_matrix_pools.F | 1 - src/qs_mo_io.F | 5 ++++- src/qs_mo_methods.F | 2 +- src/qs_mo_occupation.F | 2 +- src/qs_mo_types.F | 1 - src/qs_modify_pab_block.F | 1 - src/qs_moments.F | 1 - src/qs_neighbor_list_types.F | 1 - src/qs_neighbor_lists.F | 3 ++- src/qs_oce_methods.F | 1 - src/qs_oce_types.F | 1 - src/qs_operators_ao.F | 3 ++- src/qs_ot.F | 2 +- src/qs_ot_eigensolver.F | 2 +- src/qs_ot_minimizer.F | 4 +++- src/qs_ot_scf.F | 3 ++- src/qs_ot_types.F | 1 - src/qs_outer_scf.F | 1 - src/qs_overlap.F | 1 - src/qs_p_env_methods.F | 4 +++- src/qs_p_env_types.F | 1 - src/qs_pdos.F | 5 ++++- src/qs_period_efield_types.F | 1 - src/qs_resp.F | 3 ++- src/qs_rho0_ggrid.F | 1 - src/qs_rho0_methods.F | 3 ++- src/qs_rho0_types.F | 1 - src/qs_rho_atom_methods.F | 1 - src/qs_rho_atom_types.F | 1 - src/qs_rho_methods.F | 2 +- src/qs_rho_types.F | 1 - src/qs_sccs.F | 3 ++- src/qs_scf.F | 4 +++- src/qs_scf_block_davidson.F | 1 - src/qs_scf_diagonalization.F | 3 ++- src/qs_scf_initialization.F | 4 +++- src/qs_scf_lanczos.F | 2 +- src/qs_scf_loop_utils.F | 2 +- src/qs_scf_methods.F | 1 - src/qs_scf_output.F | 3 ++- src/qs_scf_post_dftb.F | 4 +++- src/qs_scf_post_gpw.F | 5 ++++- src/qs_scf_post_scptb.F | 4 +++- src/qs_scf_post_se.F | 4 +++- src/qs_scf_types.F | 1 - src/qs_scf_wfn_mix.F | 1 - src/qs_spin_orbit.F | 3 ++- src/qs_subsys_methods.F | 1 - src/qs_subsys_types.F | 1 - src/qs_tddfpt_eigensolver.F | 3 ++- src/qs_tddfpt_module.F | 4 +++- src/qs_tddfpt_types.F | 1 - src/qs_tddfpt_utils.F | 2 +- src/qs_vxc.F | 1 - src/qs_vxc_atom.F | 1 - src/qs_wf_history_methods.F | 4 +++- src/qs_wf_history_types.F | 1 - src/rel_control_types.F | 1 - src/replica_methods.F | 5 ++++- src/replica_types.F | 4 +++- src/restraint.F | 1 - src/rmsd.F | 1 - src/rpa_communication.F | 1 - src/rpa_ri_gpw.F | 1 - src/rs_pw_interface.F | 2 +- src/rt_propagation_forces.F | 1 - src/rt_propagation_types.F | 2 +- src/rtp_admm_methods.F | 1 - src/s_square_methods.F | 1 - src/sap_kind_types.F | 1 - src/scf_control_types.F | 3 ++- src/scptb_core_interactions.F | 1 - src/scptb_core_matrix.F | 3 ++- src/scptb_ks_matrix.F | 3 ++- src/scptb_parameters.F | 1 - src/scptb_types.F | 3 ++- src/scptb_utils.F | 3 ++- src/se_core_core.F | 1 - src/se_core_matrix.F | 3 ++- src/se_fock_matrix.F | 3 ++- src/se_fock_matrix_coulomb.F | 3 ++- src/se_fock_matrix_dbg.F | 1 - src/se_fock_matrix_exchange.F | 1 - src/se_fock_matrix_integrals.F | 1 - src/semi_empirical_expns3_methods.F | 1 - src/semi_empirical_expns3_types.F | 1 - src/semi_empirical_int3_utils.F | 1 - src/semi_empirical_int_ana.F | 1 - src/semi_empirical_int_arrays.F | 1 - src/semi_empirical_int_debug.F | 8 -------- src/semi_empirical_int_debug.h | 8 -------- src/semi_empirical_int_gks.F | 1 - src/semi_empirical_int_num.F | 1 - src/semi_empirical_int_utils.F | 1 - src/semi_empirical_integrals.F | 1 - src/semi_empirical_mpole_methods.F | 1 - src/semi_empirical_mpole_types.F | 1 - src/semi_empirical_par_utils.F | 1 - src/semi_empirical_parameters.F | 1 - src/semi_empirical_store_int_types.F | 1 - src/semi_empirical_types.F | 4 +++- src/semi_empirical_utils.F | 1 - src/simpar_types.F | 1 - src/splines_methods.F | 3 ++- src/splines_types.F | 1 - src/spme.F | 1 - src/start/cp2k.F | 1 - src/start/cp2k_runs.F | 4 +++- src/start/cp2k_shell.F | 3 ++- src/start/input_cp2k.F | 1 - src/start/input_cp2k_motion.F | 1 - src/statistical_methods.F | 2 +- src/stm_images.F | 4 +++- src/subcell_types.F | 1 - src/subsys/atomic_kind_list_types.F | 1 - src/subsys/atomic_kind_types.F | 1 - src/subsys/atprop_types.F | 1 - src/subsys/cell_types.F | 1 - src/subsys/colvar_types.F | 1 - src/subsys/cp_subsys_types.F | 1 - src/subsys/damping_dipole_types.F | 1 - src/subsys/external_potential_types.F | 1 - src/subsys/force_field_kind_types.F | 1 - src/subsys/mol_kind_new_list_types.F | 1 - src/subsys/mol_new_list_types.F | 1 - src/subsys/molecule_kind_types.F | 3 ++- src/subsys/molecule_types_new.F | 1 - src/subsys/multipole_types.F | 1 - src/subsys/particle_list_types.F | 1 - src/subsys/particle_types.F | 1 - src/subsys/shell_potential_types.F | 1 - src/subsys/virial_types.F | 1 - src/surface_dipole.F | 1 - src/swarm/glbopt_history.F | 1 - src/swarm/glbopt_input.F | 1 - src/swarm/glbopt_master.F | 3 ++- src/swarm/glbopt_mincrawl.F | 3 ++- src/swarm/glbopt_minhop.F | 1 - src/swarm/glbopt_worker.F | 1 - src/swarm/swarm.F | 3 ++- src/swarm/swarm_input.F | 1 - src/swarm/swarm_master.F | 3 ++- src/swarm/swarm_message.F | 1 - src/swarm/swarm_mpi.F | 3 ++- src/swarm/swarm_worker.F | 3 ++- src/t_c_g0.F | 1 - src/t_sh_p_s_c.F | 1 - src/taper_types.F | 1 - src/task_list_methods.F | 1 - src/task_list_types.F | 1 - src/tmc/input_cp2k_tmc.F | 1 - src/tmc/tmc_analysis.F | 2 +- src/tmc/tmc_analysis_types.F | 1 - src/tmc/tmc_calculations.F | 2 +- src/tmc/tmc_cancelation.F | 2 +- src/tmc/tmc_dot_tree.F | 2 +- src/tmc/tmc_file_io.F | 2 +- src/tmc/tmc_master.F | 2 +- src/tmc/tmc_messages.F | 2 +- src/tmc/tmc_move_handle.F | 2 +- src/tmc/tmc_move_types.F | 1 - src/tmc/tmc_moves.F | 2 +- src/tmc/tmc_setup.F | 10 ++++------ src/tmc/tmc_stati.F | 1 - src/tmc/tmc_tree_acceptance.F | 2 +- src/tmc/tmc_tree_build.F | 2 +- src/tmc/tmc_tree_references.F | 2 +- src/tmc/tmc_tree_search.F | 2 +- src/tmc/tmc_tree_types.F | 1 - src/tmc/tmc_types.F | 1 - src/tmc/tmc_utils.F | 1 - src/tmc/tmc_worker.F | 2 +- src/topology.F | 3 ++- src/topology_amber.F | 4 +++- src/topology_cif.F | 4 +++- src/topology_connectivity_util.F | 4 +++- src/topology_constraint_util.F | 4 +++- src/topology_coordinate_util.F | 3 ++- src/topology_cp2k.F | 3 ++- src/topology_generate_util.F | 5 ++++- src/topology_gromos.F | 3 ++- src/topology_input.F | 3 ++- src/topology_multiple_unit_cell.F | 1 - src/topology_pdb.F | 3 ++- src/topology_psf.F | 5 ++++- src/topology_types.F | 1 - src/topology_util.F | 5 ++++- src/topology_xtl.F | 4 +++- src/topology_xyz.F | 3 ++- src/transport.F | 4 +++- src/transport_env_types.F | 1 - src/virial_methods.F | 1 - src/wannier_states.F | 4 +++- src/wannier_states_types.F | 1 - src/xas_control.F | 4 +++- src/xas_env_types.F | 1 - src/xas_methods.F | 5 ++++- src/xas_restart.F | 4 +++- src/xas_tp_scf.F | 5 ++++- src/xc/cp_linked_list_xc_deriv.F | 1 - src/xc/xc.F | 5 ++++- src/xc/xc_atom.F | 1 - src/xc/xc_b97.F | 1 - src/xc/xc_cs1.F | 1 - src/xc/xc_derivative_desc.F | 1 - src/xc/xc_derivative_set_types.F | 1 - src/xc/xc_derivative_types.F | 1 - src/xc/xc_derivatives.F | 1 - src/xc/xc_exchange_gga.F | 2 +- src/xc/xc_functionals_utilities.F | 1 - src/xc/xc_hcth.F | 2 +- src/xc/xc_ke_gga.F | 1 - src/xc/xc_libxc.F | 1 - src/xc/xc_libxc_wrap.F | 1 - src/xc/xc_lyp.F | 1 - src/xc/xc_lyp_adiabatic.F | 1 - src/xc/xc_optx.F | 1 - src/xc/xc_pade.F | 1 - src/xc/xc_pbe.F | 1 - src/xc/xc_perdew86.F | 1 - src/xc/xc_perdew_wang.F | 1 - src/xc/xc_perdew_zunger.F | 1 - src/xc/xc_rho_cflags_types.F | 1 - src/xc/xc_rho_set_types.F | 1 - src/xc/xc_tfw.F | 1 - src/xc/xc_thomas_fermi.F | 1 - src/xc/xc_tpss.F | 3 ++- src/xc/xc_vwn.F | 1 - src/xc/xc_xalpha.F | 1 - src/xc/xc_xbecke88.F | 1 - src/xc/xc_xbecke88_long_range.F | 1 - src/xc/xc_xbecke88_lr_adiabatic.F | 1 - src/xc/xc_xbecke_roussel.F | 1 - src/xc/xc_xbeef.F | 1 - src/xc/xc_xbr_pbe_lda_hole_t_c_lr.F | 1 - src/xc/xc_xlda_hole_t_c_lr.F | 1 - src/xc/xc_xpbe_hole_t_c_lr.F | 1 - src/xc/xc_xwpbe.F | 1 - src/xc_adiabatic_methods.F | 1 - src/xc_adiabatic_utils.F | 1 - src/xc_pot_saop.F | 1 - src/xc_write_output.F | 1 - src/xray_diffraction.F | 1 - 895 files changed, 776 insertions(+), 946 deletions(-) delete mode 100644 src/common/cp_common_uses.f90 diff --git a/src/admm_dm_methods.F b/src/admm_dm_methods.F index 07ccbe1a71..f4cda18fb4 100644 --- a/src/admm_dm_methods.F +++ b/src/admm_dm_methods.F @@ -21,6 +21,7 @@ MODULE admm_dm_methods cp_dbcsr_iterator_start, cp_dbcsr_iterator_stop, cp_dbcsr_multiply, & cp_dbcsr_p_type, cp_dbcsr_release, cp_dbcsr_scale, cp_dbcsr_set, & cp_dbcsr_type + USE cp_log_handling, ONLY: cp_logger_get_default_unit_nr USE input_constants, ONLY: do_admm_basis_projection,& do_admm_blocked_projection USE iterate_matrix, ONLY: invert_Hotelling @@ -32,7 +33,6 @@ MODULE admm_dm_methods USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_set,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/admm_dm_types.F b/src/admm_dm_types.F index 23da78f4bd..9d022a7d57 100644 --- a/src/admm_dm_types.F +++ b/src/admm_dm_types.F @@ -16,7 +16,6 @@ MODULE admm_dm_types USE input_constants, ONLY: do_admm_basis_projection,& do_admm_purify_mcweeny USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/admm_methods.F b/src/admm_methods.F index 9ca6562954..e5c1113148 100644 --- a/src/admm_methods.F +++ b/src/admm_methods.F @@ -46,6 +46,8 @@ MODULE admm_methods cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -78,7 +80,6 @@ MODULE admm_methods qs_rho_set,& qs_rho_type USE qs_vxc, ONLY: qs_vxc_create -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/admm_types.F b/src/admm_types.F index 6ca36c34d0..c8be2d1551 100644 --- a/src/admm_types.F +++ b/src/admm_types.F @@ -29,7 +29,6 @@ MODULE admm_types USE kinds, ONLY: dp USE qs_mo_types, ONLY: get_mo_set,& mo_set_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/admm_utils.F b/src/admm_utils.F index cb3bffd30f..3d4305caa1 100644 --- a/src/admm_utils.F +++ b/src/admm_utils.F @@ -26,7 +26,6 @@ MODULE admm_utils do_admm_purify_mo_no_diag,& do_admm_purify_none USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/al_system_types.F b/src/al_system_types.F index f58ecd3253..c9e3f2f09d 100644 --- a/src/al_system_types.F +++ b/src/al_system_types.F @@ -17,7 +17,6 @@ MODULE al_system_types section_vals_val_get USE kinds, ONLY: dp USE simpar_types, ONLY: simpar_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/almo_scf.F b/src/almo_scf.F index bb1f829352..f8225e56a0 100644 --- a/src/almo_scf.F +++ b/src/almo_scf.F @@ -38,6 +38,9 @@ MODULE almo_scf cp_dbcsr_release, cp_dbcsr_reserve_block2d, cp_dbcsr_set, & cp_dbcsr_type, cp_dbcsr_work_create, dbcsr_distribution_mp, & dbcsr_mp_mynode, dbcsr_type_no_symmetry, dbcsr_type_symmetric + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_para_env, ONLY: cp_para_env_release,& cp_para_env_retain USE domain_submatrix_methods, ONLY: init_submatrices,& @@ -62,7 +65,6 @@ MODULE almo_scf molecule_type USE qs_environment_types, ONLY: get_qs_env,& qs_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/almo_scf_diis_types.F b/src/almo_scf_diis_types.F index a2245c1490..ce522e8d5e 100644 --- a/src/almo_scf_diis_types.F +++ b/src/almo_scf_diis_types.F @@ -18,6 +18,9 @@ MODULE almo_scf_diis_types cp_dbcsr_set,& cp_dbcsr_trace,& cp_dbcsr_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE domain_submatrix_methods, ONLY: add_submatrices,& copy_submatrices,& init_submatrices,& @@ -25,7 +28,6 @@ MODULE almo_scf_diis_types set_submatrices USE domain_submatrix_types, ONLY: domain_submatrix_type USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/almo_scf_methods.F b/src/almo_scf_methods.F index 6595aa0173..be6b489e47 100644 --- a/src/almo_scf_methods.F +++ b/src/almo_scf_methods.F @@ -26,6 +26,9 @@ MODULE almo_scf_methods cp_dbcsr_type, cp_dbcsr_work_create, dbcsr_distribution_mp, & dbcsr_mp_group, dbcsr_mp_numnodes, dbcsr_norm_maxabsnorm, & dbcsr_type_no_symmetry, dbcsr_type_symmetric + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE domain_submatrix_methods, ONLY: & add_submatrices, construct_dbcsr_from_submatrices, & construct_submatrices, copy_submatrices, copy_submatrix_data, & @@ -42,7 +45,6 @@ MODULE almo_scf_methods matrix_sqrt_Newton_Schulz USE kinds, ONLY: dp USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/almo_scf_optimizer.F b/src/almo_scf_optimizer.F index 5261f58eb2..8a94a8ec8f 100644 --- a/src/almo_scf_optimizer.F +++ b/src/almo_scf_optimizer.F @@ -52,6 +52,9 @@ MODULE almo_scf_optimizer USE cp_external_control, ONLY: external_control USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE ct_methods, ONLY: analytic_line_search,& ct_step_execute,& diagonalize_diagonal_blocks @@ -80,7 +83,6 @@ MODULE almo_scf_optimizer m_walltime USE qs_environment_types, ONLY: get_qs_env,& qs_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/almo_scf_qs.F b/src/almo_scf_qs.F index e7661f3735..7b2d63292b 100644 --- a/src/almo_scf_qs.F +++ b/src/almo_scf_qs.F @@ -41,6 +41,9 @@ MODULE almo_scf_qs dbcsr_distribution_row_clusters, dbcsr_distribution_row_dist, & dbcsr_mp_group, dbcsr_mp_mynode, dbcsr_mp_numnodes, & dbcsr_type_no_symmetry + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_para_types, ONLY: cp_para_env_type USE cp_units, ONLY: cp_unit_to_cp2k USE input_constants, ONLY: & @@ -75,7 +78,6 @@ MODULE almo_scf_qs USE qs_rho_methods, ONLY: qs_rho_update_rho USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/almo_scf_types.F b/src/almo_scf_types.F index 5bfe036410..1caf7ab4be 100644 --- a/src/almo_scf_types.F +++ b/src/almo_scf_types.F @@ -20,7 +20,6 @@ MODULE almo_scf_types cg_hestenes_stiefel, cg_liu_storey, cg_polak_ribiere, cg_zero, & optimizer_diis, optimizer_pcg, prec_default, prec_zero USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_angmom.F b/src/aobasis/ai_angmom.F index bf152b4aa1..c70d14e7c2 100644 --- a/src/aobasis/ai_angmom.F +++ b/src/aobasis/ai_angmom.F @@ -18,7 +18,6 @@ MODULE ai_angmom USE mathconstants, ONLY: pi USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_contraction.F b/src/aobasis/ai_contraction.F index 5911cb8357..045b3fbc3b 100644 --- a/src/aobasis/ai_contraction.F +++ b/src/aobasis/ai_contraction.F @@ -16,7 +16,6 @@ MODULE ai_contraction USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_coulomb.F b/src/aobasis/ai_coulomb.F index 33b7c9d3e5..2e6796e0e5 100644 --- a/src/aobasis/ai_coulomb.F +++ b/src/aobasis/ai_coulomb.F @@ -43,7 +43,6 @@ MODULE ai_coulomb USE mathconstants, ONLY: pi USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_coulomb_test.F b/src/aobasis/ai_coulomb_test.F index 3ae89dae9d..d75f3270d4 100644 --- a/src/aobasis/ai_coulomb_test.F +++ b/src/aobasis/ai_coulomb_test.F @@ -18,7 +18,6 @@ MODULE ai_coulomb_test init_orbital_pointers,& nco,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_derivatives.F b/src/aobasis/ai_derivatives.F index 3f2a17b8e5..25ce2974c8 100644 --- a/src/aobasis/ai_derivatives.F +++ b/src/aobasis/ai_derivatives.F @@ -34,7 +34,6 @@ MODULE ai_derivatives USE kinds, ONLY: dp USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_elec_field.F b/src/aobasis/ai_elec_field.F index 98d642a004..b07fa75774 100644 --- a/src/aobasis/ai_elec_field.F +++ b/src/aobasis/ai_elec_field.F @@ -39,7 +39,6 @@ MODULE ai_elec_field USE mathconstants, ONLY: pi USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_eri_debug.F b/src/aobasis/ai_eri_debug.F index fe93266298..972daea53c 100644 --- a/src/aobasis/ai_eri_debug.F +++ b/src/aobasis/ai_eri_debug.F @@ -17,7 +17,6 @@ MODULE ai_eri_debug USE gamma, ONLY: fgamma_ref USE kinds, ONLY: dp USE mathconstants, ONLY: pi -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_fermi_contact.F b/src/aobasis/ai_fermi_contact.F index eb4de47b87..0a61569509 100644 --- a/src/aobasis/ai_fermi_contact.F +++ b/src/aobasis/ai_fermi_contact.F @@ -30,7 +30,6 @@ MODULE ai_fermi_contact USE mathconstants, ONLY: pi USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_kinetic.F b/src/aobasis/ai_kinetic.F index 916500435c..7fd144ca17 100644 --- a/src/aobasis/ai_kinetic.F +++ b/src/aobasis/ai_kinetic.F @@ -21,7 +21,6 @@ MODULE ai_kinetic USE mathconstants, ONLY: pi USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_moments.F b/src/aobasis/ai_moments.F index 05e1d77b00..dd2ec78146 100644 --- a/src/aobasis/ai_moments.F +++ b/src/aobasis/ai_moments.F @@ -35,7 +35,6 @@ MODULE ai_moments USE orbital_pointers, ONLY: coset,& indco,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_onecenter.F b/src/aobasis/ai_onecenter.F index 81f001308f..8884379591 100644 --- a/src/aobasis/ai_onecenter.F +++ b/src/aobasis/ai_onecenter.F @@ -32,7 +32,6 @@ MODULE ai_onecenter gamma0,& gamma1,& pi -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_oneelectron.F b/src/aobasis/ai_oneelectron.F index 042567e3b9..b0aaabc0a3 100644 --- a/src/aobasis/ai_oneelectron.F +++ b/src/aobasis/ai_oneelectron.F @@ -34,7 +34,6 @@ MODULE ai_oneelectron USE kinds, ONLY: dp USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_os_rr.F b/src/aobasis/ai_os_rr.F index fc679cffc9..74500423b1 100644 --- a/src/aobasis/ai_os_rr.F +++ b/src/aobasis/ai_os_rr.F @@ -8,7 +8,6 @@ MODULE ai_os_rr USE gamma, ONLY: fgamma=>fgamma_0 USE kinds, ONLY: dp USE orbital_pointers, ONLY: coset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_overlap.F b/src/aobasis/ai_overlap.F index 6ee43a0435..087f63ff47 100644 --- a/src/aobasis/ai_overlap.F +++ b/src/aobasis/ai_overlap.F @@ -19,7 +19,6 @@ MODULE ai_overlap USE mathconstants, ONLY: pi USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_overlap3.F b/src/aobasis/ai_overlap3.F index 5f14edffb5..979f6672c9 100644 --- a/src/aobasis/ai_overlap3.F +++ b/src/aobasis/ai_overlap3.F @@ -47,7 +47,6 @@ MODULE ai_overlap3 USE mathconstants, ONLY: pi USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_overlap3_debug.F b/src/aobasis/ai_overlap3_debug.F index 001f7b6147..9ed283b1c5 100644 --- a/src/aobasis/ai_overlap3_debug.F +++ b/src/aobasis/ai_overlap3_debug.F @@ -15,7 +15,6 @@ MODULE ai_overlap3_debug USE kinds, ONLY: dp USE mathconstants, ONLY: pi -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_overlap_aabb.F b/src/aobasis/ai_overlap_aabb.F index e28590e271..077eb258f1 100644 --- a/src/aobasis/ai_overlap_aabb.F +++ b/src/aobasis/ai_overlap_aabb.F @@ -29,7 +29,6 @@ MODULE ai_overlap_aabb USE orbital_pointers, ONLY: coset,& indco,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_overlap_debug.F b/src/aobasis/ai_overlap_debug.F index 27b37098b0..bc94dc2391 100644 --- a/src/aobasis/ai_overlap_debug.F +++ b/src/aobasis/ai_overlap_debug.F @@ -15,7 +15,6 @@ MODULE ai_overlap_debug USE kinds, ONLY: dp USE mathconstants, ONLY: pi -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_overlap_ppl.F b/src/aobasis/ai_overlap_ppl.F index 32944c4c22..b9b9ac92be 100644 --- a/src/aobasis/ai_overlap_ppl.F +++ b/src/aobasis/ai_overlap_ppl.F @@ -27,7 +27,6 @@ MODULE ai_overlap_ppl USE kinds, ONLY: dp USE mathconstants, ONLY: fac,& pi -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_shg_overlap.F b/src/aobasis/ai_shg_overlap.F index 4f29c6dcbc..110fff2950 100644 --- a/src/aobasis/ai_shg_overlap.F +++ b/src/aobasis/ai_shg_overlap.F @@ -22,7 +22,6 @@ MODULE ai_shg_overlap USE orbital_pointers, ONLY: indso,& indso_inv,& nsoset_pm -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_spin_orbit.F b/src/aobasis/ai_spin_orbit.F index 3d27c8f04f..1d33e0dd43 100644 --- a/src/aobasis/ai_spin_orbit.F +++ b/src/aobasis/ai_spin_orbit.F @@ -38,7 +38,6 @@ MODULE ai_spin_orbit USE mathconstants, ONLY: pi USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ai_verfc.F b/src/aobasis/ai_verfc.F index ff1d573dfb..f4bc1d32a7 100644 --- a/src/aobasis/ai_verfc.F +++ b/src/aobasis/ai_verfc.F @@ -85,7 +85,6 @@ MODULE ai_verfc USE mathconstants, ONLY: pi USE orbital_pointers, ONLY: coset,& ncoset -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/ao_util.F b/src/aobasis/ao_util.F index ce240a6c5f..e4898e1dbd 100644 --- a/src/aobasis/ao_util.F +++ b/src/aobasis/ao_util.F @@ -25,7 +25,6 @@ MODULE ao_util nsoset USE orbital_transformation_matrices, ONLY: orbtramat USE termination, ONLY: stop_memory -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/basis_set_container_types.F b/src/aobasis/basis_set_container_types.F index 091e523b1a..43020c0213 100644 --- a/src/aobasis/basis_set_container_types.F +++ b/src/aobasis/basis_set_container_types.F @@ -13,7 +13,6 @@ MODULE basis_set_container_types USE basis_set_types, ONLY: deallocate_gto_basis_set,& gto_basis_set_type USE kinds, ONLY: default_string_length -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/basis_set_types.F b/src/aobasis/basis_set_types.F index dde2d447be..197577871a 100644 --- a/src/aobasis/basis_set_types.F +++ b/src/aobasis/basis_set_types.F @@ -48,7 +48,6 @@ MODULE basis_set_types USE string_utilities, ONLY: integer_to_string,& remove_word,& uppercase -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/orbital_pointers.F b/src/aobasis/orbital_pointers.F index 041ba59509..a754f9307c 100644 --- a/src/aobasis/orbital_pointers.F +++ b/src/aobasis/orbital_pointers.F @@ -28,7 +28,6 @@ MODULE orbital_pointers USE kinds, ONLY: int_size USE termination, ONLY: stop_memory -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/orbital_symbols.F b/src/aobasis/orbital_symbols.F index d11483b92f..a60207d230 100644 --- a/src/aobasis/orbital_symbols.F +++ b/src/aobasis/orbital_symbols.F @@ -14,7 +14,6 @@ MODULE orbital_symbols ! Index: ! FUNCTION cgf_symbol(n,lxyz) RESULT(symbol) ! FUNCTION sgf_symbol(n,l,m) RESULT(symbol) -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE CHARACTER(len=*), PARAMETER, PRIVATE :: moduleN = 'orbital_symbols' diff --git a/src/aobasis/orbital_transformation_matrices.F b/src/aobasis/orbital_transformation_matrices.F index 0e8168b632..ee1550fe60 100644 --- a/src/aobasis/orbital_transformation_matrices.F +++ b/src/aobasis/orbital_transformation_matrices.F @@ -30,7 +30,6 @@ MODULE orbital_transformation_matrices USE orbital_symbols, ONLY: cgf_symbol,& sgf_symbol USE termination, ONLY: stop_memory -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/soft_basis_set.F b/src/aobasis/soft_basis_set.F index 5a58056641..bbe4b8205e 100644 --- a/src/aobasis/soft_basis_set.F +++ b/src/aobasis/soft_basis_set.F @@ -23,7 +23,6 @@ MODULE soft_basis_set nso USE orbital_symbols, ONLY: cgf_symbol,& sgf_symbol -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/aobasis/sto_ng.F b/src/aobasis/sto_ng.F index 830b8e7865..9ee08a301d 100644 --- a/src/aobasis/sto_ng.F +++ b/src/aobasis/sto_ng.F @@ -11,7 +11,6 @@ MODULE sto_ng USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom.F b/src/atom.F index aba2c1d838..3d4c2921d2 100644 --- a/src/atom.F +++ b/src/atom.F @@ -8,6 +8,8 @@ MODULE atom USE atom_basis, ONLY: atom_basis_opt USE atom_energy, ONLY: atom_energy_opt USE atom_pseudo, ONLY: atom_pseudo_opt + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE header, ONLY: atom_footer,& @@ -21,7 +23,6 @@ MODULE atom section_vals_val_get USE periodic_table, ONLY: nelem,& ptable -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_basis.F b/src/atom_basis.F index 6c8a240639..89f39bebc3 100644 --- a/src/atom_basis.F +++ b/src/atom_basis.F @@ -20,6 +20,8 @@ MODULE atom_basis atom_set_occupation,& get_maxl_occ,& get_maxn_occ + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_constants, ONLY: do_analytic @@ -31,7 +33,6 @@ MODULE atom_basis dp USE periodic_table, ONLY: nelem,& ptable -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_electronic_structure.F b/src/atom_electronic_structure.F index f31ffae499..1a6954ec9f 100644 --- a/src/atom_electronic_structure.F +++ b/src/atom_electronic_structure.F @@ -38,7 +38,6 @@ MODULE atom_electronic_structure section_vals_type,& section_vals_val_get USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_energy.F b/src/atom_energy.F index 105c563a11..61644e0fe5 100644 --- a/src/atom_energy.F +++ b/src/atom_energy.F @@ -34,6 +34,8 @@ MODULE atom_energy get_maxl_occ, get_maxn_occ USE atom_xc, ONLY: calculate_atom_ext_vxc,& calculate_atom_zmp + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_constants, ONLY: do_analytic @@ -49,7 +51,6 @@ MODULE atom_energy USE periodic_table, ONLY: nelem,& ptable USE physcon, ONLY: evolt -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_fit.F b/src/atom_fit.F index c5d44dfdb8..fcd8d9425c 100644 --- a/src/atom_fit.F +++ b/src/atom_fit.F @@ -40,7 +40,6 @@ MODULE atom_fit evolt USE powell, ONLY: opt_state_type,& powell_optimize -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_kind_orbitals.F b/src/atom_kind_orbitals.F index 9d4e9e8a47..3728e3d1a9 100644 --- a/src/atom_kind_orbitals.F +++ b/src/atom_kind_orbitals.F @@ -48,7 +48,6 @@ MODULE atom_kind_orbitals init_atom_electronic_state,& qs_kind_type USE rel_control_types, ONLY: rel_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_operators.F b/src/atom_operators.F index 1a38132b2c..bb53db93f8 100644 --- a/src/atom_operators.F +++ b/src/atom_operators.F @@ -37,7 +37,6 @@ MODULE atom_operators USE periodic_table, ONLY: ptable USE physcon, ONLY: a_fine USE qs_grid_atom, ONLY: grid_atom_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_optimization.F b/src/atom_optimization.F index c685b59834..e5d099ca33 100644 --- a/src/atom_optimization.F +++ b/src/atom_optimization.F @@ -10,7 +10,6 @@ MODULE atom_optimization USE atom_types, ONLY: atom_optimization_type USE kinds, ONLY: dp USE lapack, ONLY: lapack_sgelss -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_output.F b/src/atom_output.F index 3e65d59f63..91fbd75daa 100644 --- a/src/atom_output.F +++ b/src/atom_output.F @@ -32,7 +32,6 @@ MODULE atom_output USE physcon, ONLY: evolt USE xc_derivatives, ONLY: xc_functional_get_info USE xc_libxc, ONLY: libxc_version_info -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_pseudo.F b/src/atom_pseudo.F index a92da23bea..437ce5c124 100644 --- a/src/atom_pseudo.F +++ b/src/atom_pseudo.F @@ -27,6 +27,8 @@ MODULE atom_pseudo atom_set_occupation,& get_maxl_occ,& get_maxn_occ + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_constants, ONLY: do_analytic @@ -39,7 +41,6 @@ MODULE atom_pseudo USE periodic_table, ONLY: nelem,& ptable USE physcon, ONLY: bohr -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_types.F b/src/atom_types.F index b1cc9e5e4e..d0c865aa9e 100644 --- a/src/atom_types.F +++ b/src/atom_types.F @@ -44,7 +44,6 @@ MODULE atom_types grid_atom_type USE string_utilities, ONLY: remove_word,& uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_utils.F b/src/atom_utils.F index d1337468cb..99a275bc38 100644 --- a/src/atom_utils.F +++ b/src/atom_utils.F @@ -40,7 +40,6 @@ MODULE atom_utils ptable USE qs_grid_atom, ONLY: grid_atom_type USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atom_xc.F b/src/atom_xc.F index f11e9bd242..171bb6b320 100644 --- a/src/atom_xc.F +++ b/src/atom_xc.F @@ -40,7 +40,6 @@ MODULE atom_xc USE xc_rho_set_types, ONLY: xc_rho_set_create,& xc_rho_set_release,& xc_rho_set_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atomic_charges.F b/src/atomic_charges.F index 36e6a23a40..e8dfe52499 100644 --- a/src/atomic_charges.F +++ b/src/atomic_charges.F @@ -15,7 +15,6 @@ MODULE atomic_charges USE particle_types, ONLY: particle_type USE qs_kind_types, ONLY: get_qs_kind,& qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/atoms_input.F b/src/atoms_input.F index 9e0efbf1f3..9fbe0287c3 100644 --- a/src/atoms_input.F +++ b/src/atoms_input.F @@ -23,6 +23,8 @@ MODULE atoms_input scaled_to_real USE cp_linked_list_val, ONLY: cp_sll_val_next,& cp_sll_val_type + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit,& + cp_to_string USE cp_parser_methods, ONLY: read_float_object USE cp_units, ONLY: cp_unit_to_cp2k USE input_section_types, ONLY: section_vals_get,& @@ -44,7 +46,6 @@ MODULE atoms_input USE string_utilities, ONLY: uppercase USE topology_types, ONLY: atom_info_type,& topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/beta_gamma_psi.F b/src/beta_gamma_psi.F index 18c30d90c5..4e061a5cdf 100644 --- a/src/beta_gamma_psi.F +++ b/src/beta_gamma_psi.F @@ -8,7 +8,6 @@ MODULE beta_gamma_psi ! not tested in the case where dp would stand for single precision USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/block_p_types.F b/src/block_p_types.F index 11fae842da..4c5b5cc153 100644 --- a/src/block_p_types.F +++ b/src/block_p_types.F @@ -12,7 +12,6 @@ MODULE block_p_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/bsse.F b/src/bsse.F index 05b4764d4c..dfe0a22cee 100644 --- a/src/bsse.F +++ b/src/bsse.F @@ -14,6 +14,8 @@ MODULE bsse USE cell_types, ONLY: cell_type USE cp2k_info, ONLY: write_restart_header USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_print_key_finished_output,& @@ -46,7 +48,6 @@ MODULE bsse qs_env_release,& qs_environment_type USE string_utilities, ONLY: compress -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cell_methods.F b/src/cell_methods.F index a3cb06ea57..fe81efa55d 100644 --- a/src/cell_methods.F +++ b/src/cell_methods.F @@ -15,6 +15,8 @@ MODULE cell_methods cell_clone, cell_create, cell_sym_none, cell_type, get_cell, & init_cell, set_cell_param, use_perd_none, use_perd_x, use_perd_xy, & use_perd_xyz, use_perd_xz, use_perd_y, use_perd_yz, use_perd_z + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -40,7 +42,6 @@ MODULE cell_methods dp USE mathconstants, ONLY: degree USE mathlib, ONLY: angle -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/colvar_methods.F b/src/colvar_methods.F index 74ced39543..89e26ea677 100644 --- a/src/colvar_methods.F +++ b/src/colvar_methods.F @@ -29,6 +29,10 @@ MODULE colvar_methods torsion_colvar_id, u_colvar_id, xyz_diag_colvar_id, & xyz_outerdiag_colvar_id USE constraint_fxd, ONLY: check_fixed_atom_cns_colv + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -93,7 +97,6 @@ MODULE colvar_methods USE string_utilities, ONLY: compress,& uppercase USE wannier_states_types, ONLY: wannier_centres_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/colvar_utils.F b/src/colvar_utils.F index 6d3a0b377d..f69d75d929 100644 --- a/src/colvar_utils.F +++ b/src/colvar_utils.F @@ -42,7 +42,6 @@ MODULE colvar_utils USE rmsd, ONLY: rmsd3 USE string_utilities, ONLY: uppercase USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/bessel_lib.F b/src/common/bessel_lib.F index 7516f74088..6bb590d604 100644 --- a/src/common/bessel_lib.F +++ b/src/common/bessel_lib.F @@ -17,7 +17,6 @@ MODULE bessel_lib USE kinds, ONLY: dp USE mathconstants, ONLY: fac,& pi -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/bibliography.F b/src/common/bibliography.F index 5e4575246c..55b5fd6811 100644 --- a/src/common/bibliography.F +++ b/src/common/bibliography.F @@ -31,7 +31,6 @@ MODULE bibliography USE reference_manager, ONLY: add_reference,& cite_reference USE string_utilities, ONLY: s2a -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cg_test.F b/src/common/cg_test.F index 77840ce532..da090adba1 100644 --- a/src/common/cg_test.F +++ b/src/common/cg_test.F @@ -12,6 +12,7 @@ MODULE cg_test + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE kinds, ONLY: dp USE lebedev, ONLY: deallocate_lebedev_grids,& get_number_of_lebedev_grid,& @@ -23,7 +24,6 @@ MODULE cg_test clebsch_gordon_deallocate,& clebsch_gordon_init,& y_lm -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cp_array_sort_i4.F b/src/common/cp_array_sort_i4.F index a94631b6c5..10a2d37262 100644 --- a/src/common/cp_array_sort_i4.F +++ b/src/common/cp_array_sort_i4.F @@ -12,7 +12,6 @@ !> CP2K: !> Please use the interface definded in util.F for calling sort(). !> This could not go into cp_array__nametype1__utils.template because -!> there some routines use the error-handling from cp_common_uses.f90, !> which in turn uses timings.F, which uses sort() :-( !> !> DBCSR: @@ -28,7 +27,6 @@ MODULE cp_array_sort_i4 USE kinds, ONLY: int_4 -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cp_array_sort_i8.F b/src/common/cp_array_sort_i8.F index 0e5cb6548f..57b5e5be02 100644 --- a/src/common/cp_array_sort_i8.F +++ b/src/common/cp_array_sort_i8.F @@ -12,7 +12,6 @@ !> CP2K: !> Please use the interface definded in util.F for calling sort(). !> This could not go into cp_array__nametype1__utils.template because -!> there some routines use the error-handling from cp_common_uses.f90, !> which in turn uses timings.F, which uses sort() :-( !> !> DBCSR: @@ -28,7 +27,6 @@ MODULE cp_array_sort_i8 USE kinds, ONLY: int_8 -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cp_array_sort_r.F b/src/common/cp_array_sort_r.F index c7859935c1..0595a3e955 100644 --- a/src/common/cp_array_sort_r.F +++ b/src/common/cp_array_sort_r.F @@ -12,7 +12,6 @@ !> CP2K: !> Please use the interface definded in util.F for calling sort(). !> This could not go into cp_array__nametype1__utils.template because -!> there some routines use the error-handling from cp_common_uses.f90, !> which in turn uses timings.F, which uses sort() :-( !> !> DBCSR: @@ -28,7 +27,6 @@ MODULE cp_array_sort_r USE kinds, ONLY: dp -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cp_array_utils_i.F b/src/common/cp_array_utils_i.F index b4c170e138..eb83959d57 100644 --- a/src/common/cp_array_utils_i.F +++ b/src/common/cp_array_utils_i.F @@ -40,9 +40,9 @@ !> \author Fawzi Mohamed ! ***************************************************************************** MODULE cp_array_utils_i + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: int_4 USE machine, ONLY: m_flush -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cp_array_utils_logical.F b/src/common/cp_array_utils_logical.F index feaf75452a..4b47c942d4 100644 --- a/src/common/cp_array_utils_logical.F +++ b/src/common/cp_array_utils_logical.F @@ -40,9 +40,9 @@ !> \author Fawzi Mohamed ! ***************************************************************************** MODULE cp_array_utils_logical + USE cp_log_handling, ONLY: cp_to_string USE machine, ONLY: m_flush ! dummy line needed for coverage broadcasting -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cp_array_utils_r.F b/src/common/cp_array_utils_r.F index 2f34aa202d..ea8e7a5f56 100644 --- a/src/common/cp_array_utils_r.F +++ b/src/common/cp_array_utils_r.F @@ -40,9 +40,9 @@ !> \author Fawzi Mohamed ! ***************************************************************************** MODULE cp_array_utils_r + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE machine, ONLY: m_flush -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cp_common_uses.f90 b/src/common/cp_common_uses.f90 deleted file mode 100644 index 3414e17bd4..0000000000 --- a/src/common/cp_common_uses.f90 +++ /dev/null @@ -1,8 +0,0 @@ -! Common use statements and preprocessor macros -! should be included in the use statements - USE cp_log_handling, ONLY: cp_to_string,& - cp_logger_type,& - cp_get_default_logger,& - cp_logger_get_default_io_unit,& - cp_logger_get_default_unit_nr,& - cp_logger_get_unit_nr diff --git a/src/common/cp_para_env.F b/src/common/cp_para_env.F index 8d1f7d25ce..86ed1b8d30 100644 --- a/src/common/cp_para_env.F +++ b/src/common/cp_para_env.F @@ -15,7 +15,6 @@ MODULE cp_para_env cp_para_env_type USE message_passing, ONLY: mp_comm_free,& mp_environ -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cp_result_methods.F b/src/common/cp_result_methods.F index 79d0571400..0c59c8f9ca 100644 --- a/src/common/cp_result_methods.F +++ b/src/common/cp_result_methods.F @@ -23,7 +23,6 @@ MODULE cp_result_methods dp USE memory_utilities, ONLY: reallocate USE message_passing, ONLY: mp_bcast -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cp_result_types.F b/src/common/cp_result_types.F index 0144429b8f..c5adacde55 100644 --- a/src/common/cp_result_types.F +++ b/src/common/cp_result_types.F @@ -17,7 +17,6 @@ MODULE cp_result_types USE kinds, ONLY: default_string_length,& dp -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/cp_units.F b/src/common/cp_units.F index 67101063a5..257dbbc12d 100644 --- a/src/common/cp_units.F +++ b/src/common/cp_units.F @@ -27,6 +27,7 @@ ! ***************************************************************************** MODULE cp_units + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: default_string_length,& dp USE mathconstants, ONLY: radians,& @@ -37,7 +38,6 @@ MODULE cp_units USE string_utilities, ONLY: compress,& s2a,& uppercase -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/distribution_1d_types.F b/src/common/distribution_1d_types.F index fd1b96d489..643ff16375 100644 --- a/src/common/distribution_1d_types.F +++ b/src/common/distribution_1d_types.F @@ -27,7 +27,6 @@ MODULE distribution_1d_types USE cp_para_types, ONLY: cp_para_env_type USE parallel_rng_types, ONLY: delete_rng_stream,& rng_stream_p_type -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/eigenvalueproblems.F b/src/common/eigenvalueproblems.F index 5e748e4d51..c6eaddb4f6 100644 --- a/src/common/eigenvalueproblems.F +++ b/src/common/eigenvalueproblems.F @@ -20,7 +20,6 @@ MODULE eigenvalueproblems lapack_chpev,& lapack_sgesvd,& lapack_ssyev -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/erf_fn.F b/src/common/erf_fn.F index 510b79491e..0bc6eef355 100644 --- a/src/common/erf_fn.F +++ b/src/common/erf_fn.F @@ -11,7 +11,6 @@ MODULE erf_fn USE kinds, ONLY: dp -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/fparser.F b/src/common/fparser.F index d7058fdb2b..4231e4156e 100644 --- a/src/common/fparser.F +++ b/src/common/fparser.F @@ -21,7 +21,6 @@ MODULE fparser USE kinds, ONLY: default_string_length,& rn => dp USE termination, ONLY: stop_memory -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/gamma.F b/src/common/gamma.F index 3fb1294a19..a7f4e354d0 100644 --- a/src/common/gamma.F +++ b/src/common/gamma.F @@ -18,7 +18,6 @@ MODULE gamma USE mathconstants, ONLY: ifac,& pi USE termination, ONLY: stop_memory -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/lebedev.F b/src/common/lebedev.F index 7bc8e316eb..eb8ccca0f9 100644 --- a/src/common/lebedev.F +++ b/src/common/lebedev.F @@ -56,7 +56,6 @@ MODULE lebedev USE kinds, ONLY: dp -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/linear_systems.F b/src/common/linear_systems.F index 6280e0b566..786d84bf68 100644 --- a/src/common/linear_systems.F +++ b/src/common/linear_systems.F @@ -18,7 +18,6 @@ MODULE linear_systems USE kinds, ONLY: dp USE lapack, ONLY: lapack_sgesv -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/mathlib.F b/src/common/mathlib.F index 4ddade283a..5e40582808 100644 --- a/src/common/mathlib.F +++ b/src/common/mathlib.F @@ -17,7 +17,6 @@ MODULE mathlib dp USE mathconstants, ONLY: euler,& fac -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/memory_utilities.F b/src/common/memory_utilities.F index 7f2e8b34ff..a3fbe32639 100644 --- a/src/common/memory_utilities.F +++ b/src/common/memory_utilities.F @@ -21,7 +21,6 @@ MODULE memory_utilities int_8_size,& int_size USE termination, ONLY: stop_memory -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/parallel_rng_types.F b/src/common/parallel_rng_types.F index 51164be446..8b759f721c 100644 --- a/src/common/parallel_rng_types.F +++ b/src/common/parallel_rng_types.F @@ -56,7 +56,6 @@ MODULE parallel_rng_types USE kinds, ONLY: default_string_length,& dp USE string_utilities, ONLY: compress -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/periodic_table.F b/src/common/periodic_table.F index 7304dd34d9..733849a256 100644 --- a/src/common/periodic_table.F +++ b/src/common/periodic_table.F @@ -18,7 +18,6 @@ MODULE periodic_table USE kinds, ONLY: dp USE string_utilities, ONLY: uppercase -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/powell.F b/src/common/powell.F index 7e5622da60..df38e0e23d 100644 --- a/src/common/powell.F +++ b/src/common/powell.F @@ -7,7 +7,6 @@ MODULE powell USE kinds, ONLY: dp USE mathconstants, ONLY: twopi -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/reference_manager.F b/src/common/reference_manager.F index 596cdd94a2..921b2d9fbc 100644 --- a/src/common/reference_manager.F +++ b/src/common/reference_manager.F @@ -24,7 +24,6 @@ MODULE reference_manager USE kinds, ONLY: default_string_length USE message_passing, ONLY: mp_max USE util, ONLY: sort -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/spherical_harmonics.F b/src/common/spherical_harmonics.F index 13c37a76b1..0bd52544b9 100644 --- a/src/common/spherical_harmonics.F +++ b/src/common/spherical_harmonics.F @@ -30,7 +30,6 @@ MODULE spherical_harmonics maxfac,& pi USE termination, ONLY: stop_memory -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/string_table.F b/src/common/string_table.F index e1b4aba133..3d46865137 100644 --- a/src/common/string_table.F +++ b/src/common/string_table.F @@ -21,7 +21,6 @@ MODULE string_table USE kinds, ONLY: default_string_length,& int_8 -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/structure_factor_types.F b/src/common/structure_factor_types.F index d9ddd6dc0c..e329b58c4f 100644 --- a/src/common/structure_factor_types.F +++ b/src/common/structure_factor_types.F @@ -11,7 +11,6 @@ MODULE structure_factor_types USE kinds, ONLY: dp -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/structure_factors.F b/src/common/structure_factors.F index 2486f6d689..833574cc4a 100644 --- a/src/common/structure_factors.F +++ b/src/common/structure_factors.F @@ -15,7 +15,6 @@ MODULE structure_factors USE mathconstants, ONLY: twopi USE structure_factor_types, ONLY: structure_factor_type USE termination, ONLY: stop_memory -#include "cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/common/whittaker.F b/src/common/whittaker.F index 785d65bfb3..841aea9e15 100644 --- a/src/common/whittaker.F +++ b/src/common/whittaker.F @@ -14,7 +14,6 @@ MODULE whittaker USE mathconstants, ONLY: dfac,& fac,& rootpi -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/constraint.F b/src/constraint.F index 878f386141..4b3621f1a4 100644 --- a/src/constraint.F +++ b/src/constraint.F @@ -39,6 +39,7 @@ MODULE constraint update_temporary_set USE constraint_vsite, ONLY: shake_vsite_ext,& shake_vsite_int + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE distribution_1d_types, ONLY: distribution_1d_type USE input_constants, ONLY: npt_f_ensemble,& @@ -56,7 +57,6 @@ MODULE constraint molecule_type USE particle_types, ONLY: particle_type USE simpar_types, ONLY: simpar_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/constraint_3x3.F b/src/constraint_3x3.F index c4562962e5..3cbfe78362 100644 --- a/src/constraint_3x3.F +++ b/src/constraint_3x3.F @@ -25,7 +25,6 @@ MODULE constraint_3x3 local_g3x3_constraint_type,& molecule_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/constraint_4x6.F b/src/constraint_4x6.F index d3e63fe987..cd499b067f 100644 --- a/src/constraint_4x6.F +++ b/src/constraint_4x6.F @@ -25,7 +25,6 @@ MODULE constraint_4x6 local_g4x6_constraint_type,& molecule_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/constraint_clv.F b/src/constraint_clv.F index cc5b3304b4..0848ccbe1a 100644 --- a/src/constraint_clv.F +++ b/src/constraint_clv.F @@ -30,7 +30,6 @@ MODULE constraint_clv local_colvar_constraint_type,& molecule_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/constraint_fxd.F b/src/constraint_fxd.F index 8c637e7a36..73dd0b9add 100644 --- a/src/constraint_fxd.F +++ b/src/constraint_fxd.F @@ -36,7 +36,6 @@ MODULE constraint_fxd USE particle_list_types, ONLY: particle_list_type USE particle_types, ONLY: particle_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/constraint_util.F b/src/constraint_util.F index 8be54008e9..a1c9f03f2e 100644 --- a/src/constraint_util.F +++ b/src/constraint_util.F @@ -33,7 +33,6 @@ MODULE constraint_util USE particle_types, ONLY: particle_type USE termination, ONLY: stop_memory USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/constraint_vsite.F b/src/constraint_vsite.F index d7e716eae9..7a234f112a 100644 --- a/src/constraint_vsite.F +++ b/src/constraint_vsite.F @@ -26,7 +26,6 @@ MODULE constraint_vsite molecule_type USE particle_list_types, ONLY: particle_list_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/core_ae.F b/src/core_ae.F index ac37de128b..5026c2fc28 100644 --- a/src/core_ae.F +++ b/src/core_ae.F @@ -40,7 +40,6 @@ MODULE core_ae nl_sub_iterate USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/core_ppl.F b/src/core_ppl.F index 098151ddc2..958df07e44 100644 --- a/src/core_ppl.F +++ b/src/core_ppl.F @@ -45,7 +45,6 @@ MODULE core_ppl !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/core_ppnl.F b/src/core_ppnl.F index 47d1c2dc14..f1d9ed00df 100644 --- a/src/core_ppnl.F +++ b/src/core_ppnl.F @@ -46,7 +46,6 @@ MODULE core_ppnl !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp2k_debug.F b/src/cp2k_debug.F index 8b16643674..06694f3f3f 100644 --- a/src/cp2k_debug.F +++ b/src/cp2k_debug.F @@ -23,6 +23,8 @@ ! ***************************************************************************** MODULE cp2k_debug USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -53,7 +55,6 @@ MODULE cp2k_debug virial_set,& virial_type,& zero_virial -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_control_types.F b/src/cp_control_types.F index b5c085d3bc..ffe4b08cf1 100644 --- a/src/cp_control_types.F +++ b/src/cp_control_types.F @@ -17,7 +17,6 @@ MODULE cp_control_types USE pw_types, ONLY: pw_p_type USE xas_control, ONLY: xas_control_release,& xas_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_control_utils.F b/src/cp_control_utils.F index 85dcd81cad..831006dc5d 100644 --- a/src/cp_control_utils.F +++ b/src/cp_control_utils.F @@ -18,6 +18,8 @@ MODULE cp_control_utils ddapc_restraint_type, dft_control_create, dft_control_type, & efield_type, qs_control_type, sccs_control_create, & tddfpt_control_create, tddfpt_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -57,7 +59,6 @@ MODULE cp_control_utils USE xc_input_constants, ONLY: xc_deriv_collocate USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_write_output, ONLY: xc_write -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_dbcsr_cholesky.F b/src/cp_dbcsr_cholesky.F index ca5f7a7d9f..3c7a6be142 100644 --- a/src/cp_dbcsr_cholesky.F +++ b/src/cp_dbcsr_cholesky.F @@ -28,7 +28,6 @@ MODULE cp_dbcsr_cholesky USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp,& sp -#include "common/cp_common_uses.f90" #include "base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_dbcsr_cp2k_link.F b/src/cp_dbcsr_cp2k_link.F index 691cbf2017..3ddc7a05c4 100644 --- a/src/cp_dbcsr_cp2k_link.F +++ b/src/cp_dbcsr_cp2k_link.F @@ -36,7 +36,10 @@ MODULE cp_dbcsr_cp2k_link dbcsr_type_no_symmetry, has_acc, has_mpi, mm_driver_acc, & mm_driver_blas, mm_driver_matmul, mm_driver_smm, mm_name_acc, & mm_name_blas, mm_name_matmul, mm_name_smm, multrec_limit - USE cp_log_handling, ONLY: cp_logger_would_log,& + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_logger_would_log,& cp_note_level USE input_section_types, ONLY: section_vals_get_subs_vals,& section_vals_type,& @@ -56,7 +59,6 @@ MODULE cp_dbcsr_cp2k_link neighbor_list_iterator_p_type,& neighbor_list_iterator_release,& neighbor_list_set_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_dbcsr_diag.F b/src/cp_dbcsr_diag.F index 1878e5c5fd..91ec971722 100644 --- a/src/cp_dbcsr_diag.F +++ b/src/cp_dbcsr_diag.F @@ -35,7 +35,6 @@ MODULE cp_dbcsr_diag cp_fm_type USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp -#include "common/cp_common_uses.f90" #include "base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_dbcsr_operations.F b/src/cp_dbcsr_operations.F index 1fc24cc87d..d70614dd4e 100644 --- a/src/cp_dbcsr_operations.F +++ b/src/cp_dbcsr_operations.F @@ -59,7 +59,6 @@ MODULE cp_dbcsr_operations sp !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "common/cp_common_uses.f90" #include "base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_dbcsr_output.F b/src/cp_dbcsr_output.F index 2ae730b3ec..a247b7a921 100644 --- a/src/cp_dbcsr_output.F +++ b/src/cp_dbcsr_output.F @@ -27,6 +27,8 @@ MODULE cp_dbcsr_output USE cp_fm_types, ONLY: cp_fm_get_info,& cp_fm_get_submatrix,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: default_string_length,& dp,& @@ -44,7 +46,6 @@ MODULE cp_dbcsr_output USE qs_kind_types, ONLY: get_qs_kind,& get_qs_kind_set,& qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_ddapc.F b/src/cp_ddapc.F index bc6206b604..ae3d057697 100644 --- a/src/cp_ddapc.F +++ b/src/cp_ddapc.F @@ -27,6 +27,8 @@ MODULE cp_ddapc USE cp_ddapc_util, ONLY: get_ddapc,& modify_hartree_pot,& restraint_functional_potential + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_constants, ONLY: do_spin_density @@ -51,7 +53,6 @@ MODULE cp_ddapc USE qs_environment_types, ONLY: get_qs_env,& qs_environment_type USE qs_integrate_potential, ONLY: integrate_v_rspace -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_ddapc_forces.F b/src/cp_ddapc_forces.F index dd578adce9..613d3c01af 100644 --- a/src/cp_ddapc_forces.F +++ b/src/cp_ddapc_forces.F @@ -39,7 +39,6 @@ MODULE cp_ddapc_forces USE spherical_harmonics, ONLY: dlegendre,& legendre !NB for reducing results of calculations that use dq, which is now spread over nodes -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_ddapc_methods.F b/src/cp_ddapc_methods.F index 6cc5ed0c3b..28d5b49967 100644 --- a/src/cp_ddapc_methods.F +++ b/src/cp_ddapc_methods.F @@ -9,6 +9,7 @@ ! ***************************************************************************** MODULE cp_ddapc_methods USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_types, ONLY: cp_para_env_type USE erf_fn, ONLY: erfc USE input_constants, ONLY: weight_type_mass,& @@ -30,7 +31,6 @@ MODULE cp_ddapc_methods USE pw_spline_utils, ONLY: Eval_Interp_Spl3_pbc USE pw_types, ONLY: pw_type USE spherical_harmonics, ONLY: legendre -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_ddapc_types.F b/src/cp_ddapc_types.F index d9275c4db0..609666fe85 100644 --- a/src/cp_ddapc_types.F +++ b/src/cp_ddapc_types.F @@ -15,6 +15,9 @@ MODULE cp_ddapc_types ddapc_eval_gfunc,& ewald_ddapc_pot,& solvation_ddapc_pot + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_printkey_is_on USE cp_para_types, ONLY: cp_para_env_type USE ewald_spline_util, ONLY: Setup_Ewald_Spline @@ -32,7 +35,6 @@ MODULE cp_ddapc_types pw_pool_release,& pw_pool_type USE pw_types, ONLY: pw_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_ddapc_util.F b/src/cp_ddapc_util.F index 0c5676f4f9..2bc1872cc4 100644 --- a/src/cp_ddapc_util.F +++ b/src/cp_ddapc_util.F @@ -25,6 +25,8 @@ MODULE cp_ddapc_util prep_g_dot_rvec_sin_cos USE cp_ddapc_types, ONLY: cp_ddapc_create,& cp_ddapc_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -56,7 +58,6 @@ MODULE cp_ddapc_util USE qs_kind_types, ONLY: qs_kind_type USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_external_control.F b/src/cp_external_control.F index 8cab6b26d3..1e088414fb 100644 --- a/src/cp_external_control.F +++ b/src/cp_external_control.F @@ -14,13 +14,15 @@ MODULE cp_external_control USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE global_types, ONLY: global_environment_type USE kinds, ONLY: default_string_length,& dp USE machine, ONLY: m_walltime USE message_passing, ONLY: mp_bcast,& mp_probe -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_gemm_interface.F b/src/cp_gemm_interface.F index af066d4cc7..0415512a29 100644 --- a/src/cp_gemm_interface.F +++ b/src/cp_gemm_interface.F @@ -24,7 +24,6 @@ MODULE cp_gemm_interface USE kinds, ONLY: dp USE message_passing, ONLY: mp_min USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_realspace_grid_cube.F b/src/cp_realspace_grid_cube.F index c2177294f1..bc2135abae 100644 --- a/src/cp_realspace_grid_cube.F +++ b/src/cp_realspace_grid_cube.F @@ -13,7 +13,6 @@ MODULE cp_realspace_grid_cube USE particle_list_types, ONLY: particle_list_type USE pw_types, ONLY: pw_type USE realspace_grid_cube, ONLY: pw_to_cube -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_realspace_grid_init.F b/src/cp_realspace_grid_init.F index 7c94fca44d..96f5179276 100644 --- a/src/cp_realspace_grid_init.F +++ b/src/cp_realspace_grid_init.F @@ -18,7 +18,6 @@ MODULE cp_realspace_grid_init USE realspace_grid_types, ONLY: realspace_grid_input_type,& rsgrid_automatic,& rsgrid_replicated -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_spline_utils.F b/src/cp_spline_utils.F index ad2d5ac0f7..e9ff2781bb 100644 --- a/src/cp_spline_utils.F +++ b/src/cp_spline_utils.F @@ -29,7 +29,6 @@ MODULE cp_spline_utils USE pw_types, ONLY: REALDATA3D,& REALSPACE,& pw_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_subsys_methods.F b/src/cp_subsys_methods.F index 3a753b90e1..b14c2084fe 100644 --- a/src/cp_subsys_methods.F +++ b/src/cp_subsys_methods.F @@ -64,7 +64,6 @@ MODULE cp_subsys_methods USE topology_util, ONLY: check_subsys_element USE virial_types, ONLY: virial_create,& virial_set -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/cp_symmetry.F b/src/cp_symmetry.F index 3c597f9ee5..6a43306325 100644 --- a/src/cp_symmetry.F +++ b/src/cp_symmetry.F @@ -11,6 +11,8 @@ MODULE cp_symmetry USE atomic_kind_types, ONLY: get_atomic_kind USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_section_types, ONLY: section_vals_get_subs_vals,& @@ -30,7 +32,6 @@ MODULE cp_symmetry USE particle_types, ONLY: particle_type USE physcon, ONLY: massunit USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/csvr_system_types.F b/src/csvr_system_types.F index f4a47a6ccb..c91e53833d 100644 --- a/src/csvr_system_types.F +++ b/src/csvr_system_types.F @@ -23,7 +23,6 @@ MODULE csvr_system_types rng_stream_type USE simpar_types, ONLY: simpar_type USE string_utilities, ONLY: compress -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/csvr_system_utils.F b/src/csvr_system_utils.F index dd1bf0e999..d795b3a8cf 100644 --- a/src/csvr_system_utils.F +++ b/src/csvr_system_utils.F @@ -14,7 +14,6 @@ MODULE csvr_system_utils USE kinds, ONLY: dp USE parallel_rng_types, ONLY: next_random_number,& rng_stream_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ct_methods.F b/src/ct_methods.F index 05503597cd..46f5f2db7a 100644 --- a/src/ct_methods.F +++ b/src/ct_methods.F @@ -27,6 +27,9 @@ MODULE ct_methods cp_dbcsr_set_diag, cp_dbcsr_trace, cp_dbcsr_transposed, cp_dbcsr_type, & cp_dbcsr_work_create, dbcsr_distribution_mp, dbcsr_func_inverse, & dbcsr_mp_mynode, dbcsr_norm_maxabsnorm, dbcsr_type_no_symmetry + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE ct_types, ONLY: ct_step_env_type USE input_constants, ONLY: & cg_dai_yuan, cg_fletcher, cg_fletcher_reeves, cg_hager_zhang, & @@ -35,7 +38,6 @@ MODULE ct_methods USE iterate_matrix, ONLY: matrix_sqrt_Newton_Schulz USE kinds, ONLY: dp USE machine, ONLY: m_walltime -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ct_types.F b/src/ct_types.F index 12c95a96c0..3d649f15da 100644 --- a/src/ct_types.F +++ b/src/ct_types.F @@ -19,7 +19,6 @@ MODULE ct_types tensor_orthogonal,& tensor_up_down USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/d3_poly.F b/src/d3_poly.F index 5306d6baa1..44fb349855 100644 --- a/src/d3_poly.F +++ b/src/d3_poly.F @@ -24,7 +24,6 @@ MODULE d3_poly !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/dbcsr/base/dbcsr_array_sort_d.F b/src/dbcsr/base/dbcsr_array_sort_d.F index 64996cc537..08918aa2b4 100644 --- a/src/dbcsr/base/dbcsr_array_sort_d.F +++ b/src/dbcsr/base/dbcsr_array_sort_d.F @@ -12,7 +12,6 @@ !> CP2K: !> Please use the interface definded in util.F for calling sort(). !> This could not go into cp_array__nametype1__utils.template because -!> there some routines use the error-handling from cp_common_uses.f90, !> which in turn uses timings.F, which uses sort() :-( !> !> DBCSR: diff --git a/src/dbcsr/base/dbcsr_array_sort_i4.F b/src/dbcsr/base/dbcsr_array_sort_i4.F index 72fdbd6b89..2678aefd04 100644 --- a/src/dbcsr/base/dbcsr_array_sort_i4.F +++ b/src/dbcsr/base/dbcsr_array_sort_i4.F @@ -12,7 +12,6 @@ !> CP2K: !> Please use the interface definded in util.F for calling sort(). !> This could not go into cp_array__nametype1__utils.template because -!> there some routines use the error-handling from cp_common_uses.f90, !> which in turn uses timings.F, which uses sort() :-( !> !> DBCSR: diff --git a/src/dbcsr/base/dbcsr_array_sort_i8.F b/src/dbcsr/base/dbcsr_array_sort_i8.F index 49a3fde6c5..fde58a2b12 100644 --- a/src/dbcsr/base/dbcsr_array_sort_i8.F +++ b/src/dbcsr/base/dbcsr_array_sort_i8.F @@ -12,7 +12,6 @@ !> CP2K: !> Please use the interface definded in util.F for calling sort(). !> This could not go into cp_array__nametype1__utils.template because -!> there some routines use the error-handling from cp_common_uses.f90, !> which in turn uses timings.F, which uses sort() :-( !> !> DBCSR: diff --git a/src/dbcsr/base/dbcsr_array_sort_s.F b/src/dbcsr/base/dbcsr_array_sort_s.F index 5599072cc7..b9fe1b321d 100644 --- a/src/dbcsr/base/dbcsr_array_sort_s.F +++ b/src/dbcsr/base/dbcsr_array_sort_s.F @@ -12,7 +12,6 @@ !> CP2K: !> Please use the interface definded in util.F for calling sort(). !> This could not go into cp_array__nametype1__utils.template because -!> there some routines use the error-handling from cp_common_uses.f90, !> which in turn uses timings.F, which uses sort() :-( !> !> DBCSR: diff --git a/src/dbcsrwrap/cp_dbcsr_interface.F b/src/dbcsrwrap/cp_dbcsr_interface.F index e953e32c79..200ed5bbf6 100644 --- a/src/dbcsrwrap/cp_dbcsr_interface.F +++ b/src/dbcsrwrap/cp_dbcsr_interface.F @@ -101,7 +101,6 @@ MODULE cp_dbcsr_interface USE string_utilities, ONLY: uppercase !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/dft_plus_u.F b/src/dft_plus_u.F index 3c122009fb..8238c473c1 100644 --- a/src/dft_plus_u.F +++ b/src/dft_plus_u.F @@ -43,6 +43,8 @@ MODULE dft_plus_u cp_fm_release,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -71,7 +73,6 @@ MODULE dft_plus_u USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type USE qs_scf_types, ONLY: qs_scf_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/distribution_2d_types.F b/src/distribution_2d_types.F index 72f777824b..7299e671a0 100644 --- a/src/distribution_2d_types.F +++ b/src/distribution_2d_types.F @@ -18,8 +18,9 @@ MODULE distribution_2d_types cp_blacs_env_retain,& cp_blacs_env_type,& cp_blacs_env_write + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE machine, ONLY: m_flush -#include "common/cp_common_uses.f90" #include "base/base_uses.f90" IMPLICIT NONE diff --git a/src/distribution_methods.F b/src/distribution_methods.F index d29ce2f2ae..c6e2f077da 100644 --- a/src/distribution_methods.F +++ b/src/distribution_methods.F @@ -29,6 +29,10 @@ MODULE distribution_methods heap_release,& heap_reset_first,& heap_t + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -66,7 +70,6 @@ MODULE distribution_methods qs_kind_type USE termination, ONLY: stop_memory USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/dkh_main.F b/src/dkh_main.F index fc1cdb8f9b..73932cf155 100644 --- a/src/dkh_main.F +++ b/src/dkh_main.F @@ -28,7 +28,6 @@ MODULE dkh_main USE physcon, ONLY: a_fine USE qs_environment_types, ONLY: get_qs_env,& qs_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/dm_ls_chebyshev.F b/src/dm_ls_chebyshev.F index c9fa5ad8bc..0ae8ce6010 100644 --- a/src/dm_ls_chebyshev.F +++ b/src/dm_ls_chebyshev.F @@ -16,6 +16,9 @@ MODULE dm_ls_chebyshev cp_dbcsr_get_info, cp_dbcsr_get_occupation, cp_dbcsr_init, & cp_dbcsr_multiply, cp_dbcsr_release, cp_dbcsr_scale, cp_dbcsr_set, & cp_dbcsr_trace, cp_dbcsr_type, dbcsr_type_no_symmetry + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -30,7 +33,6 @@ MODULE dm_ls_chebyshev m_walltime USE mathconstants, ONLY: pi USE qs_environment_types, ONLY: qs_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/dm_ls_scf.F b/src/dm_ls_scf.F index d2a72f8f00..8a5b1bcb80 100644 --- a/src/dm_ls_scf.F +++ b/src/dm_ls_scf.F @@ -28,6 +28,9 @@ MODULE dm_ls_scf cp_dbcsr_init, cp_dbcsr_multiply, cp_dbcsr_p_type, cp_dbcsr_release, & cp_dbcsr_scale, cp_dbcsr_set, cp_dbcsr_type, dbcsr_type_no_symmetry USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_para_env, ONLY: cp_para_env_retain USE dm_ls_chebyshev, ONLY: compute_chebyshev USE dm_ls_scf_curvy, ONLY: deallocate_curvy_data,& @@ -104,7 +107,6 @@ MODULE dm_ls_scf USE transport, ONLY: external_scf_method,& transport_initialize USE transport_env_types, ONLY: transport_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/dm_ls_scf_curvy.F b/src/dm_ls_scf_curvy.F index 89b43c1a5b..40b096a5c3 100644 --- a/src/dm_ls_scf_curvy.F +++ b/src/dm_ls_scf_curvy.F @@ -19,6 +19,9 @@ MODULE dm_ls_scf_curvy cp_dbcsr_norm, cp_dbcsr_release, cp_dbcsr_scale, cp_dbcsr_set, & cp_dbcsr_trace, cp_dbcsr_transposed, cp_dbcsr_type, & dbcsr_type_no_symmetry + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE dm_ls_scf_types, ONLY: ls_scf_curvy_type,& ls_scf_env_type USE input_constants, ONLY: ls_scf_line_search_3point,& @@ -28,7 +31,6 @@ MODULE dm_ls_scf_curvy USE machine, ONLY: m_flush USE mathconstants, ONLY: ifac USE mathlib, ONLY: invmat -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/dm_ls_scf_methods.F b/src/dm_ls_scf_methods.F index fdc5e7d6a4..bc99074d00 100644 --- a/src/dm_ls_scf_methods.F +++ b/src/dm_ls_scf_methods.F @@ -21,6 +21,9 @@ MODULE dm_ls_scf_methods dbcsr_data_new, dbcsr_data_obj, dbcsr_data_release, dbcsr_iterator, & dbcsr_iterator_blocks_left, dbcsr_iterator_next_block, & dbcsr_iterator_stop, dbcsr_type_no_symmetry + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE dm_ls_scf_types, ONLY: ls_cluster_atomic,& ls_mstruct_type USE input_constants, ONLY: ls_s_preconditioner_atomic,& @@ -32,7 +35,6 @@ MODULE dm_ls_scf_methods int_8 USE machine, ONLY: m_flush,& m_walltime -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/dm_ls_scf_qs.F b/src/dm_ls_scf_qs.F index 618f4270b3..0501857ffb 100644 --- a/src/dm_ls_scf_qs.F +++ b/src/dm_ls_scf_qs.F @@ -29,6 +29,9 @@ MODULE dm_ls_scf_qs dbcsr_distribution_release, dbcsr_distribution_row_clusters, & dbcsr_distribution_row_dist, dbcsr_type_no_symmetry, & dbcsr_type_real_4, dbcsr_type_real_8, dbcsr_type_symmetric + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_para_types, ONLY: cp_para_env_type USE cp_realspace_grid_cube, ONLY: cp_pw_to_cube USE dm_ls_scf_types, ONLY: ls_cluster_atomic,& @@ -76,7 +79,6 @@ MODULE dm_ls_scf_qs qs_rho_type USE qs_subsys_types, ONLY: qs_subsys_get,& qs_subsys_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/dm_ls_scf_types.F b/src/dm_ls_scf_types.F index 23462f6fb6..5f6c96c38f 100644 --- a/src/dm_ls_scf_types.F +++ b/src/dm_ls_scf_types.F @@ -26,7 +26,6 @@ MODULE dm_ls_scf_types lib_pexsi_finalize USE qs_density_mixing_types, ONLY: mixing_storage_release,& mixing_storage_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/domain_submatrix_methods.F b/src/domain_submatrix_methods.F index 46a287f06f..99e4b23413 100644 --- a/src/domain_submatrix_methods.F +++ b/src/domain_submatrix_methods.F @@ -22,6 +22,9 @@ MODULE domain_submatrix_methods cp_dbcsr_work_create, dbcsr_distribution_mp, dbcsr_mp_group, & dbcsr_mp_mynode, dbcsr_mp_numnodes, dbcsr_type_antisymmetric, & dbcsr_type_no_symmetry, dbcsr_type_symmetric + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE domain_submatrix_types, ONLY: domain_map_type,& domain_submatrix_type,& select_row,& @@ -30,7 +33,6 @@ MODULE domain_submatrix_methods USE message_passing, ONLY: mp_allgather,& mp_alltoall,& mp_sync -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/domain_submatrix_types.F b/src/domain_submatrix_types.F index 743411e106..2024606bc8 100644 --- a/src/domain_submatrix_types.F +++ b/src/domain_submatrix_types.F @@ -11,7 +11,6 @@ ! ***************************************************************************** MODULE domain_submatrix_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/efield_utils.F b/src/efield_utils.F index 5054845ec3..57406f7b59 100644 --- a/src/efield_utils.F +++ b/src/efield_utils.F @@ -33,7 +33,6 @@ MODULE efield_utils qs_kind_type USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/eip_environment.F b/src/eip_environment.F index 21d7781473..5b90c9cf47 100644 --- a/src/eip_environment.F +++ b/src/eip_environment.F @@ -39,7 +39,6 @@ MODULE eip_environment write_particle_distances,& write_structure_data USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/eip_environment_types.F b/src/eip_environment_types.F index ee370b41ef..61a3489c7b 100644 --- a/src/eip_environment_types.F +++ b/src/eip_environment_types.F @@ -39,7 +39,6 @@ MODULE eip_environment_types particle_list_type USE particle_types, ONLY: particle_type USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/eip_silicon.F b/src/eip_silicon.F index a2f138a757..4b644d4e19 100644 --- a/src/eip_silicon.F +++ b/src/eip_silicon.F @@ -18,6 +18,8 @@ MODULE eip_silicon get_atomic_kind USE cell_types, ONLY: cell_type,& get_cell + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -37,7 +39,6 @@ MODULE eip_silicon evolt !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/emd/rt_delta_pulse.F b/src/emd/rt_delta_pulse.F index 766ae38223..499b0d5354 100644 --- a/src/emd/rt_delta_pulse.F +++ b/src/emd/rt_delta_pulse.F @@ -53,7 +53,6 @@ MODULE rt_delta_pulse USE qs_moments, ONLY: build_berry_moment_matrix USE rt_propagation_types, ONLY: get_rtp,& rt_prop_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/emd/rt_hfx_utils.F b/src/emd/rt_hfx_utils.F index aa2c466ab1..f103053a72 100644 --- a/src/emd/rt_hfx_utils.F +++ b/src/emd/rt_hfx_utils.F @@ -29,7 +29,6 @@ MODULE rt_hfx_utils qs_rho_set,& qs_rho_type USE rt_propagation_types, ONLY: rt_prop_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/emd/rt_make_propagators.F b/src/emd/rt_make_propagators.F index 1a897f11f6..f3be2be2a3 100644 --- a/src/emd/rt_make_propagators.F +++ b/src/emd/rt_make_propagators.F @@ -42,7 +42,6 @@ MODULE rt_make_propagators taylor_only_imaginary USE rt_propagation_types, ONLY: get_rtp,& rt_prop_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/emd/rt_propagation_methods.F b/src/emd/rt_propagation_methods.F index fb79ce7aaf..c33116c928 100644 --- a/src/emd/rt_propagation_methods.F +++ b/src/emd/rt_propagation_methods.F @@ -42,6 +42,10 @@ MODULE rt_propagation_methods cp_fm_to_fm,& cp_fm_type USE cp_fm_vect, ONLY: cp_fm_vect_dealloc + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type,& + cp_to_string USE input_constants, ONLY: do_arnoldi,& do_bch,& do_em,& @@ -68,7 +72,6 @@ MODULE rt_propagation_methods USE rt_propagation_utils, ONLY: calc_S_derivs,& calc_update_rho,& calc_update_rho_sparse -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/emd/rt_propagation_output.F b/src/emd/rt_propagation_output.F index 8b06602db4..e3d64e9e5f 100644 --- a/src/emd/rt_propagation_output.F +++ b/src/emd/rt_propagation_output.F @@ -34,6 +34,10 @@ MODULE rt_propagation_output cp_fm_set_all,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -83,7 +87,6 @@ MODULE rt_propagation_output USE rt_propagation_types, ONLY: get_rtp,& rt_prop_type USE rt_propagation_utils, ONLY: calculate_P_imaginary -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/emd/rt_propagation_utils.F b/src/emd/rt_propagation_utils.F index a0f68d3f27..7f960a2823 100644 --- a/src/emd/rt_propagation_utils.F +++ b/src/emd/rt_propagation_utils.F @@ -26,6 +26,9 @@ MODULE rt_propagation_utils cp_fm_p_type,& cp_fm_set_all,& cp_fm_to_fm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_para_types, ONLY: cp_para_env_type USE input_constants, ONLY: use_restart_wfn,& use_rt_restart @@ -55,7 +58,6 @@ MODULE rt_propagation_utils qs_rho_type USE rt_propagation_types, ONLY: get_rtp,& rt_prop_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/emd/rt_propagator_init.F b/src/emd/rt_propagator_init.F index 3ece4abc4e..4cc17a120a 100644 --- a/src/emd/rt_propagator_init.F +++ b/src/emd/rt_propagator_init.F @@ -30,6 +30,9 @@ MODULE rt_propagator_init cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE dm_ls_scf_methods, ONLY: density_matrix_trs4 USE input_constants, ONLY: do_arnoldi,& do_bch,& @@ -52,7 +55,6 @@ MODULE rt_propagator_init s_matrices_create USE rt_propagation_types, ONLY: get_rtp,& rt_prop_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/environment.F b/src/environment.F index 89882d248c..403f1dea78 100644 --- a/src/environment.F +++ b/src/environment.F @@ -26,8 +26,7 @@ MODULE environment USE cp_fm_types, ONLY: cp_fm_setup USE cp_log_handling, ONLY: & cp_add_default_logger, cp_get_default_logger, cp_logger_create, & - cp_logger_get_default_io_unit, cp_logger_get_default_unit_nr, & - cp_logger_get_unit_nr, cp_logger_release, cp_logger_set, & + cp_logger_get_default_unit_nr, cp_logger_release, cp_logger_set, & cp_logger_type, cp_rm_default_logger, cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr,& @@ -104,7 +103,6 @@ MODULE environment timings_report_print !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/eri_mme_methods.F b/src/eri_mme_methods.F index 1760fecdb9..9b617a9500 100644 --- a/src/eri_mme_methods.F +++ b/src/eri_mme_methods.F @@ -24,6 +24,8 @@ MODULE eri_mme_methods USE basis_set_types, ONLY: gto_basis_set_type USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -35,7 +37,6 @@ MODULE eri_mme_methods USE orbital_pointers, ONLY: ncoset USE qs_kind_types, ONLY: get_qs_kind,& qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/eri_mme_methods_low.F b/src/eri_mme_methods_low.F index 0cd3cb3d17..9b33112351 100644 --- a/src/eri_mme_methods_low.F +++ b/src/eri_mme_methods_low.F @@ -16,6 +16,8 @@ MODULE eri_mme_methods_low USE ao_util, ONLY: exp_radius USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -34,7 +36,6 @@ MODULE eri_mme_methods_low USE minimax, ONLY: check_range,& get_minimax_coeff USE orbital_pointers, ONLY: coset -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/eri_mme_test.F b/src/eri_mme_test.F index b171cd12fb..6e085f5adb 100644 --- a/src/eri_mme_test.F +++ b/src/eri_mme_test.F @@ -37,7 +37,6 @@ MODULE eri_mme_test USE message_passing, ONLY: mp_sum USE orbital_pointers, ONLY: init_orbital_pointers,& ncoset -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/eri_mme_types.F b/src/eri_mme_types.F index 65f683d438..f8c3a85a89 100644 --- a/src/eri_mme_types.F +++ b/src/eri_mme_types.F @@ -13,6 +13,8 @@ MODULE eri_mme_types + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_section_create,& cp_print_key_unit_nr,& @@ -29,7 +31,6 @@ MODULE eri_mme_types section_vals_type,& section_vals_val_get USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/et_coupling.F b/src/et_coupling.F index 71fad920f0..ebcf988e3a 100644 --- a/src/et_coupling.F +++ b/src/et_coupling.F @@ -27,6 +27,9 @@ MODULE et_coupling cp_fm_release,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -50,7 +53,6 @@ MODULE et_coupling USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/et_coupling_types.F b/src/et_coupling_types.F index f733af6312..46f74ef124 100644 --- a/src/et_coupling_types.F +++ b/src/et_coupling_types.F @@ -13,7 +13,6 @@ MODULE et_coupling_types USE cp_fm_types, ONLY: cp_fm_p_type,& cp_fm_release USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ewald_environment_types.F b/src/ewald_environment_types.F index f5e72598ef..43228d1f74 100644 --- a/src/ewald_environment_types.F +++ b/src/ewald_environment_types.F @@ -10,6 +10,8 @@ !> \author CJM NOV-30-2003 ! ***************************************************************************** MODULE ewald_environment_types + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_env, ONLY: cp_para_env_release,& @@ -34,7 +36,6 @@ MODULE ewald_environment_types do_ewald_none,& do_ewald_pme,& do_ewald_spme -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ewald_pw_methods.F b/src/ewald_pw_methods.F index b8dac7c8b2..7e8c94aa4f 100644 --- a/src/ewald_pw_methods.F +++ b/src/ewald_pw_methods.F @@ -41,7 +41,6 @@ MODULE ewald_pw_methods USE pw_pool_types, ONLY: pw_pool_p_type,& pw_pool_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ewald_pw_types.F b/src/ewald_pw_types.F index 8ee8c7c40a..fc91354363 100644 --- a/src/ewald_pw_types.F +++ b/src/ewald_pw_types.F @@ -10,6 +10,8 @@ MODULE ewald_pw_types USE ao_util, ONLY: exp_radius USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -47,7 +49,6 @@ MODULE ewald_pw_types realspace_grid_type, rs_grid_create, rs_grid_create_descriptor, & rs_grid_print, rs_grid_release, rs_grid_release_descriptor, & rs_grid_retain_descriptor -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ewald_spline_util.F b/src/ewald_spline_util.F index c570d8478b..9774baf014 100644 --- a/src/ewald_spline_util.F +++ b/src/ewald_spline_util.F @@ -14,6 +14,8 @@ MODULE ewald_spline_util USE cell_types, ONLY: cell_create,& cell_release,& cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -40,7 +42,6 @@ MODULE ewald_spline_util REALSPACE,& pw_type !NB parallelization -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ewalds.F b/src/ewalds.F index 6dde94e721..124e703e66 100644 --- a/src/ewalds.F +++ b/src/ewalds.F @@ -39,7 +39,6 @@ MODULE ewalds USE structure_factors, ONLY: structure_factor_allocate,& structure_factor_deallocate,& structure_factor_evaluate -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ewalds_multipole.F b/src/ewalds_multipole.F index 11098b158d..3701fd1f8c 100644 --- a/src/ewalds_multipole.F +++ b/src/ewalds_multipole.F @@ -49,7 +49,6 @@ MODULE ewalds_multipole USE structure_factors, ONLY: structure_factor_allocate,& structure_factor_deallocate,& structure_factor_evaluate -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ewalds_multipole_debug.F b/src/ewalds_multipole_debug.F index e4d35ab148..b02625ff3e 100644 --- a/src/ewalds_multipole_debug.F +++ b/src/ewalds_multipole_debug.F @@ -37,7 +37,8 @@ SUBROUTINE debug_ewald_multipoles(ewald_env, ewald_pw, nonbond_env, cell, & random_numbers USE particle_types, ONLY: particle_type USE ewalds_multipole, ONLY: ewald_multipole_evaluate -#include "./common/cp_common_uses.f90" + USE cp_log_handling, ONLY: cp_logger_type,& + cp_get_default_logger #include "./base/base_uses.f90" IMPLICIT NONE @@ -691,7 +692,8 @@ SUBROUTINE debug_ewald_multipoles_fields(ewald_env, ewald_pw, nonbond_env, cell, USE particle_types, ONLY: particle_type USE ewalds_multipole, ONLY: ewald_multipole_evaluate USE fist_neighbor_list_control, ONLY: list_control -#include "./common/cp_common_uses.f90" + USE cp_log_handling, ONLY: cp_logger_type,& + cp_get_default_logger #include "./base/base_uses.f90" IMPLICIT NONE TYPE(ewald_environment_type), POINTER :: ewald_env @@ -895,7 +897,8 @@ SUBROUTINE debug_ewald_multipoles_fields2(ewald_env, ewald_pw, nonbond_env, cell USE particle_types, ONLY: particle_type USE ewalds_multipole, ONLY: ewald_multipole_evaluate USE fist_neighbor_list_control, ONLY: list_control -#include "./common/cp_common_uses.f90" + USE cp_log_handling, ONLY: cp_logger_type,& + cp_get_default_logger #include "./base/base_uses.f90" IMPLICIT NONE TYPE(ewald_environment_type), POINTER :: ewald_env diff --git a/src/ewalds_multipole_debug.h b/src/ewalds_multipole_debug.h index 960f9a02a7..163919430f 100644 --- a/src/ewalds_multipole_debug.h +++ b/src/ewalds_multipole_debug.h @@ -17,7 +17,6 @@ INTERFACE USE ewald_pw_types, ONLY: ewald_pw_type USE fist_nonbond_env_types, ONLY: fist_nonbond_env_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" TYPE(ewald_environment_type), POINTER :: ewald_env TYPE(ewald_pw_type), POINTER :: ewald_pw TYPE(fist_nonbond_env_type), POINTER :: nonbond_env @@ -44,7 +43,6 @@ INTERFACE USE input_section_types, ONLY: section_vals_type USE kinds, ONLY: dp USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" TYPE(ewald_environment_type), POINTER :: ewald_env TYPE(ewald_pw_type), POINTER :: ewald_pw TYPE(fist_nonbond_env_type), POINTER :: nonbond_env @@ -75,7 +73,6 @@ INTERFACE USE fist_nonbond_env_types, ONLY: fist_nonbond_env_type USE kinds, ONLY: dp USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" TYPE(ewald_environment_type), POINTER :: ewald_env TYPE(ewald_pw_type), POINTER :: ewald_pw TYPE(fist_nonbond_env_type), POINTER :: nonbond_env diff --git a/src/exclusion_types.F b/src/exclusion_types.F index 589c905051..4a5194f9a4 100644 --- a/src/exclusion_types.F +++ b/src/exclusion_types.F @@ -7,7 +7,6 @@ ! ***************************************************************************** MODULE exclusion_types -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE PRIVATE diff --git a/src/extended_system_types.F b/src/extended_system_types.F index 5cd09976bb..03b7468f9c 100644 --- a/src/extended_system_types.F +++ b/src/extended_system_types.F @@ -20,7 +20,6 @@ MODULE extended_system_types USE input_section_types, ONLY: section_vals_type,& section_vals_val_get USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/external_potential_methods.F b/src/external_potential_methods.F index a4ad02eae0..082d939e30 100644 --- a/src/external_potential_methods.F +++ b/src/external_potential_methods.F @@ -9,6 +9,9 @@ !> \author Teodoro Laino (03.2008) [tlaino] ! ***************************************************************************** MODULE external_potential_methods + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_subsys_types, ONLY: cp_subsys_get,& cp_subsys_type USE force_env_types, ONLY: force_env_get,& @@ -30,7 +33,6 @@ MODULE external_potential_methods USE memory_utilities, ONLY: reallocate USE particle_list_types, ONLY: particle_list_type USE string_utilities, ONLY: compress -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/f77_interface.F b/src/f77_interface.F index ab34daae79..f21123913e 100644 --- a/src/f77_interface.F +++ b/src/f77_interface.F @@ -27,13 +27,11 @@ MODULE f77_interface USE cp_error_handling, ONLY: cp_error_handling_setup USE cp_files, ONLY: init_preconnection_list,& open_file - USE cp_log_handling, ONLY: cp_add_default_logger,& - cp_default_logger_stack_size,& - cp_failure_level,& - cp_logger_create,& - cp_logger_release,& - cp_logger_retain,& - cp_rm_default_logger + USE cp_log_handling, ONLY: & + cp_add_default_logger, cp_default_logger_stack_size, cp_failure_level, & + cp_get_default_logger, cp_logger_create, & + cp_logger_get_default_unit_nr, cp_logger_release, cp_logger_retain, & + cp_logger_type, cp_rm_default_logger, cp_to_string USE cp_output_handling, ONLY: cp_iterate USE cp_para_env, ONLY: cp_para_env_create,& cp_para_env_release,& @@ -132,7 +130,6 @@ MODULE f77_interface timings_register_hooks USE timings_types, ONLY: timer_env_type USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/farming_methods.F b/src/farming_methods.F index deb96fbb7f..301b2fa858 100644 --- a/src/farming_methods.F +++ b/src/farming_methods.F @@ -6,6 +6,8 @@ ! ***************************************************************************** MODULE farming_methods USE cp_files, ONLY: get_unit_number + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_generate_filename,& cp_print_key_unit_nr @@ -20,7 +22,6 @@ MODULE farming_methods section_vals_type,& section_vals_val_get USE message_passing, ONLY: mp_bcast -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/farming_types.F b/src/farming_types.F index 5de8479835..b37976a014 100644 --- a/src/farming_types.F +++ b/src/farming_types.F @@ -8,7 +8,6 @@ MODULE farming_types USE kinds, ONLY: default_path_length,& dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fermi_utils.F b/src/fermi_utils.F index 2bc273481f..18deb38008 100644 --- a/src/fermi_utils.F +++ b/src/fermi_utils.F @@ -12,7 +12,6 @@ MODULE fermi_utils USE kahan_sum, ONLY: accurate_sum USE kinds, ONLY: dp -#include "common/cp_common_uses.f90" #include "base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_energy_types.F b/src/fist_energy_types.F index fb7563564f..7652995835 100644 --- a/src/fist_energy_types.F +++ b/src/fist_energy_types.F @@ -14,7 +14,6 @@ MODULE fist_energy_types USE kinds, ONLY: dp,& dp_size USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_environment.F b/src/fist_environment.F index 45407af935..8389b5261f 100644 --- a/src/fist_environment.F +++ b/src/fist_environment.F @@ -19,6 +19,8 @@ MODULE fist_environment USE cell_types, ONLY: cell_release,& cell_type,& get_cell + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -67,7 +69,6 @@ MODULE fist_environment write_structure_data USE particle_types, ONLY: particle_type USE qmmm_types_low, ONLY: qmmm_env_mm_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_environment_types.F b/src/fist_environment_types.F index de63f1622d..dd0e31d81e 100644 --- a/src/fist_environment_types.F +++ b/src/fist_environment_types.F @@ -61,7 +61,6 @@ MODULE fist_environment_types qmmm_env_mm_release,& qmmm_env_mm_retain,& qmmm_env_mm_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_force.F b/src/fist_force.F index 2168874e0c..dd083d2d5c 100644 --- a/src/fist_force.F +++ b/src/fist_force.F @@ -18,6 +18,8 @@ MODULE fist_force USE cell_types, ONLY: cell_type,& init_cell,& pbc + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -75,7 +77,6 @@ MODULE fist_force USE shell_potential_types, ONLY: shell_kind_type USE spme, ONLY: spme_evaluate USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_intra_force.F b/src/fist_intra_force.F index e7d128ba02..f1a54339dc 100644 --- a/src/fist_intra_force.F +++ b/src/fist_intra_force.F @@ -14,6 +14,8 @@ MODULE fist_intra_force USE atprop_types, ONLY: atprop_type USE cell_types, ONLY: cell_type,& pbc + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE distribution_1d_types, ONLY: distribution_1d_type USE kinds, ONLY: dp USE mol_force, ONLY: force_bends,& @@ -30,7 +32,6 @@ MODULE fist_intra_force USE molecule_types_new, ONLY: get_molecule,& molecule_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_main.F b/src/fist_main.F index 5abc9dc0e1..511cad75c0 100644 --- a/src/fist_main.F +++ b/src/fist_main.F @@ -24,7 +24,6 @@ MODULE fist_main USE global_types, ONLY: global_environment_type USE input_section_types, ONLY: section_vals_type USE qmmm_types_low, ONLY: qmmm_env_mm_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_neighbor_list_control.F b/src/fist_neighbor_list_control.F index b86f623776..87b38fac70 100644 --- a/src/fist_neighbor_list_control.F +++ b/src/fist_neighbor_list_control.F @@ -18,6 +18,8 @@ MODULE fist_neighbor_list_control cell_create,& cell_release,& cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -37,7 +39,6 @@ MODULE fist_neighbor_list_control siepmann_type,& tersoff_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_neighbor_list_types.F b/src/fist_neighbor_list_types.F index 213c61e981..8927f35443 100644 --- a/src/fist_neighbor_list_types.F +++ b/src/fist_neighbor_list_types.F @@ -13,7 +13,6 @@ MODULE fist_neighbor_list_types USE exclusion_types, ONLY: exclusion_type USE kinds, ONLY: dp USE memory_utilities, ONLY: reallocate -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_neighbor_lists.F b/src/fist_neighbor_lists.F index e01aa2100d..6d05b29a7e 100644 --- a/src/fist_neighbor_lists.F +++ b/src/fist_neighbor_lists.F @@ -24,6 +24,9 @@ MODULE fist_neighbor_lists pbc,& plane_distance,& scaled_to_real + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -52,7 +55,6 @@ MODULE fist_neighbor_lists reorder_atoms_subcell,& subcell_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_nonbond_env_types.F b/src/fist_nonbond_env_types.F index af81c61ea1..3cef2f351e 100644 --- a/src/fist_nonbond_env_types.F +++ b/src/fist_nonbond_env_types.F @@ -20,7 +20,6 @@ MODULE fist_nonbond_env_types pair_potential_pp_type,& siepmann_type,& tersoff_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_nonbond_force.F b/src/fist_nonbond_force.F index d612682420..8beac4df83 100644 --- a/src/fist_nonbond_force.F +++ b/src/fist_nonbond_force.F @@ -19,6 +19,8 @@ MODULE fist_nonbond_force USE atprop_types, ONLY: atprop_type USE cell_types, ONLY: cell_type,& pbc + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE distribution_1d_types, ONLY: distribution_1d_type USE ewald_environment_types, ONLY: ewald_env_get,& ewald_environment_type @@ -50,7 +52,6 @@ MODULE fist_nonbond_force USE splines_types, ONLY: spline_data_p_type,& spline_factor_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fist_pol_scf.F b/src/fist_pol_scf.F index 26686255e4..99c364e986 100644 --- a/src/fist_pol_scf.F +++ b/src/fist_pol_scf.F @@ -15,6 +15,8 @@ MODULE fist_pol_scf USE atomic_kind_types, ONLY: atomic_kind_type,& get_atomic_kind USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE distribution_1d_types, ONLY: distribution_1d_type @@ -34,7 +36,6 @@ MODULE fist_pol_scf USE pw_poisson_types, ONLY: do_ewald_ewald,& do_ewald_pme,& do_ewald_spme -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_blacs_calls.F b/src/fm/cp_blacs_calls.F index 0de0a85cad..676400a9ee 100644 --- a/src/fm/cp_blacs_calls.F +++ b/src/fm/cp_blacs_calls.F @@ -16,7 +16,6 @@ MODULE cp_blacs_calls USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_blacs_env.F b/src/fm/cp_blacs_env.F index 969f60a7f6..df2606fc46 100644 --- a/src/fm/cp_blacs_env.F +++ b/src/fm/cp_blacs_env.F @@ -23,7 +23,6 @@ MODULE cp_blacs_env USE machine, ONLY: m_flush USE mathlib, ONLY: gcd USE message_passing, ONLY: mp_sum -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_cfm_basic_linalg.F b/src/fm/cp_cfm_basic_linalg.F index deedd8fae3..a6e2723a38 100644 --- a/src/fm/cp_cfm_basic_linalg.F +++ b/src/fm/cp_cfm_basic_linalg.F @@ -19,7 +19,6 @@ MODULE cp_cfm_basic_linalg USE cp_fm_types, ONLY: cp_fm_type USE kinds, ONLY: dp USE message_passing, ONLY: mp_sum -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_cfm_diag.F b/src/fm/cp_cfm_diag.F index 620a3381c4..6f048c57cb 100644 --- a/src/fm/cp_cfm_diag.F +++ b/src/fm/cp_cfm_diag.F @@ -27,7 +27,6 @@ MODULE cp_cfm_diag ieee_all #endif -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_cfm_types.F b/src/fm/cp_cfm_types.F index 8a8d2f7da4..ed655ca261 100644 --- a/src/fm/cp_cfm_types.F +++ b/src/fm/cp_cfm_types.F @@ -17,10 +17,10 @@ MODULE cp_cfm_types cp_fm_struct_retain,& cp_fm_struct_type USE cp_fm_types, ONLY: cp_fm_type + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp USE message_passing, ONLY: cp2k_is_parallel -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_fm_basic_linalg.F b/src/fm/cp_fm_basic_linalg.F index 8351c289e3..9d2e148188 100644 --- a/src/fm/cp_fm_basic_linalg.F +++ b/src/fm/cp_fm_basic_linalg.F @@ -16,13 +16,13 @@ MODULE cp_fm_basic_linalg cp_fm_create, cp_fm_get_element, cp_fm_get_info, cp_fm_get_submatrix, & cp_fm_release, cp_fm_set_all, cp_fm_set_submatrix, cp_fm_to_fm, & cp_fm_type + USE cp_log_handling, ONLY: cp_to_string USE kahan_sum, ONLY: accurate_sum USE kinds, ONLY: dp,& sp USE machine, ONLY: m_memory USE mathlib, ONLY: invert_matrix USE message_passing, ONLY: mp_sum -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_fm_cholesky.F b/src/fm/cp_fm_cholesky.F index c56a5382f7..8ba0ab2a1f 100644 --- a/src/fm/cp_fm_cholesky.F +++ b/src/fm/cp_fm_cholesky.F @@ -12,9 +12,9 @@ MODULE cp_fm_cholesky USE cp_blacs_env, ONLY: cp_blacs_env_type USE cp_fm_types, ONLY: cp_fm_type + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp,& sp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_fm_diag.F b/src/fm/cp_fm_diag.F index 7f33de9a9c..fa2ed8977f 100644 --- a/src/fm/cp_fm_diag.F +++ b/src/fm/cp_fm_diag.F @@ -13,6 +13,7 @@ !> \author Joost VandeVondele (2003-08) ! ***************************************************************************** MODULE cp_fm_diag +USE cp_log_handling, ONLY: cp_logger_type, cp_get_default_logger, cp_logger_get_default_unit_nr, cp_logger_get_unit_nr USE machine, ONLY: m_memory USE cp_blacs_calls, ONLY: cp_blacs_gridexit,& cp_blacs_gridinit @@ -55,7 +56,6 @@ MODULE cp_fm_diag USE ELPA2, ONLY: solve_evp_real_2stage #endif -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_fm_pool_types.F b/src/fm/cp_fm_pool_types.F index 25e6c2d1be..db1b06d5a1 100644 --- a/src/fm/cp_fm_pool_types.F +++ b/src/fm/cp_fm_pool_types.F @@ -23,7 +23,7 @@ MODULE cp_fm_pool_types cp_sll_fm_next,& cp_sll_fm_rm_first_el,& cp_sll_fm_type -#include "../common/cp_common_uses.f90" + USE cp_log_handling, ONLY: cp_to_string #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_fm_struct.F b/src/fm/cp_fm_struct.F index d94f720733..cb0d5b7c08 100644 --- a/src/fm/cp_fm_struct.F +++ b/src/fm/cp_fm_struct.F @@ -13,13 +13,16 @@ MODULE cp_fm_struct USE cp_blacs_env, ONLY: cp_blacs_env_release,& cp_blacs_env_retain,& cp_blacs_env_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type,& + cp_to_string USE cp_para_env, ONLY: cp_para_env_release,& cp_para_env_retain USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp USE machine, ONLY: m_flush USE message_passing, ONLY: mp_sum -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_fm_types.F b/src/fm/cp_fm_types.F index a6437d8659..d9e3d46bb0 100644 --- a/src/fm/cp_fm_types.F +++ b/src/fm/cp_fm_types.F @@ -22,6 +22,7 @@ MODULE cp_fm_types cp_fm_struct_release,& cp_fm_struct_retain,& cp_fm_struct_type + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp,& sp @@ -38,7 +39,6 @@ MODULE cp_fm_types random_numbers,& reset_to_next_rng_substream,& rng_stream_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_fm_vect.F b/src/fm/cp_fm_vect.F index 2a0d7415bd..79f3a4748c 100644 --- a/src/fm/cp_fm_vect.F +++ b/src/fm/cp_fm_vect.F @@ -13,7 +13,6 @@ MODULE cp_fm_vect USE cp_fm_types, ONLY: cp_fm_p_type,& cp_fm_release,& cp_fm_retain -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/fm/cp_linked_list_fm.F b/src/fm/cp_linked_list_fm.F index a30f6bdd7e..2968d76bc7 100644 --- a/src/fm/cp_linked_list_fm.F +++ b/src/fm/cp_linked_list_fm.F @@ -47,7 +47,6 @@ MODULE cp_linked_list_fm USE cp_fm_types, ONLY: cp_fm_p_type,& cp_fm_type -#include "../common/cp_common_uses.f90" #include "../common/../base/base_uses.f90" IMPLICIT NONE diff --git a/src/force_env_methods.F b/src/force_env_methods.F index 489d690404..85ad7e768c 100644 --- a/src/force_env_methods.F +++ b/src/force_env_methods.F @@ -26,7 +26,10 @@ MODULE force_env_methods USE constraint_vsite, ONLY: vsite_force_control USE cp_iter_types, ONLY: cp_iteration_info_copy_iter USE cp_log_handling, ONLY: cp_add_default_logger,& - cp_rm_default_logger + cp_get_default_logger,& + cp_logger_type,& + cp_rm_default_logger,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr,& low_print_level @@ -119,7 +122,6 @@ MODULE force_env_methods virial_release,& virial_type,& zero_virial -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/force_env_types.F b/src/force_env_types.F index 40bd61dd92..bc7ae5d166 100644 --- a/src/force_env_types.F +++ b/src/force_env_types.F @@ -16,6 +16,7 @@ MODULE force_env_types USE cell_types, ONLY: cell_type USE cp_log_handling, ONLY: cp_add_default_logger,& + cp_logger_type,& cp_rm_default_logger USE cp_para_env, ONLY: cp_para_env_release USE cp_para_types, ONLY: cp_para_env_type @@ -57,7 +58,6 @@ MODULE force_env_types USE qs_environment_types, ONLY: get_qs_env,& qs_env_release,& qs_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/force_env_utils.F b/src/force_env_utils.F index 3ed698a7f9..942d2c8a40 100644 --- a/src/force_env_utils.F +++ b/src/force_env_utils.F @@ -32,7 +32,6 @@ MODULE force_env_utils USE particle_list_types, ONLY: particle_list_type USE particle_types, ONLY: update_particle_set USE physcon, ONLY: pascal -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/force_field_types.F b/src/force_field_types.F index 188d98ca81..e4d9ca8b19 100644 --- a/src/force_field_types.F +++ b/src/force_field_types.F @@ -21,7 +21,6 @@ MODULE force_field_types pair_potential_p_type USE shell_potential_types, ONLY: shell_p_release,& shell_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/force_fields.F b/src/force_fields.F index d500b7d59c..dc6eecd8ea 100644 --- a/src/force_fields.F +++ b/src/force_fields.F @@ -17,6 +17,8 @@ MODULE force_fields USE atomic_kind_types, ONLY: atomic_kind_type USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -49,7 +51,6 @@ MODULE force_fields USE molecule_types_new, ONLY: molecule_type USE particle_types, ONLY: particle_type USE qmmm_types_low, ONLY: qmmm_env_mm_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/force_fields_all.F b/src/force_fields_all.F index f48f6307b3..005a8c3e2c 100644 --- a/src/force_fields_all.F +++ b/src/force_fields_all.F @@ -19,6 +19,7 @@ MODULE force_fields_all USE cell_types, ONLY: cell_type USE cp_linked_list_val, ONLY: cp_sll_val_next,& cp_sll_val_type + USE cp_log_handling, ONLY: cp_to_string USE damping_dipole_types, ONLY: damping_p_create,& damping_p_type,& tang_toennies @@ -86,7 +87,6 @@ MODULE force_fields_all USE string_utilities, ONLY: compress,& integer_to_string,& uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/force_fields_ext.F b/src/force_fields_ext.F index ab5b62679a..ae3ad439d6 100644 --- a/src/force_fields_ext.F +++ b/src/force_fields_ext.F @@ -18,6 +18,8 @@ !> \author CJM ! ***************************************************************************** MODULE force_fields_ext + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -41,7 +43,6 @@ MODULE force_fields_ext USE particle_types, ONLY: particle_type USE string_utilities, ONLY: uppercase USE topology_amber, ONLY: rdparm_amber_8 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/force_fields_input.F b/src/force_fields_input.F index cab6969cda..458ba91300 100644 --- a/src/force_fields_input.F +++ b/src/force_fields_input.F @@ -22,6 +22,9 @@ MODULE force_fields_input Tosi1964b,& Yamada2000,& cite_reference + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -57,7 +60,6 @@ MODULE force_fields_input USE shell_potential_types, ONLY: shell_p_create,& shell_p_type USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/force_fields_util.F b/src/force_fields_util.F index ec6f709751..b5d1bf2026 100644 --- a/src/force_fields_util.F +++ b/src/force_fields_util.F @@ -20,6 +20,9 @@ MODULE force_fields_util get_atomic_kind USE cell_types, ONLY: cell_type USE colvar_types, ONLY: dist_colvar_id + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_units, ONLY: cp_unit_to_cp2k @@ -72,7 +75,6 @@ MODULE force_fields_util USE qmmm_types_low, ONLY: qmmm_env_mm_type USE shell_potential_types, ONLY: shell_kind_type USE string_utilities, ONLY: compress -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fp_methods.F b/src/fp_methods.F index a5b191c56e..98691006f0 100644 --- a/src/fp_methods.F +++ b/src/fp_methods.F @@ -16,6 +16,8 @@ MODULE fp_methods psi USE cell_types, ONLY: cell_type,& pbc + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_iter_string,& cp_print_key_finished_output,& cp_print_key_unit_nr @@ -28,7 +30,6 @@ MODULE fp_methods oorootpi USE particle_list_types, ONLY: particle_list_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/fp_types.F b/src/fp_types.F index bfd980f742..acfa51c244 100644 --- a/src/fp_types.F +++ b/src/fp_types.F @@ -10,6 +10,8 @@ !> \author Joost VandeVondele ! ***************************************************************************** MODULE fp_types + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_section_types, ONLY: section_vals_get,& @@ -19,7 +21,6 @@ MODULE fp_types section_vals_type,& section_vals_val_get USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/free_energy_types.F b/src/free_energy_types.F index ca7a8f2c85..204a9500ff 100644 --- a/src/free_energy_types.F +++ b/src/free_energy_types.F @@ -18,7 +18,6 @@ MODULE free_energy_types section_vals_val_get USE kinds, ONLY: default_string_length,& dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/gauss_colloc.F b/src/gauss_colloc.F index 713435e9ae..f274464f66 100644 --- a/src/gauss_colloc.F +++ b/src/gauss_colloc.F @@ -21,7 +21,6 @@ MODULE gauss_colloc USE lgrid_types, ONLY: lgrid_type !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/gaussian_gridlevels.F b/src/gaussian_gridlevels.F index 3bd560111b..973dc4706d 100644 --- a/src/gaussian_gridlevels.F +++ b/src/gaussian_gridlevels.F @@ -9,6 +9,8 @@ !> \author Joost VandeVondele (27.02.02) ! ***************************************************************************** MODULE gaussian_gridlevels + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -18,7 +20,6 @@ MODULE gaussian_gridlevels USE kinds, ONLY: dp,& int_8 USE message_passing, ONLY: mp_sum -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/gle_system_types.F b/src/gle_system_types.F index 37e78cb457..d3c3a6d522 100644 --- a/src/gle_system_types.F +++ b/src/gle_system_types.F @@ -24,7 +24,6 @@ MODULE gle_system_types next_rng_seed,& rng_stream_type USE string_utilities, ONLY: compress -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/global_types.F b/src/global_types.F index 0ee6e76b8f..b5a9fdef5f 100644 --- a/src/global_types.F +++ b/src/global_types.F @@ -25,7 +25,6 @@ MODULE global_types USE machine, ONLY: m_walltime USE parallel_rng_types, ONLY: delete_rng_stream,& rng_stream_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/graphcon.F b/src/graphcon.F index da53b0649d..575fa1ed4f 100644 --- a/src/graphcon.F +++ b/src/graphcon.F @@ -21,7 +21,6 @@ MODULE graphcon USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hartree_local_methods.F b/src/hartree_local_methods.F index e1321cc274..5eb2253947 100644 --- a/src/hartree_local_methods.F +++ b/src/hartree_local_methods.F @@ -46,7 +46,6 @@ MODULE hartree_local_methods rho_atom_coeff,& rho_atom_type USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hartree_local_types.F b/src/hartree_local_types.F index 88e45b6ac4..984dd64504 100644 --- a/src/hartree_local_types.F +++ b/src/hartree_local_types.F @@ -7,7 +7,6 @@ MODULE hartree_local_types USE kinds, ONLY: dp USE qs_rho_atom_types, ONLY: rho_atom_coeff -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/header.F b/src/header.F index 2dd9dc7e33..0d3202c3ed 100644 --- a/src/header.F +++ b/src/header.F @@ -15,7 +15,6 @@ MODULE header r_pid,& r_user_name USE kinds, ONLY: default_path_length -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/helium_common.F b/src/helium_common.F index cba3063718..e45ef3ac5d 100644 --- a/src/helium_common.F +++ b/src/helium_common.F @@ -26,7 +26,6 @@ MODULE helium_common USE splines_methods, ONLY: spline_value USE splines_types, ONLY: spline_data_p_type,& spline_data_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/helium_io.F b/src/helium_io.F index 42e3333fe9..5978d31ed6 100644 --- a/src/helium_io.F +++ b/src/helium_io.F @@ -11,6 +11,9 @@ MODULE helium_io USE cell_types, ONLY: get_cell + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -37,7 +40,6 @@ MODULE helium_io USE machine, ONLY: m_flush USE message_passing, ONLY: mp_gather,& mp_sum -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/helium_types.F b/src/helium_types.F index 1a3ff1b423..c3e1dff354 100644 --- a/src/helium_types.F +++ b/src/helium_types.F @@ -13,12 +13,12 @@ MODULE helium_types USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_logger_type USE input_section_types, ONLY: section_vals_type USE kinds, ONLY: dp,& int_8 USE parallel_rng_types, ONLY: rng_stream_type USE splines_types, ONLY: spline_data_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_admm_utils.F b/src/hfx_admm_utils.F index bfdaee586f..2e67efb500 100644 --- a/src/hfx_admm_utils.F +++ b/src/hfx_admm_utils.F @@ -27,6 +27,8 @@ MODULE hfx_admm_utils USE cp_dbcsr_operations, ONLY: copy_dbcsr_to_fm USE cp_fm_types, ONLY: cp_fm_get_info,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -79,7 +81,6 @@ MODULE hfx_admm_utils USE rt_propagation_types, ONLY: rt_prop_type USE virial_types, ONLY: virial_type USE xc_adiabatic_utils, ONLY: rescale_xc_potential -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_communication.F b/src/hfx_communication.F index 3fbf02db79..dc365f2871 100644 --- a/src/hfx_communication.F +++ b/src/hfx_communication.F @@ -35,7 +35,6 @@ MODULE hfx_communication USE particle_types, ONLY: particle_type USE qs_environment_types, ONLY: get_qs_env,& qs_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_compression_methods.F b/src/hfx_compression_methods.F index 4aaa179a20..d53fb62812 100644 --- a/src/hfx_compression_methods.F +++ b/src/hfx_compression_methods.F @@ -18,7 +18,6 @@ MODULE hfx_compression_methods hfx_container_type USE kinds, ONLY: dp,& int_8 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_derivatives.F b/src/hfx_derivatives.F index 28280b4dd3..a9fa263567 100644 --- a/src/hfx_derivatives.F +++ b/src/hfx_derivatives.F @@ -21,6 +21,8 @@ MODULE hfx_derivatives dbcsr_type_antisymmetric USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -75,7 +77,6 @@ MODULE hfx_derivatives !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_energy_potential.F b/src/hfx_energy_potential.F index 02ff10c616..9db1e57582 100644 --- a/src/hfx_energy_potential.F +++ b/src/hfx_energy_potential.F @@ -25,6 +25,8 @@ MODULE hfx_energy_potential dbcsr_type_antisymmetric USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -92,7 +94,6 @@ MODULE hfx_energy_potential !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_helpers.F b/src/hfx_helpers.F index d3f4a0d494..6a90e51f11 100644 --- a/src/hfx_helpers.F +++ b/src/hfx_helpers.F @@ -19,7 +19,6 @@ MODULE hfx_helpers USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp USE message_passing, ONLY: mp_sum -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_libint_interface.F b/src/hfx_libint_interface.F index 135b6f3642..9f1cec475d 100644 --- a/src/hfx_libint_interface.F +++ b/src/hfx_libint_interface.F @@ -36,7 +36,6 @@ MODULE hfx_libint_interface USE mathconstants, ONLY: pi USE orbital_pointers, ONLY: nco USE t_c_g0, ONLY: t_c_g0_n -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_libint_wrapper.F b/src/hfx_libint_wrapper.F index 01dae03eeb..2bdc46920e 100644 --- a/src/hfx_libint_wrapper.F +++ b/src/hfx_libint_wrapper.F @@ -28,7 +28,6 @@ MODULE hfx_libint_wrapper prim_data USE kinds, ONLY: dp USE orbital_pointers, ONLY: nco -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_load_balance_methods.F b/src/hfx_load_balance_methods.F index 69cd352138..dc5fd10f03 100644 --- a/src/hfx_load_balance_methods.F +++ b/src/hfx_load_balance_methods.F @@ -39,7 +39,6 @@ MODULE hfx_load_balance_methods rng_stream_type USE particle_types, ONLY: particle_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_pair_list_methods.F b/src/hfx_pair_list_methods.F index aae2482e61..a2e14172ce 100644 --- a/src/hfx_pair_list_methods.F +++ b/src/hfx_pair_list_methods.F @@ -30,7 +30,6 @@ MODULE hfx_pair_list_methods USE particle_types, ONLY: particle_type USE t_c_g0, ONLY: t_c_g0_n USE t_sh_p_s_c, ONLY: trunc_CS_poly_n20 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_screening_methods.F b/src/hfx_screening_methods.F index 18d0817441..19705c3e12 100644 --- a/src/hfx_screening_methods.F +++ b/src/hfx_screening_methods.F @@ -30,7 +30,6 @@ MODULE hfx_screening_methods qs_environment_type USE qs_kind_types, ONLY: get_qs_kind,& qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfx_types.F b/src/hfx_types.F index 8a07761fcb..b457c94ea4 100644 --- a/src/hfx_types.F +++ b/src/hfx_types.F @@ -26,6 +26,8 @@ MODULE hfx_types USE cp_files, ONLY: close_file,& file_exists,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -67,7 +69,6 @@ MODULE hfx_types !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfxbase/hfx_compression_core_methods.F b/src/hfxbase/hfx_compression_core_methods.F index 183cc55d4e..d6ec0fbda0 100644 --- a/src/hfxbase/hfx_compression_core_methods.F +++ b/src/hfxbase/hfx_compression_core_methods.F @@ -13,7 +13,6 @@ MODULE hfx_compression_core_methods USE kinds, ONLY: int_8 -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfxbase/hfx_contract_block.F b/src/hfxbase/hfx_contract_block.F index 1869f5e50c..96427c76dd 100644 --- a/src/hfxbase/hfx_contract_block.F +++ b/src/hfxbase/hfx_contract_block.F @@ -12,7 +12,6 @@ ! ***************************************************************************** MODULE hfx_contract_block USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/hfxbase/hfx_contraction_methods.F b/src/hfxbase/hfx_contraction_methods.F index 77138c6bb0..cce505e969 100644 --- a/src/hfxbase/hfx_contraction_methods.F +++ b/src/hfxbase/hfx_contraction_methods.F @@ -25,7 +25,6 @@ MODULE hfx_contraction_methods #endif USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/hirshfeld_methods.F b/src/hirshfeld_methods.F index 2524258d78..21908bef39 100644 --- a/src/hirshfeld_methods.F +++ b/src/hirshfeld_methods.F @@ -56,7 +56,6 @@ MODULE hirshfeld_methods rs_grid_retain,& rs_grid_zero,& rs_pw_transfer -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/hirshfeld_types.F b/src/hirshfeld_types.F index 3082eb4948..d3e0674973 100644 --- a/src/hirshfeld_types.F +++ b/src/hirshfeld_types.F @@ -16,7 +16,6 @@ MODULE hirshfeld_types USE kinds, ONLY: dp USE pw_types, ONLY: pw_p_type,& pw_release -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_linked_list_char.F b/src/input/cp_linked_list_char.F index 1358b8bffd..e005d3e870 100644 --- a/src/input/cp_linked_list_char.F +++ b/src/input/cp_linked_list_char.F @@ -45,7 +45,6 @@ ! ***************************************************************************** MODULE cp_linked_list_char USE kinds, ONLY: default_string_length -#include "../common/cp_common_uses.f90" #include "../common/../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_linked_list_int.F b/src/input/cp_linked_list_int.F index 3ee3615c10..f56c3a5b91 100644 --- a/src/input/cp_linked_list_int.F +++ b/src/input/cp_linked_list_int.F @@ -45,7 +45,6 @@ ! ***************************************************************************** MODULE cp_linked_list_int -#include "../common/cp_common_uses.f90" #include "../common/../base/base_uses.f90" IMPLICIT NONE PRIVATE diff --git a/src/input/cp_linked_list_logical.F b/src/input/cp_linked_list_logical.F index 3c77b61570..26f96797b7 100644 --- a/src/input/cp_linked_list_logical.F +++ b/src/input/cp_linked_list_logical.F @@ -45,7 +45,6 @@ ! ***************************************************************************** MODULE cp_linked_list_logical -#include "../common/cp_common_uses.f90" #include "../common/../base/base_uses.f90" IMPLICIT NONE PRIVATE diff --git a/src/input/cp_linked_list_real.F b/src/input/cp_linked_list_real.F index 193a183e81..ebc3446efc 100644 --- a/src/input/cp_linked_list_real.F +++ b/src/input/cp_linked_list_real.F @@ -45,7 +45,6 @@ ! ***************************************************************************** MODULE cp_linked_list_real USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../common/../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_linked_list_val.F b/src/input/cp_linked_list_val.F index 0f3b66812e..3c0e42699b 100644 --- a/src/input/cp_linked_list_val.F +++ b/src/input/cp_linked_list_val.F @@ -46,7 +46,6 @@ MODULE cp_linked_list_val USE input_val_types, ONLY: val_p_type,& val_type -#include "../common/cp_common_uses.f90" #include "../common/../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_output_handling.F b/src/input/cp_output_handling.F index d8ad2cc351..8dd5709224 100644 --- a/src/input/cp_output_handling.F +++ b/src/input/cp_output_handling.F @@ -28,7 +28,11 @@ MODULE cp_output_handling cp_iteration_info_type,& each_desc_labels,& each_possible_labels - USE cp_log_handling, ONLY: cp_logger_generate_filename + USE cp_log_handling, ONLY: cp_logger_generate_filename,& + cp_logger_get_default_unit_nr,& + cp_logger_get_unit_nr,& + cp_logger_type,& + cp_to_string USE input_keyword_types, ONLY: keyword_create,& keyword_release,& keyword_type @@ -46,7 +50,6 @@ MODULE cp_output_handling USE memory_utilities, ONLY: reallocate USE string_utilities, ONLY: compress,& s2a -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_parser_buffer_types.F b/src/input/cp_parser_buffer_types.F index 026f292f31..c3b4f52b69 100644 --- a/src/input/cp_parser_buffer_types.F +++ b/src/input/cp_parser_buffer_types.F @@ -11,7 +11,6 @@ MODULE cp_parser_buffer_types USE kinds, ONLY: max_line_length -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_parser_ilist_methods.F b/src/input/cp_parser_ilist_methods.F index 715d390c34..1b6a2c34d7 100644 --- a/src/input/cp_parser_ilist_methods.F +++ b/src/input/cp_parser_ilist_methods.F @@ -13,8 +13,8 @@ !> \date 25.02.2008 ! ***************************************************************************** MODULE cp_parser_ilist_methods + USE cp_log_handling, ONLY: cp_to_string USE cp_parser_ilist_types, ONLY: ilist_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_parser_ilist_types.F b/src/input/cp_parser_ilist_types.F index 47d981fd27..af6ccf0dc5 100644 --- a/src/input/cp_parser_ilist_types.F +++ b/src/input/cp_parser_ilist_types.F @@ -15,7 +15,6 @@ MODULE cp_parser_ilist_types -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE PRIVATE diff --git a/src/input/cp_parser_inpp_methods.F b/src/input/cp_parser_inpp_methods.F index 5114e5e5b8..7462970eeb 100644 --- a/src/input/cp_parser_inpp_methods.F +++ b/src/input/cp_parser_inpp_methods.F @@ -17,13 +17,13 @@ MODULE cp_parser_inpp_methods USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_parser_inpp_types, ONLY: inpp_type USE kinds, ONLY: default_path_length,& default_string_length USE memory_utilities, ONLY: reallocate USE string_utilities, ONLY: is_whitespace,& uppercase -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_parser_inpp_types.F b/src/input/cp_parser_inpp_types.F index e22269f6ca..a873399f9d 100644 --- a/src/input/cp_parser_inpp_types.F +++ b/src/input/cp_parser_inpp_types.F @@ -15,7 +15,6 @@ MODULE cp_parser_inpp_types USE kinds, ONLY: default_path_length -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_parser_methods.F b/src/input/cp_parser_methods.F index 27fa34501b..7bca74c9aa 100644 --- a/src/input/cp_parser_methods.F +++ b/src/input/cp_parser_methods.F @@ -17,6 +17,7 @@ ! ***************************************************************************** MODULE cp_parser_methods + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE cp_parser_buffer_types, ONLY: copy_buffer_type,& finalize_sub_buffer,& @@ -36,7 +37,6 @@ MODULE cp_parser_methods USE message_passing, ONLY: mp_bcast USE string_utilities, ONLY: is_whitespace,& uppercase -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_parser_status_types.F b/src/input/cp_parser_status_types.F index c3ff0a9ac3..6b67591816 100644 --- a/src/input/cp_parser_status_types.F +++ b/src/input/cp_parser_status_types.F @@ -13,7 +13,6 @@ MODULE cp_parser_status_types create_buffer_type,& release_buffer_type USE kinds, ONLY: max_line_length -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/cp_parser_types.F b/src/input/cp_parser_types.F index 3414e7ef0a..d779c89870 100644 --- a/src/input/cp_parser_types.F +++ b/src/input/cp_parser_types.F @@ -40,7 +40,6 @@ MODULE cp_parser_types max_line_length USE message_passing, ONLY: MPI_COMM_SELF USE string_utilities, ONLY: compress -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/input_enumeration_types.F b/src/input/input_enumeration_types.F index d4d54e613e..1f18ed8597 100644 --- a/src/input/input_enumeration_types.F +++ b/src/input/input_enumeration_types.F @@ -11,10 +11,10 @@ ! ***************************************************************************** MODULE input_enumeration_types + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: default_string_length USE string_utilities, ONLY: a2s,& uppercase -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/input_keyword_types.F b/src/input/input_keyword_types.F index a85715a564..c47f2e4eba 100644 --- a/src/input/input_keyword_types.F +++ b/src/input/input_keyword_types.F @@ -33,7 +33,6 @@ MODULE input_keyword_types typo_match,& uppercase USE termination, ONLY: print_message -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/input_parsing.F b/src/input/input_parsing.F index 57f3e06d53..2804c040eb 100644 --- a/src/input/input_parsing.F +++ b/src/input/input_parsing.F @@ -28,6 +28,8 @@ MODULE input_parsing cp_to_array USE cp_linked_list_val, ONLY: cp_sll_val_create,& cp_sll_val_type + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit,& + cp_to_string USE cp_parser_methods, ONLY: parser_get_object,& parser_location,& parser_skip_space,& @@ -59,7 +61,6 @@ MODULE input_parsing max_line_length USE string_utilities, ONLY: uppercase USE termination, ONLY: print_message -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/input_section_types.F b/src/input/input_section_types.F index ba7ba85260..69cedf74ec 100644 --- a/src/input/input_section_types.F +++ b/src/input/input_section_types.F @@ -18,6 +18,7 @@ MODULE input_section_types cp_sll_val_get_length, cp_sll_val_get_rest, cp_sll_val_insert_el_at, & cp_sll_val_next, cp_sll_val_p_type, cp_sll_val_rm_el_at, & cp_sll_val_set_el_at, cp_sll_val_type + USE cp_log_handling, ONLY: cp_to_string USE input_keyword_types, ONLY: keyword_describe,& keyword_describe_html,& keyword_p_type,& @@ -46,7 +47,6 @@ MODULE input_section_types typo_match,& uppercase USE termination, ONLY: print_message -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input/input_val_types.F b/src/input/input_val_types.F index f4f0581695..46a4779954 100644 --- a/src/input/input_val_types.F +++ b/src/input/input_val_types.F @@ -24,7 +24,6 @@ MODULE input_val_types enumeration_type USE kinds, ONLY: default_string_length,& dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_almo.F b/src/input_cp2k_almo.F index 86f15a1492..d24a0b1a45 100644 --- a/src/input_cp2k_almo.F +++ b/src/input_cp2k_almo.F @@ -29,7 +29,6 @@ MODULE input_cp2k_almo section_type USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_atom.F b/src/input_cp2k_atom.F index ae1f442969..0cc0912843 100644 --- a/src/input_cp2k_atom.F +++ b/src/input_cp2k_atom.F @@ -37,7 +37,6 @@ MODULE input_cp2k_atom real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_atprop.F b/src/input_cp2k_atprop.F index d3423cfe87..87e10a5d22 100644 --- a/src/input_cp2k_atprop.F +++ b/src/input_cp2k_atprop.F @@ -17,7 +17,6 @@ MODULE input_cp2k_atprop USE input_section_types, ONLY: section_add_keyword,& section_create,& section_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_binary_restarts.F b/src/input_cp2k_binary_restarts.F index bcb5583fa5..e5f321319b 100644 --- a/src/input_cp2k_binary_restarts.F +++ b/src/input_cp2k_binary_restarts.F @@ -14,6 +14,10 @@ MODULE input_cp2k_binary_restarts USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_unit_nr,& debug_print_level USE cp_para_types, ONLY: cp_para_env_type @@ -36,7 +40,6 @@ MODULE input_cp2k_binary_restarts stop_read USE topology_types, ONLY: atom_info_type,& topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_check.F b/src/input_cp2k_check.F index f1453886a1..113e9e1429 100644 --- a/src/input_cp2k_check.F +++ b/src/input_cp2k_check.F @@ -10,6 +10,7 @@ !> \author fawzi ! ***************************************************************************** MODULE input_cp2k_check + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE cp_parser_types, ONLY: cp_parser_type,& parser_create,& @@ -38,7 +39,6 @@ MODULE input_cp2k_check dp USE memory_utilities, ONLY: reallocate USE xc_input_constants, ONLY: do_vwn5 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_colvar.F b/src/input_cp2k_colvar.F index e5d82d7111..1d4b466773 100644 --- a/src/input_cp2k_colvar.F +++ b/src/input_cp2k_colvar.F @@ -37,7 +37,6 @@ MODULE input_cp2k_colvar real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_constraints.F b/src/input_cp2k_constraints.F index c3b142be56..c5521cee00 100644 --- a/src/input_cp2k_constraints.F +++ b/src/input_cp2k_constraints.F @@ -36,7 +36,6 @@ MODULE input_cp2k_constraints real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_dft.F b/src/input_cp2k_dft.F index 2e933c45ad..5cc711b05b 100644 --- a/src/input_cp2k_dft.F +++ b/src/input_cp2k_dft.F @@ -131,7 +131,6 @@ MODULE input_cp2k_dft USE qs_fb_input, ONLY: create_filtermatrix_section USE string_utilities, ONLY: newline,& s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_distribution.F b/src/input_cp2k_distribution.F index 5c19250224..66707ba472 100644 --- a/src/input_cp2k_distribution.F +++ b/src/input_cp2k_distribution.F @@ -21,7 +21,6 @@ MODULE input_cp2k_distribution section_create,& section_type USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_eip.F b/src/input_cp2k_eip.F index 6fc236d17a..ba6341cd5f 100644 --- a/src/input_cp2k_eip.F +++ b/src/input_cp2k_eip.F @@ -25,7 +25,6 @@ MODULE input_cp2k_eip section_type USE input_val_types, ONLY: enum_t USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_force_eval.F b/src/input_cp2k_force_eval.F index e572ae81ae..e4ca45fb6d 100644 --- a/src/input_cp2k_force_eval.F +++ b/src/input_cp2k_force_eval.F @@ -42,7 +42,6 @@ MODULE input_cp2k_force_eval real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_free_energy.F b/src/input_cp2k_free_energy.F index 53722b578f..3088436940 100644 --- a/src/input_cp2k_free_energy.F +++ b/src/input_cp2k_free_energy.F @@ -34,7 +34,6 @@ MODULE input_cp2k_free_energy real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_global.F b/src/input_cp2k_global.F index c33a20436e..39d2114929 100644 --- a/src/input_cp2k_global.F +++ b/src/input_cp2k_global.F @@ -57,7 +57,6 @@ MODULE input_cp2k_global USE input_val_types, ONLY: char_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_hfx.F b/src/input_cp2k_hfx.F index c57d56b38b..5b9f74406f 100644 --- a/src/input_cp2k_hfx.F +++ b/src/input_cp2k_hfx.F @@ -31,7 +31,6 @@ MODULE input_cp2k_hfx USE input_val_types, ONLY: real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_kpoints.F b/src/input_cp2k_kpoints.F index c8a5a3da3a..3f0dc50458 100644 --- a/src/input_cp2k_kpoints.F +++ b/src/input_cp2k_kpoints.F @@ -21,7 +21,6 @@ MODULE input_cp2k_kpoints real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_ls.F b/src/input_cp2k_ls.F index f29541e246..38394d31f8 100644 --- a/src/input_cp2k_ls.F +++ b/src/input_cp2k_ls.F @@ -36,7 +36,6 @@ MODULE input_cp2k_ls USE pao_input, ONLY: create_pao_section USE qs_density_mixing_types, ONLY: create_mixing_section USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_mixed.F b/src/input_cp2k_mixed.F index c578d08fb1..b0efca849b 100644 --- a/src/input_cp2k_mixed.F +++ b/src/input_cp2k_mixed.F @@ -33,7 +33,6 @@ MODULE input_cp2k_mixed real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_mm.F b/src/input_cp2k_mm.F index a5fe52e5e0..bfc501bbd4 100644 --- a/src/input_cp2k_mm.F +++ b/src/input_cp2k_mm.F @@ -46,7 +46,6 @@ MODULE input_cp2k_mm USE kinds, ONLY: default_string_length,& dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_motion_print.F b/src/input_cp2k_motion_print.F index a5889c45ae..2ec5e7f66d 100644 --- a/src/input_cp2k_motion_print.F +++ b/src/input_cp2k_motion_print.F @@ -30,7 +30,6 @@ MODULE input_cp2k_motion_print section_type USE string_utilities, ONLY: newline,& s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_mp2.F b/src/input_cp2k_mp2.F index 3fd089e144..b79685bb8f 100644 --- a/src/input_cp2k_mp2.F +++ b/src/input_cp2k_mp2.F @@ -40,7 +40,6 @@ MODULE input_cp2k_mp2 real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_neb.F b/src/input_cp2k_neb.F index 52d1c50442..ff3ccdb02c 100644 --- a/src/input_cp2k_neb.F +++ b/src/input_cp2k_neb.F @@ -39,7 +39,6 @@ MODULE input_cp2k_neb USE input_val_types, ONLY: real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_poisson.F b/src/input_cp2k_poisson.F index df8fe40003..8912c81cd3 100644 --- a/src/input_cp2k_poisson.F +++ b/src/input_cp2k_poisson.F @@ -70,7 +70,6 @@ MODULE input_cp2k_poisson precond_spl3_aint,& precond_spl3_aint2 USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_properties_dft.F b/src/input_cp2k_properties_dft.F index e73d5632e5..badfe93740 100644 --- a/src/input_cp2k_properties_dft.F +++ b/src/input_cp2k_properties_dft.F @@ -47,7 +47,6 @@ MODULE input_cp2k_properties_dft real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_qmmm.F b/src/input_cp2k_qmmm.F index 024665834b..2695d2a16e 100644 --- a/src/input_cp2k_qmmm.F +++ b/src/input_cp2k_qmmm.F @@ -70,7 +70,6 @@ MODULE input_cp2k_qmmm precond_spl3_aint,& precond_spl3_aint2 USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_read.F b/src/input_cp2k_read.F index f3d6dbd189..dc7520c130 100644 --- a/src/input_cp2k_read.F +++ b/src/input_cp2k_read.F @@ -23,7 +23,6 @@ MODULE input_cp2k_read USE input_section_types, ONLY: section_type,& section_vals_create,& section_vals_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_resp.F b/src/input_cp2k_resp.F index 73e40fbf34..fdbbd157f8 100644 --- a/src/input_cp2k_resp.F +++ b/src/input_cp2k_resp.F @@ -36,7 +36,6 @@ MODULE input_cp2k_resp real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_restarts_util.F b/src/input_cp2k_restarts_util.F index 8759f1ea5f..47215e8d99 100644 --- a/src/input_cp2k_restarts_util.F +++ b/src/input_cp2k_restarts_util.F @@ -16,7 +16,6 @@ MODULE input_cp2k_restarts_util val_type USE kinds, ONLY: dp USE particle_list_types, ONLY: particle_list_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_rsgrid.F b/src/input_cp2k_rsgrid.F index 3703f96015..f52370090f 100644 --- a/src/input_cp2k_rsgrid.F +++ b/src/input_cp2k_rsgrid.F @@ -21,7 +21,6 @@ MODULE input_cp2k_rsgrid rsgrid_distributed,& rsgrid_replicated USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_subsys.F b/src/input_cp2k_subsys.F index 7cdf25a916..69b19a22e9 100644 --- a/src/input_cp2k_subsys.F +++ b/src/input_cp2k_subsys.F @@ -54,7 +54,6 @@ MODULE input_cp2k_subsys USE physcon, ONLY: bohr USE string_utilities, ONLY: newline,& s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_thermostats.F b/src/input_cp2k_thermostats.F index ecd0a4bb67..f9e509ef6f 100644 --- a/src/input_cp2k_thermostats.F +++ b/src/input_cp2k_thermostats.F @@ -38,7 +38,6 @@ MODULE input_cp2k_thermostats real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_transport.F b/src/input_cp2k_transport.F index 2a72d0f693..10fecca5f6 100644 --- a/src/input_cp2k_transport.F +++ b/src/input_cp2k_transport.F @@ -28,7 +28,6 @@ MODULE input_cp2k_transport section_type USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_cp2k_xc.F b/src/input_cp2k_xc.F index 554a30a1b9..774ea46d76 100644 --- a/src/input_cp2k_xc.F +++ b/src/input_cp2k_xc.F @@ -53,7 +53,6 @@ MODULE input_cp2k_xc xc_rho_no_smooth, xc_rho_spline2_smooth, xc_rho_spline3_smooth, & xc_test_lsd_f_routine, xgga_b88x, xgga_ev93, xgga_opt, xgga_pbex, & xgga_pw86, xgga_pw91, xgga_revpbe -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_optimize_basis.F b/src/input_optimize_basis.F index fa76d6fd15..882d01d2fb 100644 --- a/src/input_optimize_basis.F +++ b/src/input_optimize_basis.F @@ -28,7 +28,6 @@ MODULE input_optimize_basis real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_optimize_input.F b/src/input_optimize_input.F index 48adebc4e4..7d55d09315 100644 --- a/src/input_optimize_input.F +++ b/src/input_optimize_input.F @@ -25,7 +25,6 @@ MODULE input_optimize_input real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_restart_force_eval.F b/src/input_restart_force_eval.F index 9962185993..4e49ce3ee1 100644 --- a/src/input_restart_force_eval.F +++ b/src/input_restart_force_eval.F @@ -57,7 +57,6 @@ MODULE input_restart_force_eval USE qs_environment_types, ONLY: get_qs_env USE string_utilities, ONLY: string_to_ascii USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/input_restart_rng.F b/src/input_restart_rng.F index 6d17d02840..29c9980ca0 100644 --- a/src/input_restart_rng.F +++ b/src/input_restart_rng.F @@ -16,7 +16,6 @@ MODULE input_restart_rng val_type USE parallel_rng_types, ONLY: rng_record_length USE string_utilities, ONLY: ascii_to_string -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ipi_driver.F b/src/ipi_driver.F index 3c60c631f7..ff5ab0deb2 100644 --- a/src/ipi_driver.F +++ b/src/ipi_driver.F @@ -20,6 +20,7 @@ MODULE ipi_driver cell_type,& init_cell USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_types, ONLY: cp_para_env_type USE cp_subsys_types, ONLY: cp_subsys_get,& cp_subsys_set,& @@ -41,7 +42,6 @@ MODULE ipi_driver mp_sync,& mp_testany USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/iterate_matrix.F b/src/iterate_matrix.F index 79b2f7c16b..af01721f1d 100644 --- a/src/iterate_matrix.F +++ b/src/iterate_matrix.F @@ -19,12 +19,14 @@ MODULE iterate_matrix cp_dbcsr_setup_arnoldi_data, cp_dbcsr_transposed, cp_dbcsr_type, & dbcsr_arnoldi_data, dbcsr_norm_maxabsnorm, dbcsr_type_no_symmetry, & deallocate_arnoldi_data, get_selected_ritz_val + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE kinds, ONLY: dp,& int_8 USE machine, ONLY: m_flush,& m_walltime USE mathconstants, ONLY: ifac -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/k290.F b/src/k290.F index 07e06c4d9b..9d40e4597b 100644 --- a/src/k290.F +++ b/src/k290.F @@ -12,7 +12,6 @@ MODULE k290 USE kinds, ONLY: dp USE mathlib, ONLY: invmat USE string_utilities, ONLY: xstring -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/kg_correction.F b/src/kg_correction.F index 3c4d2c7ca0..6f41eb2c48 100644 --- a/src/kg_correction.F +++ b/src/kg_correction.F @@ -35,7 +35,6 @@ MODULE kg_correction qs_rho_set,& qs_rho_type USE qs_vxc, ONLY: qs_vxc_create -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/kg_environment.F b/src/kg_environment.F index ebf10bde8a..7a2c7a21c7 100644 --- a/src/kg_environment.F +++ b/src/kg_environment.F @@ -58,7 +58,6 @@ MODULE kg_environment write_neighbor_lists USE task_list_types, ONLY: deallocate_task_list USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/kg_environment_types.F b/src/kg_environment_types.F index b4a88eb418..1c3a4c513c 100644 --- a/src/kg_environment_types.F +++ b/src/kg_environment_types.F @@ -20,7 +20,6 @@ MODULE kg_environment_types neighbor_list_set_p_type USE task_list_types, ONLY: deallocate_task_list,& task_list_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/kg_tnadd_mat.F b/src/kg_tnadd_mat.F index a44a2b414b..1c62f894bc 100644 --- a/src/kg_tnadd_mat.F +++ b/src/kg_tnadd_mat.F @@ -45,7 +45,6 @@ MODULE kg_tnadd_mat !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/kg_vertex_coloring_methods.F b/src/kg_vertex_coloring_methods.F index 6f0800536a..8e277f35b9 100644 --- a/src/kg_vertex_coloring_methods.F +++ b/src/kg_vertex_coloring_methods.F @@ -17,6 +17,9 @@ MODULE kg_vertex_coloring_methods USE bibliography, ONLY: Brelaz1979,& cite_reference + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE input_constants, ONLY: kg_color_dsatur,& kg_color_greedy USE kg_environment_types, ONLY: kg_environment_type @@ -30,7 +33,6 @@ MODULE kg_vertex_coloring_methods valt USE kinds, ONLY: int_4,& int_8 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/kpoint_io.F b/src/kpoint_io.F index a687ba0e4b..df1ce3a07b 100644 --- a/src/kpoint_io.F +++ b/src/kpoint_io.F @@ -23,6 +23,9 @@ MODULE kpoint_io cp_fm_read_unformatted,& cp_fm_type,& cp_fm_write_unformatted + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -41,7 +44,6 @@ MODULE kpoint_io qs_kind_type USE qs_mo_io, ONLY: wfn_restart_file_name USE qs_scf_types, ONLY: qs_scf_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/kpoint_methods.F b/src/kpoint_methods.F index 2083e9e020..4d00306898 100644 --- a/src/kpoint_methods.F +++ b/src/kpoint_methods.F @@ -35,6 +35,7 @@ MODULE kpoint_methods cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_env, ONLY: cp_cart_create,& cp_para_env_create,& cp_para_env_retain @@ -76,7 +77,6 @@ MODULE kpoint_methods neighbor_list_set_p_type USE scf_control_types, ONLY: smear_type USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/kpoint_transitional.F b/src/kpoint_transitional.F index 649e670c3a..af4c0541b3 100644 --- a/src/kpoint_transitional.F +++ b/src/kpoint_transitional.F @@ -17,7 +17,6 @@ MODULE kpoint_transitional USE cp_dbcsr_interface, ONLY: cp_dbcsr_deallocate_matrix_set,& cp_dbcsr_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/kpoint_types.F b/src/kpoint_types.F index d20f53463d..8c4a58a8a4 100644 --- a/src/kpoint_types.F +++ b/src/kpoint_types.F @@ -15,6 +15,8 @@ MODULE kpoint_types cp_blacs_env_type USE cp_fm_types, ONLY: cp_fm_p_type,& cp_fm_release + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_env, ONLY: cp_cart_release,& @@ -34,7 +36,6 @@ MODULE kpoint_types mo_set_p_type USE qs_neighbor_list_types, ONLY: neighbor_list_set_p_type USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/library_tests.F b/src/library_tests.F index 003ae33b9f..b39728d14c 100644 --- a/src/library_tests.F +++ b/src/library_tests.F @@ -41,6 +41,8 @@ MODULE library_tests cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -104,7 +106,6 @@ MODULE library_tests rs_grid_print, rs_grid_release, rs_grid_release_descriptor, & rs_grid_zero, rs_pw_transfer USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/linesearch.F b/src/linesearch.F index 396bfb335c..c63abd2fa9 100644 --- a/src/linesearch.F +++ b/src/linesearch.F @@ -8,6 +8,8 @@ !> \author Ole Schuett ! ***************************************************************************** MODULE linesearch + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: add_last_numeric,& cp_print_key_section_create,& cp_print_key_unit_nr,& @@ -24,7 +26,6 @@ MODULE linesearch section_vals_val_get USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/lri_debug_integrals.F b/src/lri_debug_integrals.F index a159f8422e..80f63f9677 100644 --- a/src/lri_debug_integrals.F +++ b/src/lri_debug_integrals.F @@ -23,7 +23,6 @@ MODULE lri_debug_integrals USE orbital_pointers, ONLY: coset,& indco,& ncoset -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/lri_environment_init.F b/src/lri_environment_init.F index bbb560ade8..535572e5fa 100644 --- a/src/lri_environment_init.F +++ b/src/lri_environment_init.F @@ -33,7 +33,6 @@ MODULE lri_environment_init USE spherical_harmonics, ONLY: clebsch_gordon,& clebsch_gordon_deallocate,& clebsch_gordon_init -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/lri_environment_methods.F b/src/lri_environment_methods.F index d5321e6216..9f77516037 100644 --- a/src/lri_environment_methods.F +++ b/src/lri_environment_methods.F @@ -24,6 +24,8 @@ MODULE lri_environment_methods USE cp_dbcsr_interface, ONLY: cp_dbcsr_get_block_p,& cp_dbcsr_p_type,& cp_dbcsr_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -67,7 +69,6 @@ MODULE lri_environment_methods USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/lri_environment_types.F b/src/lri_environment_types.F index d66ae2fe2d..8f696b851d 100644 --- a/src/lri_environment_types.F +++ b/src/lri_environment_types.F @@ -28,7 +28,6 @@ MODULE lri_environment_types neighbor_list_iterator_release,& neighbor_list_set_p_type USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/lri_forces.F b/src/lri_forces.F index a917918ee1..2e4458a103 100644 --- a/src/lri_forces.F +++ b/src/lri_forces.F @@ -34,7 +34,6 @@ MODULE lri_forces neighbor_list_set_p_type USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/lri_ks_methods.F b/src/lri_ks_methods.F index 9cea4fbb8b..97cdf6aa2a 100644 --- a/src/lri_ks_methods.F +++ b/src/lri_ks_methods.F @@ -18,6 +18,9 @@ MODULE lri_ks_methods cp_dbcsr_finalize,& cp_dbcsr_get_block_p,& cp_dbcsr_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -54,7 +57,6 @@ MODULE lri_ks_methods neighbor_list_set_p_type USE qs_subsys_types, ONLY: qs_subsys_get,& qs_subsys_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/lri_optimize_ri_basis.F b/src/lri_optimize_ri_basis.F index fcbac78440..4a24273586 100644 --- a/src/lri_optimize_ri_basis.F +++ b/src/lri_optimize_ri_basis.F @@ -20,6 +20,8 @@ MODULE lri_optimize_ri_basis USE cp_dbcsr_interface, ONLY: cp_dbcsr_get_block_p,& cp_dbcsr_p_type,& cp_dbcsr_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_generate_filename,& @@ -64,7 +66,6 @@ MODULE lri_optimize_ri_basis neighbor_list_set_p_type USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/lri_optimize_ri_basis_types.F b/src/lri_optimize_ri_basis_types.F index 85b8f1d265..adeac32aa0 100644 --- a/src/lri_optimize_ri_basis_types.F +++ b/src/lri_optimize_ri_basis_types.F @@ -17,7 +17,6 @@ MODULE lri_optimize_ri_basis_types gto_basis_set_type USE kinds, ONLY: dp USE mathconstants, ONLY: pi -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/lri_os_integrals.F b/src/lri_os_integrals.F index 43aed4cbf0..f16920a480 100644 --- a/src/lri_os_integrals.F +++ b/src/lri_os_integrals.F @@ -22,7 +22,6 @@ MODULE lri_os_integrals overlap_ab_test,& overlap_abc_test USE orbital_pointers, ONLY: ncoset -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/lri_shg_integrals.F b/src/lri_shg_integrals.F index f2d91f84af..aa819e26e3 100644 --- a/src/lri_shg_integrals.F +++ b/src/lri_shg_integrals.F @@ -24,7 +24,6 @@ MODULE lri_shg_integrals ifac,& pi USE orbital_pointers, ONLY: nsoset -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/ls_matrix_exp.F b/src/ls_matrix_exp.F index db01edd799..2dff3a5bc6 100644 --- a/src/ls_matrix_exp.F +++ b/src/ls_matrix_exp.F @@ -16,8 +16,8 @@ MODULE ls_matrix_exp cp_dbcsr_deallocate_matrix, cp_dbcsr_filter, cp_dbcsr_frobenius_norm, & cp_dbcsr_init, cp_dbcsr_multiply, cp_dbcsr_p_type, cp_dbcsr_scale, & cp_dbcsr_set, cp_dbcsr_transposed, cp_dbcsr_type, dbcsr_type_complex_8 + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/manybody_eam.F b/src/manybody_eam.F index eb898f98f9..121e768ce7 100644 --- a/src/manybody_eam.F +++ b/src/manybody_eam.F @@ -28,7 +28,6 @@ MODULE manybody_eam eam_pot_type,& pair_potential_pp_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/manybody_potential.F b/src/manybody_potential.F index 080623d67a..da9320e3de 100644 --- a/src/manybody_potential.F +++ b/src/manybody_potential.F @@ -46,7 +46,6 @@ MODULE manybody_potential siepmann_type, tersoff_pot_type, tersoff_type USE particle_types, ONLY: particle_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/manybody_quip.F b/src/manybody_quip.F index 120b865848..22b67a6651 100644 --- a/src/manybody_quip.F +++ b/src/manybody_quip.F @@ -5,6 +5,7 @@ MODULE manybody_quip +USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE atomic_kind_types, ONLY: atomic_kind_type USE bibliography, ONLY: QUIP_ref,& cite_reference @@ -26,7 +27,6 @@ MODULE manybody_quip USE quip_unified_wrapper_module, ONLY : quip_unified_wrapper #endif -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/manybody_siepmann.F b/src/manybody_siepmann.F index 226447bf2f..675db757da 100644 --- a/src/manybody_siepmann.F +++ b/src/manybody_siepmann.F @@ -19,6 +19,8 @@ MODULE manybody_siepmann USE atomic_kind_types, ONLY: get_atomic_kind USE cell_types, ONLY: cell_type,& pbc + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -35,7 +37,6 @@ MODULE manybody_siepmann siepmann_type USE particle_types, ONLY: particle_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/manybody_tersoff.F b/src/manybody_tersoff.F index 70b0484965..6080199e23 100644 --- a/src/manybody_tersoff.F +++ b/src/manybody_tersoff.F @@ -22,7 +22,6 @@ MODULE manybody_tersoff tersoff_pot_type,& tersoff_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/matrix_exp.F b/src/matrix_exp.F index 8b7bd804da..a29f785557 100644 --- a/src/matrix_exp.F +++ b/src/matrix_exp.F @@ -33,6 +33,7 @@ MODULE matrix_exp cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp USE mathconstants, ONLY: fac @@ -40,7 +41,6 @@ MODULE matrix_exp mp_max,& mp_reordering,& mp_sum -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mdctrl_types.F b/src/mdctrl_types.F index 344eb64975..8c115f79f2 100644 --- a/src/mdctrl_types.F +++ b/src/mdctrl_types.F @@ -11,7 +11,6 @@ MODULE mdctrl_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/metadyn_tools/graph.F b/src/metadyn_tools/graph.F index 7b0ebfe5e3..b82158b4ed 100644 --- a/src/metadyn_tools/graph.F +++ b/src/metadyn_tools/graph.F @@ -33,7 +33,6 @@ PROGRAM graph USE machine, ONLY: m_getarg,& m_iargc USE mathconstants, ONLY: pi -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/metadyn_tools/graph_methods.F b/src/metadyn_tools/graph_methods.F index f2a0660277..b5ab460440 100644 --- a/src/metadyn_tools/graph_methods.F +++ b/src/metadyn_tools/graph_methods.F @@ -33,7 +33,6 @@ MODULE graph_methods ptable USE physcon, ONLY: bohr USE string_utilities, ONLY: uppercase -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/metadyn_tools/graph_utils.F b/src/metadyn_tools/graph_utils.F index ac4d7fa7cc..428a4874bc 100644 --- a/src/metadyn_tools/graph_utils.F +++ b/src/metadyn_tools/graph_utils.F @@ -16,7 +16,6 @@ ! ***************************************************************************** MODULE graph_utils USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/metadynamics.F b/src/metadynamics.F index 64106e82b9..4642f56035 100644 --- a/src/metadynamics.F +++ b/src/metadynamics.F @@ -10,6 +10,7 @@ !> 11.2007 Teodoro Laino [tlaino] - University of Zurich ! ***************************************************************************** MODULE metadynamics +USE cp_log_handling, ONLY: cp_logger_type, cp_get_default_logger USE bibliography, ONLY: VandenCic2006 #if defined (__PLUMED_CP2K) || defined (__PLUMED2) USE cell_types, ONLY: cell_type,& @@ -65,7 +66,6 @@ MODULE metadynamics #endif USE reference_manager, ONLY: cite_reference USE simpar_types, ONLY: simpar_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/metadynamics_types.F b/src/metadynamics_types.F index 5641fbb540..c083b53419 100644 --- a/src/metadynamics_types.F +++ b/src/metadynamics_types.F @@ -18,7 +18,6 @@ MODULE metadynamics_types dp USE parallel_rng_types, ONLY: delete_rng_stream,& rng_stream_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/metadynamics_utils.F b/src/metadynamics_utils.F index 77becb1a56..37ce46e782 100644 --- a/src/metadynamics_utils.F +++ b/src/metadynamics_utils.F @@ -12,6 +12,9 @@ MODULE metadynamics_utils USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -49,7 +52,6 @@ MODULE metadynamics_utils metavar_type,& multiple_walkers_type USE physcon, ONLY: kelvin -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/minimax.F b/src/minimax.F index ebd60692eb..ebd465ec04 100644 --- a/src/minimax.F +++ b/src/minimax.F @@ -12,7 +12,6 @@ ! ***************************************************************************** MODULE minimax USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/minimax_rpa.F b/src/minimax_rpa.F index b0674a3be1..0197175326 100644 --- a/src/minimax_rpa.F +++ b/src/minimax_rpa.F @@ -11,7 +11,6 @@ ! ***************************************************************************** MODULE minimax_rpa USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mixed_energy_types.F b/src/mixed_energy_types.F index 22426f8c04..d0d9e85f24 100644 --- a/src/mixed_energy_types.F +++ b/src/mixed_energy_types.F @@ -11,7 +11,6 @@ MODULE mixed_energy_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mixed_environment.F b/src/mixed_environment.F index 5a0ab4407e..15db6ecde7 100644 --- a/src/mixed_environment.F +++ b/src/mixed_environment.F @@ -33,7 +33,6 @@ MODULE mixed_environment write_molecule_kind_set USE molecule_types_new, ONLY: molecule_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mixed_environment_types.F b/src/mixed_environment_types.F index 512b7939ac..9680e1425f 100644 --- a/src/mixed_environment_types.F +++ b/src/mixed_environment_types.F @@ -47,7 +47,6 @@ MODULE mixed_environment_types particle_list_release,& particle_list_type USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mixed_environment_utils.F b/src/mixed_environment_utils.F index 57511a8b91..95e99a8407 100644 --- a/src/mixed_environment_utils.F +++ b/src/mixed_environment_utils.F @@ -26,7 +26,6 @@ MODULE mixed_environment_utils USE virial_types, ONLY: virial_p_type,& virial_type,& zero_virial -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mixed_main.F b/src/mixed_main.F index 406d7cac4a..e7b319bc3e 100644 --- a/src/mixed_main.F +++ b/src/mixed_main.F @@ -9,8 +9,11 @@ ! ***************************************************************************** MODULE mixed_main USE cp_files, ONLY: open_file - USE cp_log_handling, ONLY: cp_logger_create,& - cp_logger_set + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_create,& + cp_logger_set,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_unit_nr USE cp_para_env, ONLY: cp_para_env_create USE cp_para_types, ONLY: cp_para_env_type @@ -22,7 +25,6 @@ MODULE mixed_main USE mixed_environment_types, ONLY: mixed_env_create,& mixed_environment_type,& set_mixed_env -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mm_collocate_potential.F b/src/mm_collocate_potential.F index f4be50e890..c008dbda2c 100644 --- a/src/mm_collocate_potential.F +++ b/src/mm_collocate_potential.F @@ -17,7 +17,6 @@ MODULE mm_collocate_potential return_cube USE kinds, ONLY: dp USE pw_types, ONLY: pw_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mm_mapping_library.F b/src/mm_mapping_library.F index 9ec7cfac95..49cdd07a37 100644 --- a/src/mm_mapping_library.F +++ b/src/mm_mapping_library.F @@ -16,7 +16,6 @@ MODULE mm_mapping_library USE kinds, ONLY: default_string_length -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mode_selective.F b/src/mode_selective.F index 4264cc0b8c..1d7d501bae 100644 --- a/src/mode_selective.F +++ b/src/mode_selective.F @@ -18,6 +18,9 @@ MODULE mode_selective USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -46,7 +49,6 @@ MODULE mode_selective USE replica_methods, ONLY: rep_env_calc_e_f USE replica_types, ONLY: replica_env_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mol_force.F b/src/mol_force.F index b9570d7beb..041b9b96b8 100644 --- a/src/mol_force.F +++ b/src/mol_force.F @@ -15,7 +15,6 @@ MODULE mol_force do_ff_g96, do_ff_harmonic, do_ff_mixed_bend_stretch, do_ff_mm2, & do_ff_mm3, do_ff_mm4, do_ff_morse, do_ff_quartic USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/molden_utils.F b/src/molden_utils.F index 5937ed532b..2c8d529b37 100644 --- a/src/molden_utils.F +++ b/src/molden_utils.F @@ -9,12 +9,12 @@ ! ***************************************************************************** MODULE molden_utils USE atomic_kind_types, ONLY: get_atomic_kind + USE cp_log_handling, ONLY: cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_section_types, ONLY: section_vals_type USE kinds, ONLY: dp USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/molecular_states.F b/src/molecular_states.F index 39cfca5452..44f1b8227e 100644 --- a/src/molecular_states.F +++ b/src/molecular_states.F @@ -26,6 +26,9 @@ MODULE molecular_states cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -52,7 +55,6 @@ MODULE molecular_states qs_environment_type USE qs_kind_types, ONLY: qs_kind_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/molsym.F b/src/molsym.F index 841c181176..b6867be7d6 100644 --- a/src/molsym.F +++ b/src/molsym.F @@ -20,7 +20,6 @@ MODULE molsym rotate_vector,& unit_matrix,& vector_product -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/moments_utils.F b/src/moments_utils.F index 1d58debfd7..ec7cba9136 100644 --- a/src/moments_utils.F +++ b/src/moments_utils.F @@ -30,7 +30,6 @@ MODULE moments_utils qs_environment_type USE qs_kind_types, ONLY: get_qs_kind,& qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/averages_types.F b/src/motion/averages_types.F index 4add55c0b7..572b85b433 100644 --- a/src/motion/averages_types.F +++ b/src/motion/averages_types.F @@ -11,6 +11,9 @@ MODULE averages_types USE cell_types, ONLY: cell_type USE colvar_utils, ONLY: get_clv_force,& number_of_colvar + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE force_env_types, ONLY: force_env_type @@ -25,7 +28,6 @@ MODULE averages_types USE virial_types, ONLY: virial_create,& virial_release,& virial_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/bfgs_optimizer.F b/src/motion/bfgs_optimizer.F index 78beb1de4e..cf817e488c 100644 --- a/src/motion/bfgs_optimizer.F +++ b/src/motion/bfgs_optimizer.F @@ -35,6 +35,9 @@ MODULE bfgs_optimizer cp_fm_type,& cp_fm_write_unformatted USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_iterate,& cp_p_file,& cp_print_key_finished_output,& @@ -66,7 +69,6 @@ MODULE bfgs_optimizer USE message_passing, ONLY: mp_min,& mp_sum USE particle_list_types, ONLY: particle_list_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/cell_opt.F b/src/motion/cell_opt.F index 8e3ba3ea06..ab1fa3c38a 100644 --- a/src/motion/cell_opt.F +++ b/src/motion/cell_opt.F @@ -12,6 +12,8 @@ MODULE cell_opt USE bfgs_optimizer, ONLY: geoopt_bfgs USE cg_optimizer, ONLY: geoopt_cg USE cp_lbfgs_geo, ONLY: geoopt_lbfgs + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_rm_iter_level @@ -33,7 +35,6 @@ MODULE cell_opt section_vals_val_get,& section_vals_val_set USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/cell_opt_types.F b/src/motion/cell_opt_types.F index a9dce932c8..60821ee981 100644 --- a/src/motion/cell_opt_types.F +++ b/src/motion/cell_opt_types.F @@ -24,7 +24,6 @@ MODULE cell_opt_types section_vals_val_get USE kinds, ONLY: dp USE particle_list_types, ONLY: particle_list_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/cell_opt_utils.F b/src/motion/cell_opt_utils.F index 77e994a471..daaf0d5f63 100644 --- a/src/motion/cell_opt_utils.F +++ b/src/motion/cell_opt_utils.F @@ -17,9 +17,13 @@ MODULE cell_opt_utils cell_type, get_cell_param, set_cell_param USE cp_files, ONLY: close_file,& open_file - USE cp_log_handling, ONLY: cp_logger_create,& + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_create,& + cp_logger_get_default_unit_nr,& cp_logger_release,& - cp_logger_set + cp_logger_set,& + cp_logger_type,& + cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE cp_units, ONLY: cp_units_rad USE input_cp2k_global, ONLY: create_global_section @@ -38,7 +42,6 @@ MODULE cell_opt_utils dp USE mathconstants, ONLY: sqrt3 USE mathlib, ONLY: angle -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/cg_optimizer.F b/src/motion/cg_optimizer.F index 697739c6e9..c362829b05 100644 --- a/src/motion/cg_optimizer.F +++ b/src/motion/cg_optimizer.F @@ -14,6 +14,8 @@ MODULE cg_optimizer USE cg_utils, ONLY: cg_linmin,& get_conjugate_direction USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_iterate,& cp_print_key_finished_output,& cp_print_key_unit_nr @@ -32,7 +34,6 @@ MODULE cg_optimizer section_vals_val_set USE kinds, ONLY: dp USE machine, ONLY: m_walltime -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/cg_utils.F b/src/motion/cg_utils.F index e77bc84458..fe2bc11a35 100644 --- a/src/motion/cg_utils.F +++ b/src/motion/cg_utils.F @@ -26,7 +26,6 @@ MODULE cg_utils USE kinds, ONLY: dp USE mathconstants, ONLY: pi USE memory_utilities, ONLY: reallocate -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/cp_lbfgs.F b/src/motion/cp_lbfgs.F index 0aa1601532..dcda67f29d 100644 --- a/src/motion/cp_lbfgs.F +++ b/src/motion/cp_lbfgs.F @@ -19,7 +19,6 @@ MODULE cp_lbfgs USE cp_files, ONLY: open_file USE kinds, ONLY: dp USE machine, ONLY: m_walltime -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/cp_lbfgs_geo.F b/src/motion/cp_lbfgs_geo.F index 728458a5ac..0db99b1dc2 100644 --- a/src/motion/cp_lbfgs_geo.F +++ b/src/motion/cp_lbfgs_geo.F @@ -16,6 +16,8 @@ MODULE cp_lbfgs_geo cp_opt_gopt_next,& cp_opt_gopt_release,& cp_opt_gopt_stop + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_iterate,& cp_print_key_finished_output,& cp_print_key_unit_nr @@ -34,7 +36,6 @@ MODULE cp_lbfgs_geo section_vals_val_get,& section_vals_val_set USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/cp_lbfgs_optimizer_gopt.F b/src/motion/cp_lbfgs_optimizer_gopt.F index f03c62e3ba..a7aa671727 100644 --- a/src/motion/cp_lbfgs_optimizer_gopt.F +++ b/src/motion/cp_lbfgs_optimizer_gopt.F @@ -18,6 +18,9 @@ ! ***************************************************************************** MODULE cp_lbfgs_optimizer_gopt USE cp_lbfgs, ONLY: setulb + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_env, ONLY: cp_para_env_release,& @@ -33,7 +36,6 @@ MODULE cp_lbfgs_optimizer_gopt USE kinds, ONLY: dp USE machine, ONLY: m_walltime USE message_passing, ONLY: mp_bcast -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/dimer_methods.F b/src/motion/dimer_methods.F index f558d771a6..b44694f42d 100644 --- a/src/motion/dimer_methods.F +++ b/src/motion/dimer_methods.F @@ -10,6 +10,8 @@ !> \author Luca Bellucci and Teodoro Laino - created [tlaino] - 01.2008 ! ***************************************************************************** MODULE dimer_methods + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_subsys_types, ONLY: cp_subsys_get,& @@ -29,7 +31,6 @@ MODULE dimer_methods USE motion_utils, ONLY: rot_ana,& thrs_motion USE particle_list_types, ONLY: particle_list_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/dimer_types.F b/src/motion/dimer_types.F index dbd273d1af..7956c4a39b 100644 --- a/src/motion/dimer_types.F +++ b/src/motion/dimer_types.F @@ -11,6 +11,7 @@ ! ***************************************************************************** MODULE dimer_types + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE global_types, ONLY: global_environment_type USE input_constants, ONLY: do_first_rotation_step USE input_section_types, ONLY: section_vals_get,& @@ -19,7 +20,6 @@ MODULE dimer_types section_vals_val_get USE kinds, ONLY: dp USE parallel_rng_types, ONLY: random_numbers -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/dimer_utils.F b/src/motion/dimer_utils.F index 7f9381efb2..af9482583d 100644 --- a/src/motion/dimer_utils.F +++ b/src/motion/dimer_utils.F @@ -10,6 +10,7 @@ !> \author Luca Bellucci and Teodoro Laino - created [tlaino] - 01.2008 ! ***************************************************************************** MODULE dimer_utils + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE dimer_types, ONLY: dimer_env_type USE input_section_types, ONLY: section_vals_get_subs_vals,& section_vals_remove_values,& @@ -17,7 +18,6 @@ MODULE dimer_utils section_vals_val_set USE kinds, ONLY: dp USE memory_utilities, ONLY: reallocate -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/free_energy_methods.F b/src/motion/free_energy_methods.F index 77168deb80..602a4afe8c 100644 --- a/src/motion/free_energy_methods.F +++ b/src/motion/free_energy_methods.F @@ -9,6 +9,10 @@ ! ***************************************************************************** MODULE free_energy_methods USE colvar_methods, ONLY: colvar_eval_glob_f + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_subsys_types, ONLY: cp_subsys_type @@ -39,7 +43,6 @@ MODULE free_energy_methods sw_test,& vn_test USE string_utilities, ONLY: compress -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/geo_opt.F b/src/motion/geo_opt.F index a17f9ae26f..0078238955 100644 --- a/src/motion/geo_opt.F +++ b/src/motion/geo_opt.F @@ -13,6 +13,8 @@ MODULE geo_opt USE bfgs_optimizer, ONLY: geoopt_bfgs USE cg_optimizer, ONLY: geoopt_cg USE cp_lbfgs_geo, ONLY: geoopt_lbfgs + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_rm_iter_level @@ -33,7 +35,6 @@ MODULE geo_opt section_vals_val_get,& section_vals_val_set USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/glbopt_callback.F b/src/motion/glbopt_callback.F index 6a9a404bd4..0ab0ee6dd2 100644 --- a/src/motion/glbopt_callback.F +++ b/src/motion/glbopt_callback.F @@ -18,7 +18,6 @@ MODULE glbopt_callback USE md_environment_types, ONLY: get_md_env,& md_environment_type USE mdctrl_types, ONLY: glbopt_mdctrl_data_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/gopt_f77_methods.F b/src/motion/gopt_f77_methods.F index 99eb744ccf..1cf8267a06 100644 --- a/src/motion/gopt_f77_methods.F +++ b/src/motion/gopt_f77_methods.F @@ -21,6 +21,7 @@ RECURSIVE SUBROUTINE cp_eval_at(gopt_env,x,f,gradient,master,& final_evaluation,para_env) +USE cp_log_handling, ONLY: cp_logger_type USE averages_types, ONLY: average_quantities_type,& create_averages,& release_averages @@ -76,7 +77,6 @@ RECURSIVE SUBROUTINE cp_eval_at(gopt_env,x,f,gradient,master,& USE cp_log_handling, ONLY: cp_add_default_logger,& cp_rm_default_logger -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE TYPE(gopt_f_type), POINTER :: gopt_env diff --git a/src/motion/gopt_f77_methods.h b/src/motion/gopt_f77_methods.h index b57ee550a2..16a79ae48b 100644 --- a/src/motion/gopt_f77_methods.h +++ b/src/motion/gopt_f77_methods.h @@ -25,8 +25,6 @@ INTERFACE USE gopt_f_types, ONLY: gopt_f_type USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" - TYPE(gopt_f_type), POINTER :: gopt_env REAL(KIND=dp), DIMENSION(:), POINTER :: x REAL(KIND=dp), INTENT(out), OPTIONAL :: f diff --git a/src/motion/gopt_f_methods.F b/src/motion/gopt_f_methods.F index c396574797..185d5ed774 100644 --- a/src/motion/gopt_f_methods.F +++ b/src/motion/gopt_f_methods.F @@ -20,6 +20,7 @@ MODULE gopt_f_methods init_cell,& real_to_scaled,& scaled_to_real + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE cp_subsys_types, ONLY: cp_subsys_get,& cp_subsys_set,& @@ -59,7 +60,6 @@ MODULE gopt_f_methods USE qmmmx_util, ONLY: apply_qmmmx_translate USE virial_methods, ONLY: virial_evaluate USE virial_types, ONLY: virial_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/gopt_f_types.F b/src/motion/gopt_f_types.F index 5550525886..669d90b0c3 100644 --- a/src/motion/gopt_f_types.F +++ b/src/motion/gopt_f_types.F @@ -39,7 +39,6 @@ MODULE gopt_f_types USE kinds, ONLY: default_string_length,& dp USE particle_list_types, ONLY: particle_list_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/gopt_param_types.F b/src/motion/gopt_param_types.F index 2323d33801..d2b28266e4 100644 --- a/src/motion/gopt_param_types.F +++ b/src/motion/gopt_param_types.F @@ -21,7 +21,6 @@ MODULE gopt_param_types USE input_section_types, ONLY: section_vals_type,& section_vals_val_get USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/helium_interactions.F b/src/motion/helium_interactions.F index 0ed298069d..ffe3f3bdb7 100644 --- a/src/motion/helium_interactions.F +++ b/src/motion/helium_interactions.F @@ -24,7 +24,6 @@ MODULE helium_interactions kelvin USE pint_types, ONLY: pint_env_type USE splines_types, ONLY: spline_data_p_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/helium_methods.F b/src/motion/helium_methods.F index 4508e6e523..b4a3f8ddd5 100644 --- a/src/motion/helium_methods.F +++ b/src/motion/helium_methods.F @@ -15,6 +15,8 @@ MODULE helium_methods get_cell USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: silent_print_level USE cp_subsys_types, ONLY: cp_subsys_get,& cp_subsys_type @@ -61,7 +63,6 @@ MODULE helium_methods USE splines_types, ONLY: spline_data_create,& spline_data_release,& spline_data_retain -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/helium_sampling.F b/src/motion/helium_sampling.F index 374ccba4d4..627fe299a9 100644 --- a/src/motion/helium_sampling.F +++ b/src/motion/helium_sampling.F @@ -11,6 +11,8 @@ MODULE helium_sampling USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_rm_iter_level @@ -38,7 +40,6 @@ MODULE helium_sampling USE parallel_rng_types, ONLY: next_random_number USE pint_types, ONLY: pint_env_type USE splines_types, ONLY: spline_data_p_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/input_cp2k_md.F b/src/motion/input_cp2k_md.F index e17e4d26d1..f1f02d9aba 100644 --- a/src/motion/input_cp2k_md.F +++ b/src/motion/input_cp2k_md.F @@ -43,7 +43,6 @@ MODULE input_cp2k_md real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/input_cp2k_restarts.F b/src/motion/input_cp2k_restarts.F index 2aefac1f80..ec29e2d137 100644 --- a/src/motion/input_cp2k_restarts.F +++ b/src/motion/input_cp2k_restarts.F @@ -16,6 +16,10 @@ MODULE input_cp2k_restarts USE cp_linked_list_val, ONLY: cp_sll_val_create,& cp_sll_val_get_length,& cp_sll_val_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -80,7 +84,6 @@ MODULE input_cp2k_restarts USE thermostat_types, ONLY: thermostat_type USE thermostat_utils, ONLY: communication_thermo_low2,& get_kin_energies -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/input_cp2k_vib.F b/src/motion/input_cp2k_vib.F index c3077db905..fe77b44cff 100644 --- a/src/motion/input_cp2k_vib.F +++ b/src/motion/input_cp2k_vib.F @@ -37,7 +37,6 @@ MODULE input_cp2k_vib real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/integrator.F b/src/motion/integrator.F index 3df00efd92..83392f954c 100644 --- a/src/motion/integrator.F +++ b/src/motion/integrator.F @@ -38,6 +38,7 @@ MODULE integrator USE constraint_util, ONLY: getold,& pv_constraint USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE cp_parser_methods, ONLY: parser_get_next_line,& parser_read_line @@ -98,7 +99,6 @@ MODULE integrator USE thermostat_types, ONLY: thermostat_type USE virial_methods, ONLY: virial_evaluate USE virial_types, ONLY: virial_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/integrator_utils.F b/src/motion/integrator_utils.F index c140551aa5..fda3782e5f 100644 --- a/src/motion/integrator_utils.F +++ b/src/motion/integrator_utils.F @@ -50,7 +50,6 @@ MODULE integrator_utils USE thermostat_types, ONLY: set_thermostats,& thermostats_type USE virial_types, ONLY: virial_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/mc_control.F b/src/motion/mc/mc_control.F index da0a4e5376..628c064f64 100644 --- a/src/motion/mc/mc_control.F +++ b/src/motion/mc/mc_control.F @@ -16,6 +16,7 @@ MODULE mc_control get_cell USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_logger_get_default_unit_nr USE cp_para_types, ONLY: cp_para_env_type USE cp_subsys_types, ONLY: cp_subsys_get,& cp_subsys_type @@ -51,7 +52,6 @@ MODULE mc_control USE particle_list_types, ONLY: particle_list_type USE physcon, ONLY: angstrom USE termination, ONLY: stop_memory -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/mc_coordinates.F b/src/motion/mc/mc_coordinates.F index 0a12bf5076..ed9cb6a8ed 100644 --- a/src/motion/mc/mc_coordinates.F +++ b/src/motion/mc/mc_coordinates.F @@ -28,7 +28,6 @@ MODULE mc_coordinates USE particle_list_types, ONLY: particle_list_type USE physcon, ONLY: angstrom USE termination, ONLY: stop_memory -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/mc_ensembles.F b/src/motion/mc/mc_ensembles.F index fee36c6b5b..3826de3711 100644 --- a/src/motion/mc/mc_ensembles.F +++ b/src/motion/mc/mc_ensembles.F @@ -17,6 +17,7 @@ MODULE mc_ensembles USE cp_external_control, ONLY: external_control USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_types, ONLY: cp_para_env_type USE cp_subsys_types, ONLY: cp_subsys_get,& cp_subsys_p_type,& @@ -81,7 +82,6 @@ MODULE mc_ensembles boltzmann,& joule,& n_avogadro -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/mc_environment_types.F b/src/motion/mc/mc_environment_types.F index 51f0440e46..c8da0f6314 100644 --- a/src/motion/mc/mc_environment_types.F +++ b/src/motion/mc/mc_environment_types.F @@ -11,7 +11,6 @@ MODULE mc_environment_types USE force_env_types, ONLY: force_env_type USE mc_types, ONLY: mc_simpar_type -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/mc_ge_moves.F b/src/motion/mc/mc_ge_moves.F index 4d514593ef..eb573008bc 100644 --- a/src/motion/mc/mc_ge_moves.F +++ b/src/motion/mc/mc_ge_moves.F @@ -53,7 +53,6 @@ MODULE mc_ge_moves USE particle_methods, ONLY: write_particle_coordinates USE physcon, ONLY: angstrom USE termination, ONLY: stop_memory -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/mc_misc.F b/src/motion/mc/mc_misc.F index cf00c9f859..bef2c0cb76 100644 --- a/src/motion/mc/mc_misc.F +++ b/src/motion/mc/mc_misc.F @@ -22,7 +22,6 @@ MODULE mc_misc mc_moves_p_type, mc_moves_type, mc_simpar_type USE physcon, ONLY: angstrom USE termination, ONLY: stop_memory -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/mc_move_control.F b/src/motion/mc/mc_move_control.F index c175263f20..1ceb9cb34e 100644 --- a/src/motion/mc/mc_move_control.F +++ b/src/motion/mc/mc_move_control.F @@ -21,7 +21,6 @@ MODULE mc_move_control set_mc_par USE physcon, ONLY: angstrom USE termination, ONLY: stop_memory -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/mc_moves.F b/src/motion/mc/mc_moves.F index 108c191f8d..4d70b4ef5c 100644 --- a/src/motion/mc/mc_moves.F +++ b/src/motion/mc/mc_moves.F @@ -18,6 +18,9 @@ MODULE mc_moves cell_release,& cell_type,& get_cell + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_subsys_types, ONLY: cp_subsys_get,& cp_subsys_set,& cp_subsys_type @@ -53,7 +56,6 @@ MODULE mc_moves USE particle_list_types, ONLY: particle_list_type USE physcon, ONLY: angstrom USE termination, ONLY: stop_memory -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/mc_run.F b/src/motion/mc/mc_run.F index b2523617f8..cbd393780a 100644 --- a/src/motion/mc/mc_run.F +++ b/src/motion/mc/mc_run.F @@ -36,6 +36,7 @@ !> \author MJM-Oct-15-03 ! ***************************************************************************** MODULE mc_run + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_types, ONLY: cp_para_env_type USE force_env_types, ONLY: force_env_p_type,& force_env_release,& @@ -72,7 +73,6 @@ MODULE mc_run rng_stream_type USE physcon, ONLY: angstrom USE termination, ONLY: stop_memory -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/mc_types.F b/src/motion/mc/mc_types.F index 315c1675c3..890b7f71b3 100644 --- a/src/motion/mc/mc_types.F +++ b/src/motion/mc/mc_types.F @@ -17,6 +17,7 @@ MODULE mc_types get_cell USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_types, ONLY: cp_para_env_type USE cp_subsys_types, ONLY: cp_subsys_get,& cp_subsys_type @@ -54,7 +55,6 @@ MODULE mc_types USE string_utilities, ONLY: uppercase,& xstring USE termination, ONLY: stop_memory -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mc/tamc_run.F b/src/motion/mc/tamc_run.F index 67a26e1a5d..03a1995c00 100644 --- a/src/motion/mc/tamc_run.F +++ b/src/motion/mc/tamc_run.F @@ -25,6 +25,9 @@ MODULE tamc_run colvar_p_type USE constraint_fxd, ONLY: fix_atom_control USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_p_file,& @@ -131,7 +134,6 @@ MODULE tamc_run USE wiener_process, ONLY: create_wiener_process,& create_wiener_process_cv !!!!! monte carlo part -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/md_conserved_quantities.F b/src/motion/md_conserved_quantities.F index ebbf97030a..38679a7d4f 100644 --- a/src/motion/md_conserved_quantities.F +++ b/src/motion/md_conserved_quantities.F @@ -46,7 +46,6 @@ MODULE md_conserved_quantities USE simpar_types, ONLY: simpar_type USE thermostat_types, ONLY: thermostat_type USE thermostat_utils, ONLY: get_thermostat_energies -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/md_ener_types.F b/src/motion/md_ener_types.F index 3101e38633..691edc93a9 100644 --- a/src/motion/md_ener_types.F +++ b/src/motion/md_ener_types.F @@ -10,7 +10,6 @@ MODULE md_ener_types USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/md_energies.F b/src/motion/md_energies.F index 905631fda2..84c4c343e4 100644 --- a/src/motion/md_energies.F +++ b/src/motion/md_energies.F @@ -21,6 +21,9 @@ MODULE md_energies USE barostat_utils, ONLY: print_barostat_status USE cell_types, ONLY: cell_type,& get_cell + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -75,7 +78,6 @@ MODULE md_energies USE thermostat_types, ONLY: thermostats_type USE thermostat_utils, ONLY: print_thermostats_status USE virial_types, ONLY: virial_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/md_environment_types.F b/src/motion/md_environment_types.F index 2f8b722f47..0bedb96bf1 100644 --- a/src/motion/md_environment_types.F +++ b/src/motion/md_environment_types.F @@ -47,7 +47,6 @@ MODULE md_environment_types retain_thermostats,& thermostat_type,& thermostats_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/md_run.F b/src/motion/md_run.F index 5ef85b8c95..28ce2c4dc3 100644 --- a/src/motion/md_run.F +++ b/src/motion/md_run.F @@ -17,6 +17,8 @@ MODULE md_run release_barostat_type USE cell_types, ONLY: cell_type USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_p_file,& @@ -97,7 +99,6 @@ MODULE md_run USE virial_types, ONLY: virial_type USE wiener_process, ONLY: create_wiener_process,& create_wiener_process_cv -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/md_util.F b/src/motion/md_util.F index 06df8c8f66..350aeb9c0e 100644 --- a/src/motion/md_util.F +++ b/src/motion/md_util.F @@ -15,7 +15,6 @@ MODULE md_util section_vals_val_get USE md_energies, ONLY: md_write_output USE md_environment_types, ONLY: md_environment_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/md_vel_utils.F b/src/motion/md_vel_utils.F index 00d217760f..bf500e54d3 100644 --- a/src/motion/md_vel_utils.F +++ b/src/motion/md_vel_utils.F @@ -22,6 +22,8 @@ MODULE md_vel_utils use_perd_xz, use_perd_y, use_perd_yz, use_perd_z USE cp_linked_list_val, ONLY: cp_sll_val_next,& cp_sll_val_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -71,7 +73,6 @@ MODULE md_vel_utils USE simpar_types, ONLY: simpar_type USE thermal_region_types, ONLY: thermal_region_type,& thermal_regions_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/mdctrl_methods.F b/src/motion/mdctrl_methods.F index 3636f6b617..2c5ceee336 100644 --- a/src/motion/mdctrl_methods.F +++ b/src/motion/mdctrl_methods.F @@ -16,7 +16,6 @@ MODULE mdctrl_methods USE glbopt_callback, ONLY: glbopt_md_callback USE md_environment_types, ONLY: md_environment_type USE mdctrl_types, ONLY: mdctrl_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/neb_io.F b/src/motion/neb_io.F index e649a500dd..7d8e36381a 100644 --- a/src/motion/neb_io.F +++ b/src/motion/neb_io.F @@ -21,7 +21,10 @@ MODULE neb_io USE cp_files, ONLY: close_file,& open_file USE cp_log_handling, ONLY: cp_add_default_logger,& - cp_rm_default_logger + cp_get_default_logger,& + cp_logger_type,& + cp_rm_default_logger,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_units, ONLY: cp_unit_from_cp2k @@ -63,7 +66,6 @@ MODULE neb_io particle_type USE physcon, ONLY: angstrom USE replica_types, ONLY: replica_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/neb_md_utils.F b/src/motion/neb_md_utils.F index abf795cd98..fb062625e6 100644 --- a/src/motion/neb_md_utils.F +++ b/src/motion/neb_md_utils.F @@ -33,7 +33,6 @@ MODULE neb_md_utils update_particle_pos_or_vel USE physcon, ONLY: kelvin,& massunit -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/neb_methods.F b/src/motion/neb_methods.F index 50636a65be..13f889fdeb 100644 --- a/src/motion/neb_methods.F +++ b/src/motion/neb_methods.F @@ -21,6 +21,9 @@ MODULE neb_methods USE colvar_utils, ONLY: number_of_colvar USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_print_key_finished_output,& @@ -64,7 +67,6 @@ MODULE neb_methods USE replica_methods, ONLY: rep_env_create USE replica_types, ONLY: rep_env_release,& replica_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/neb_opt_utils.F b/src/motion/neb_opt_utils.F index 3a2a1e7f8b..d7bf95339f 100644 --- a/src/motion/neb_opt_utils.F +++ b/src/motion/neb_opt_utils.F @@ -16,6 +16,8 @@ !> \author Teodoro Laino 10.2006 ! ***************************************************************************** MODULE neb_opt_utils + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit,& + cp_to_string USE input_section_types, ONLY: section_vals_type,& section_vals_val_get USE kinds, ONLY: default_string_length,& @@ -26,7 +28,6 @@ MODULE neb_opt_utils reorient_images USE particle_types, ONLY: particle_type USE replica_types, ONLY: replica_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/neb_types.F b/src/motion/neb_types.F index a02e69fc9a..f39230d486 100644 --- a/src/motion/neb_types.F +++ b/src/motion/neb_types.F @@ -23,7 +23,6 @@ MODULE neb_types USE input_section_types, ONLY: section_vals_type USE kinds, ONLY: default_string_length,& dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/neb_utils.F b/src/motion/neb_utils.F index eee0711bb1..b097120e64 100644 --- a/src/motion/neb_utils.F +++ b/src/motion/neb_utils.F @@ -26,6 +26,8 @@ MODULE neb_utils USE colvar_utils, ONLY: eval_colvar,& get_clv_force,& set_colvars_target + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -69,7 +71,6 @@ MODULE neb_utils USE replica_types, ONLY: rep_env_sync,& replica_env_type USE rmsd, ONLY: rmsd3 -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/pint_gle.F b/src/motion/pint_gle.F index 792a67a971..984832ffcb 100644 --- a/src/motion/pint_gle.F +++ b/src/motion/pint_gle.F @@ -18,7 +18,6 @@ MODULE pint_gle USE parallel_rng_types, ONLY: next_random_number,& rng_stream_type USE pint_types, ONLY: pint_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/pint_io.F b/src/motion/pint_io.F index 49e3ddadff..4167f2923a 100644 --- a/src/motion/pint_io.F +++ b/src/motion/pint_io.F @@ -11,6 +11,9 @@ MODULE pint_io USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -41,7 +44,6 @@ MODULE pint_io e_kin_virial_id,& e_potential_id,& pint_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/pint_methods.F b/src/motion/pint_methods.F index 6ebd5e7d6b..b6b2c62c6e 100644 --- a/src/motion/pint_methods.F +++ b/src/motion/pint_methods.F @@ -15,6 +15,10 @@ MODULE pint_methods USE atomic_kind_types, ONLY: get_atomic_kind USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_rm_iter_level @@ -95,7 +99,6 @@ MODULE pint_methods rep_env_create USE replica_types, ONLY: rep_env_release,& replica_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/pint_normalmode.F b/src/motion/pint_normalmode.F index 3df2f6e1c3..6c0096a180 100644 --- a/src/motion/pint_normalmode.F +++ b/src/motion/pint_normalmode.F @@ -18,7 +18,6 @@ MODULE pint_normalmode USE mathconstants, ONLY: pi,& twopi USE pint_types, ONLY: normalmode_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/pint_public.F b/src/motion/pint_public.F index 52b88cf6f4..d77e614887 100644 --- a/src/motion/pint_public.F +++ b/src/motion/pint_public.F @@ -16,7 +16,6 @@ MODULE pint_public USE parallel_rng_types, ONLY: next_random_number,& rng_stream_type USE pint_types, ONLY: pint_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/pint_staging.F b/src/motion/pint_staging.F index df6847a14b..d0daacc7cc 100644 --- a/src/motion/pint_staging.F +++ b/src/motion/pint_staging.F @@ -16,7 +16,6 @@ MODULE pint_staging section_vals_val_get USE kinds, ONLY: dp USE pint_types, ONLY: staging_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/pint_transformations.F b/src/motion/pint_transformations.F index b04aec315d..62d27e30d0 100644 --- a/src/motion/pint_transformations.F +++ b/src/motion/pint_transformations.F @@ -13,7 +13,6 @@ MODULE pint_transformations staging_u2x,& staging_x2u USE pint_types, ONLY: pint_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/pint_types.F b/src/motion/pint_types.F index 15325827ab..cbc073ff37 100644 --- a/src/motion/pint_types.F +++ b/src/motion/pint_types.F @@ -5,12 +5,12 @@ MODULE pint_types + USE cp_log_handling, ONLY: cp_logger_type USE gle_system_types, ONLY: gle_type USE input_section_types, ONLY: section_vals_type USE kinds, ONLY: dp USE parallel_rng_types, ONLY: rng_stream_type USE replica_types, ONLY: replica_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/reftraj_types.F b/src/motion/reftraj_types.F index d6c39afbd3..4db1ce351a 100644 --- a/src/motion/reftraj_types.F +++ b/src/motion/reftraj_types.F @@ -20,7 +20,6 @@ MODULE reftraj_types section_vals_val_get USE kinds, ONLY: default_path_length,& dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/reftraj_util.F b/src/motion/reftraj_util.F index 9808187d37..1d7e7fc1e8 100644 --- a/src/motion/reftraj_util.F +++ b/src/motion/reftraj_util.F @@ -17,6 +17,9 @@ MODULE reftraj_util get_atomic_kind USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -52,7 +55,6 @@ MODULE reftraj_util reftraj_type USE simpar_types, ONLY: simpar_type USE util, ONLY: get_limit -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/rt_propagation.F b/src/motion/rt_propagation.F index 9d40cd821d..a11b3d7d70 100644 --- a/src/motion/rt_propagation.F +++ b/src/motion/rt_propagation.F @@ -18,6 +18,9 @@ MODULE rt_propagation cp_fm_set_all,& cp_fm_to_fm,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_rm_iter_level @@ -68,7 +71,6 @@ MODULE rt_propagation USE rt_propagator_init, ONLY: init_propagators,& rt_initialize_rho_from_ks,& rt_initialize_rho_from_mos -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/shell_opt.F b/src/motion/shell_opt.F index 7cd4626bad..7e74910562 100644 --- a/src/motion/shell_opt.F +++ b/src/motion/shell_opt.F @@ -13,6 +13,8 @@ MODULE shell_opt USE atomic_kind_types, ONLY: atomic_kind_type,& get_atomic_kind USE cg_optimizer, ONLY: geoopt_cg + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_add_iter_level,& cp_rm_iter_level USE cp_para_types, ONLY: cp_para_env_type @@ -37,7 +39,6 @@ MODULE shell_opt USE message_passing, ONLY: mp_sum USE particle_types, ONLY: particle_type USE shell_potential_types, ONLY: shell_kind_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/simpar_methods.F b/src/motion/simpar_methods.F index e36a35f6e3..9134090749 100644 --- a/src/motion/simpar_methods.F +++ b/src/motion/simpar_methods.F @@ -15,6 +15,8 @@ MODULE simpar_methods Minary2003,& Ricci2003,& cite_reference + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_generate_filename,& cp_print_key_unit_nr @@ -38,7 +40,6 @@ MODULE simpar_methods USE kinds, ONLY: default_path_length,& dp USE simpar_types, ONLY: simpar_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermal_region_types.F b/src/motion/thermal_region_types.F index d70c0fa100..0c6703794d 100644 --- a/src/motion/thermal_region_types.F +++ b/src/motion/thermal_region_types.F @@ -14,7 +14,6 @@ MODULE thermal_region_types USE input_section_types, ONLY: section_vals_type USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermal_region_utils.F b/src/motion/thermal_region_utils.F index 4cd98d61d3..42cfa43acb 100644 --- a/src/motion/thermal_region_utils.F +++ b/src/motion/thermal_region_utils.F @@ -17,6 +17,9 @@ MODULE thermal_region_utils USE bibliography, ONLY: Kantorovich2008,& Kantorovich2008a,& cite_reference + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -43,7 +46,6 @@ MODULE thermal_region_utils release_thermal_regions,& thermal_region_type,& thermal_regions_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/al_system_dynamics.F b/src/motion/thermostat/al_system_dynamics.F index 822c24423f..5f5159cca7 100644 --- a/src/motion/thermostat/al_system_dynamics.F +++ b/src/motion/thermostat/al_system_dynamics.F @@ -24,7 +24,6 @@ MODULE al_system_dynamics USE particle_types, ONLY: particle_type USE thermostat_utils, ONLY: ke_region_particles,& vel_rescale_particles -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/al_system_init.F b/src/motion/thermostat/al_system_init.F index a983e4be96..7d8a053953 100644 --- a/src/motion/thermostat/al_system_init.F +++ b/src/motion/thermostat/al_system_init.F @@ -22,7 +22,6 @@ MODULE al_system_init molecule_type USE simpar_types, ONLY: simpar_type USE thermostat_types, ONLY: thermostat_info_type -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/al_system_mapping.F b/src/motion/thermostat/al_system_mapping.F index 60e725090a..a9d6cc9dba 100644 --- a/src/motion/thermostat/al_system_mapping.F +++ b/src/motion/thermostat/al_system_mapping.F @@ -26,7 +26,6 @@ MODULE al_system_mapping USE simpar_types, ONLY: simpar_type USE thermostat_mapping, ONLY: thermostat_mapping_region USE thermostat_types, ONLY: thermostat_info_type -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/barostat_types.F b/src/motion/thermostat/barostat_types.F index 3b3e843648..c70c1bbfb9 100644 --- a/src/motion/thermostat/barostat_types.F +++ b/src/motion/thermostat/barostat_types.F @@ -26,7 +26,6 @@ MODULE barostat_types section_vals_val_get USE kinds, ONLY: dp USE simpar_types, ONLY: simpar_type -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/barostat_utils.F b/src/motion/thermostat/barostat_utils.F index bb73145a6c..fc110e6543 100644 --- a/src/motion/thermostat/barostat_utils.F +++ b/src/motion/thermostat/barostat_utils.F @@ -10,6 +10,8 @@ MODULE barostat_utils USE barostat_types, ONLY: barostat_type USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE extended_system_types, ONLY: npt_info_type @@ -26,7 +28,6 @@ MODULE barostat_utils femtoseconds,& kelvin USE simpar_types, ONLY: simpar_type -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/csvr_system_dynamics.F b/src/motion/thermostat/csvr_system_dynamics.F index 35357a07e0..acb24f284e 100644 --- a/src/motion/thermostat/csvr_system_dynamics.F +++ b/src/motion/thermostat/csvr_system_dynamics.F @@ -25,7 +25,6 @@ MODULE csvr_system_dynamics vel_rescale_baro,& vel_rescale_particles,& vel_rescale_shells -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/csvr_system_init.F b/src/motion/thermostat/csvr_system_init.F index 9995252f83..06cd4bfdb2 100644 --- a/src/motion/thermostat/csvr_system_init.F +++ b/src/motion/thermostat/csvr_system_init.F @@ -25,7 +25,6 @@ MODULE csvr_system_init rng_record_length USE simpar_types, ONLY: simpar_type USE thermostat_types, ONLY: thermostat_info_type -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/csvr_system_mapping.F b/src/motion/thermostat/csvr_system_mapping.F index f35920676e..e6f74351c5 100644 --- a/src/motion/thermostat/csvr_system_mapping.F +++ b/src/motion/thermostat/csvr_system_mapping.F @@ -29,7 +29,6 @@ MODULE csvr_system_mapping USE thermostat_mapping, ONLY: init_baro_map_info,& thermostat_mapping_region USE thermostat_types, ONLY: thermostat_info_type -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/extended_system_dynamics.F b/src/motion/thermostat/extended_system_dynamics.F index e5d89737f1..17621a5852 100644 --- a/src/motion/thermostat/extended_system_dynamics.F +++ b/src/motion/thermostat/extended_system_dynamics.F @@ -29,7 +29,6 @@ MODULE extended_system_dynamics vel_rescale_baro,& vel_rescale_particles,& vel_rescale_shells -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/extended_system_init.F b/src/motion/thermostat/extended_system_init.F index 6d13871d83..fee39e8960 100644 --- a/src/motion/thermostat/extended_system_init.F +++ b/src/motion/thermostat/extended_system_init.F @@ -46,7 +46,6 @@ MODULE extended_system_init USE simpar_types, ONLY: simpar_type USE thermostat_types, ONLY: thermostat_info_type USE thermostat_utils, ONLY: get_nhc_energies -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/extended_system_mapping.F b/src/motion/thermostat/extended_system_mapping.F index f78097fd6d..f03fadba7c 100644 --- a/src/motion/thermostat/extended_system_mapping.F +++ b/src/motion/thermostat/extended_system_mapping.F @@ -33,7 +33,6 @@ MODULE extended_system_mapping init_baro_map_info,& thermostat_mapping_region USE thermostat_types, ONLY: thermostat_info_type -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/gle_system_dynamics.F b/src/motion/thermostat/gle_system_dynamics.F index 40650c2056..ad76a82b94 100644 --- a/src/motion/thermostat/gle_system_dynamics.F +++ b/src/motion/thermostat/gle_system_dynamics.F @@ -40,7 +40,6 @@ MODULE gle_system_dynamics USE thermostat_utils, ONLY: ke_region_particles,& momentum_region_particles,& vel_rescale_particles -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/input_cp2k_barostats.F b/src/motion/thermostat/input_cp2k_barostats.F index 00e3a2b41a..29caa6d15a 100644 --- a/src/motion/thermostat/input_cp2k_barostats.F +++ b/src/motion/thermostat/input_cp2k_barostats.F @@ -33,7 +33,6 @@ MODULE input_cp2k_barostats USE input_val_types, ONLY: real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/thermostat_mapping.F b/src/motion/thermostat/thermostat_mapping.F index 96b01880fc..a07ff4d1c0 100644 --- a/src/motion/thermostat/thermostat_mapping.F +++ b/src/motion/thermostat/thermostat_mapping.F @@ -43,7 +43,6 @@ MODULE thermostat_mapping USE termination, ONLY: stop_memory USE util, ONLY: locate,& sort -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/thermostat_methods.F b/src/motion/thermostat/thermostat_methods.F index fc650f1dcb..d2c659f7f2 100644 --- a/src/motion/thermostat/thermostat_methods.F +++ b/src/motion/thermostat/thermostat_methods.F @@ -16,6 +16,8 @@ MODULE thermostat_methods USE bibliography, ONLY: VandeVondele2002,& cite_reference USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -77,7 +79,6 @@ MODULE thermostat_methods get_thermostat_energies,& setup_adiabatic_thermostat_info,& setup_thermostat_info -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/thermostat_types.F b/src/motion/thermostat/thermostat_types.F index f46ceb6db0..040178785d 100644 --- a/src/motion/thermostat/thermostat_types.F +++ b/src/motion/thermostat/thermostat_types.F @@ -32,7 +32,6 @@ MODULE thermostat_types USE kinds, ONLY: default_string_length,& dp USE simpar_types, ONLY: simpar_type -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/thermostat/thermostat_utils.F b/src/motion/thermostat/thermostat_utils.F index e03d439a83..bc29a440f2 100644 --- a/src/motion/thermostat/thermostat_utils.F +++ b/src/motion/thermostat/thermostat_utils.F @@ -11,6 +11,10 @@ MODULE thermostat_utils USE atomic_kind_types, ONLY: atomic_kind_type,& get_atomic_kind USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -55,7 +59,6 @@ MODULE thermostat_utils USE thermostat_types, ONLY: thermostat_info_type,& thermostat_type,& thermostats_type -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/velocity_verlet_control.F b/src/motion/velocity_verlet_control.F index 864830c307..bc6058e515 100644 --- a/src/motion/velocity_verlet_control.F +++ b/src/motion/velocity_verlet_control.F @@ -24,7 +24,6 @@ MODULE velocity_verlet_control USE md_environment_types, ONLY: get_md_env,& md_environment_type USE simpar_types, ONLY: simpar_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/vibrational_analysis.F b/src/motion/vibrational_analysis.F index 9d22395f5f..40c49cfc92 100644 --- a/src/motion/vibrational_analysis.F +++ b/src/motion/vibrational_analysis.F @@ -17,6 +17,9 @@ ! ***************************************************************************** MODULE vibrational_analysis USE atomic_kind_types, ONLY: get_atomic_kind + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -59,7 +62,6 @@ MODULE vibrational_analysis USE replica_types, ONLY: rep_env_release,& replica_env_type USE util, ONLY: sort -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion/wiener_process.F b/src/motion/wiener_process.F index f21b2506ab..aab9d7f9f3 100644 --- a/src/motion/wiener_process.F +++ b/src/motion/wiener_process.F @@ -36,7 +36,6 @@ MODULE wiener_process USE particle_list_types, ONLY: particle_list_type USE simpar_types, ONLY: simpar_type USE string_utilities, ONLY: compress -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/motion_utils.F b/src/motion_utils.F index 2b1444a06e..539ba905f8 100644 --- a/src/motion_utils.F +++ b/src/motion_utils.F @@ -16,6 +16,8 @@ MODULE motion_utils r_datx,& r_host_name,& r_user_name + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_subsys_types, ONLY: cp_subsys_get,& @@ -43,7 +45,6 @@ MODULE motion_utils USE particle_types, ONLY: particle_type USE physcon, ONLY: angstrom USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2.F b/src/mp2.F index f73dfeb9fc..d0853af410 100644 --- a/src/mp2.F +++ b/src/mp2.F @@ -38,6 +38,9 @@ MODULE mp2 cp_fm_release,& cp_fm_set_all,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_env, ONLY: cp_para_env_create,& @@ -99,7 +102,6 @@ MODULE mp2 !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_cphf.F b/src/mp2_cphf.F index 447962f8b9..3bc2f7a1c8 100644 --- a/src/mp2_cphf.F +++ b/src/mp2_cphf.F @@ -89,7 +89,6 @@ MODULE mp2_cphf !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_direct_method.F b/src/mp2_direct_method.F index fd6604661f..682d6d9bf8 100644 --- a/src/mp2_direct_method.F +++ b/src/mp2_direct_method.F @@ -17,6 +17,8 @@ MODULE mp2_direct_method USE cp_dbcsr_interface, ONLY: cp_dbcsr_p_type USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_para_types, ONLY: cp_para_env_type USE gamma, ONLY: init_md_ftable USE hfx_energy_potential, ONLY: coulomb4 @@ -53,7 +55,6 @@ MODULE mp2_direct_method qs_rho_type USE t_sh_p_s_c, ONLY: free_C0,& init -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_gpw.F b/src/mp2_gpw.F index 8155218ce7..80db987fa1 100644 --- a/src/mp2_gpw.F +++ b/src/mp2_gpw.F @@ -38,9 +38,12 @@ MODULE mp2_gpw cp_fm_release,& cp_fm_type USE cp_log_handling, ONLY: cp_add_default_logger,& + cp_get_default_logger,& cp_logger_create,& + cp_logger_get_default_unit_nr,& cp_logger_release,& cp_logger_set,& + cp_logger_type,& cp_rm_default_logger USE cp_para_env, ONLY: cp_para_env_create,& cp_para_env_release @@ -111,7 +114,6 @@ MODULE mp2_gpw deallocate_task_list,& task_list_type USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_laplace.F b/src/mp2_laplace.F index 42c43435b8..0c15ee3d4d 100644 --- a/src/mp2_laplace.F +++ b/src/mp2_laplace.F @@ -24,7 +24,6 @@ MODULE mp2_laplace USE rpa_communication, ONLY: fm_redistribute,& initialize_buffer,& release_buffer -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_optimize_ri_basis.F b/src/mp2_optimize_ri_basis.F index 16ca960765..5b36a1388d 100644 --- a/src/mp2_optimize_ri_basis.F +++ b/src/mp2_optimize_ri_basis.F @@ -19,9 +19,12 @@ MODULE mp2_optimize_ri_basis USE basis_set_types, ONLY: allocate_gto_basis_set,& gto_basis_set_type USE cp_log_handling, ONLY: cp_add_default_logger,& + cp_get_default_logger,& cp_logger_create,& + cp_logger_get_default_unit_nr,& cp_logger_release,& cp_logger_set,& + cp_logger_type,& cp_rm_default_logger USE cp_para_env, ONLY: cp_para_env_create,& cp_para_env_release @@ -54,7 +57,6 @@ MODULE mp2_optimize_ri_basis qs_kind_type USE qs_rho_types, ONLY: qs_rho_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_ri_gpw.F b/src/mp2_ri_gpw.F index 24c8a865f3..9a3714a50d 100644 --- a/src/mp2_ri_gpw.F +++ b/src/mp2_ri_gpw.F @@ -98,7 +98,6 @@ MODULE mp2_ri_gpw USE rs_pw_interface, ONLY: potential_pw2rs USE task_list_types, ONLY: task_list_type USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_ri_grad.F b/src/mp2_ri_grad.F index 87255d197e..f4f79b3e50 100644 --- a/src/mp2_ri_grad.F +++ b/src/mp2_ri_grad.F @@ -85,7 +85,6 @@ MODULE mp2_ri_grad USE task_list_types, ONLY: task_list_type USE util, ONLY: get_limit USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_ri_grad_util.F b/src/mp2_ri_grad_util.F index aff5ca6bf4..4eb0c1b4bd 100644 --- a/src/mp2_ri_grad_util.F +++ b/src/mp2_ri_grad_util.F @@ -43,7 +43,6 @@ MODULE mp2_ri_grad_util USE mp2_types, ONLY: integ_mat_buffer_type,& mp2_type USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_ri_libint.F b/src/mp2_ri_libint.F index 681e537ea6..84c0029f56 100644 --- a/src/mp2_ri_libint.F +++ b/src/mp2_ri_libint.F @@ -33,6 +33,8 @@ MODULE mp2_ri_libint cp_fm_release,& cp_fm_set_submatrix,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_para_types, ONLY: cp_para_env_type USE gamma, ONLY: init_md_ftable USE hfx_energy_potential, ONLY: coulomb4 @@ -65,7 +67,6 @@ MODULE mp2_ri_libint qs_kind_type USE t_sh_p_s_c, ONLY: free_C0,& init -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_setup.F b/src/mp2_setup.F index c13772030c..5e6babae95 100644 --- a/src/mp2_setup.F +++ b/src/mp2_setup.F @@ -10,6 +10,8 @@ !> \author MDB ! ***************************************************************************** MODULE mp2_setup + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_section_types, ONLY: section_vals_get_subs_vals,& @@ -23,7 +25,6 @@ MODULE mp2_setup ri_mp2_laplace,& ri_mp2_method_gpw,& ri_rpa_method_gpw -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mp2_types.F b/src/mp2_types.F index d84f5d2566..a6c84d2da1 100644 --- a/src/mp2_types.F +++ b/src/mp2_types.F @@ -26,7 +26,6 @@ MODULE mp2_types ri_rpa_method_gpw USE kinds, ONLY: default_path_length,& dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mscfg_methods.F b/src/mscfg_methods.F index d69319347f..769c6b5f9a 100644 --- a/src/mscfg_methods.F +++ b/src/mscfg_methods.F @@ -19,6 +19,9 @@ MODULE mscfg_methods cp_dbcsr_create,& cp_dbcsr_init,& dbcsr_type_no_symmetry + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_para_types, ONLY: cp_para_env_type USE cp_subsys_methods, ONLY: create_small_subsys USE cp_subsys_types, ONLY: cp_subsys_get,& @@ -50,7 +53,6 @@ MODULE mscfg_methods qs_env_release,& qs_environment_type USE qs_mo_types, ONLY: mo_set_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mscfg_types.F b/src/mscfg_types.F index fdf33c0b19..d3ccc9998d 100644 --- a/src/mscfg_types.F +++ b/src/mscfg_types.F @@ -30,7 +30,6 @@ MODULE mscfg_types !cp_dbcsr_nblkrows_total, cp_dbcsr_print, & !dbcsr_mp_group, dbcsr_mp_numnodes, dbcsr_norm_maxabsnorm, & USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/mulliken.F b/src/mulliken.F index d93b99d8b3..cd17bf84dd 100644 --- a/src/mulliken.F +++ b/src/mulliken.F @@ -21,7 +21,6 @@ MODULE mulliken USE message_passing, ONLY: mp_sum USE particle_types, ONLY: particle_type USE qs_kind_types, ONLY: qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/optbas_fenv_manipulation.F b/src/optbas_fenv_manipulation.F index 2e7e9e9f01..36bee00adb 100644 --- a/src/optbas_fenv_manipulation.F +++ b/src/optbas_fenv_manipulation.F @@ -26,6 +26,7 @@ MODULE optbas_fenv_manipulation USE cp_fm_types, ONLY: cp_fm_create,& cp_fm_release,& cp_fm_type + USE cp_log_handling, ONLY: cp_to_string USE cp_output_handling, ONLY: debug_print_level USE cp_para_types, ONLY: cp_para_env_type USE input_constants, ONLY: do_admm_basis_projection,& @@ -62,7 +63,6 @@ MODULE optbas_fenv_manipulation qs_rho_type USE scf_control_types, ONLY: scf_control_type USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/optbas_opt_utils.F b/src/optbas_opt_utils.F index 34d15d1e23..a7b67f97cd 100644 --- a/src/optbas_opt_utils.F +++ b/src/optbas_opt_utils.F @@ -18,7 +18,6 @@ MODULE optbas_opt_utils USE kinds, ONLY: dp USE qs_mo_types, ONLY: get_mo_set,& mo_set_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/optimize_basis.F b/src/optimize_basis.F index 6755ab9eba..4060097dff 100644 --- a/src/optimize_basis.F +++ b/src/optimize_basis.F @@ -8,6 +8,9 @@ MODULE optimize_basis USE cp_dbcsr_interface, ONLY: cp_dbcsr_p_type USE cp_fm_types, ONLY: cp_fm_p_type,& cp_fm_release + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE cp_para_env, ONLY: cp_para_env_create,& cp_para_env_release USE cp_para_types, ONLY: cp_para_env_type @@ -54,7 +57,6 @@ MODULE optimize_basis qs_environment_type USE qs_ks_types, ONLY: qs_ks_env_type USE qs_neighbor_lists, ONLY: build_qs_neighbor_lists -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/optimize_basis_types.F b/src/optimize_basis_types.F index 0876208aeb..16c2aee05f 100644 --- a/src/optimize_basis_types.F +++ b/src/optimize_basis_types.F @@ -8,7 +8,6 @@ MODULE optimize_basis_types default_string_length,& dp USE powell, ONLY: opt_state_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/optimize_basis_utils.F b/src/optimize_basis_utils.F index 7035b5dd76..ec86343b60 100644 --- a/src/optimize_basis_utils.F +++ b/src/optimize_basis_utils.F @@ -5,6 +5,10 @@ MODULE optimize_basis_utils USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type,& + cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE cp_parser_methods, ONLY: parser_get_object,& parser_search_string @@ -30,7 +34,6 @@ MODULE optimize_basis_utils subset_type USE powell, ONLY: opt_state_type USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/optimize_input.F b/src/optimize_input.F index abfbd3b07c..dd38ada149 100644 --- a/src/optimize_input.F +++ b/src/optimize_input.F @@ -6,6 +6,9 @@ MODULE optimize_input USE cell_types, ONLY: parse_cell_line USE cp2k_info, ONLY: write_restart_header USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_print_key_finished_output,& @@ -49,7 +52,6 @@ MODULE optimize_input USE physcon, ONLY: bohr USE powell, ONLY: opt_state_type,& powell_optimize -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pair_potential.F b/src/pair_potential.F index 0eab246dd0..9611efc1c4 100644 --- a/src/pair_potential.F +++ b/src/pair_potential.F @@ -17,6 +17,9 @@ MODULE pair_potential get_atomic_kind USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE fparser, ONLY: finalizef,& initf,& parsef @@ -47,7 +50,6 @@ MODULE pair_potential spline_factor_type USE string_table, ONLY: str2id USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pair_potential_coulomb.F b/src/pair_potential_coulomb.F index ee4c8a02d0..e554cd72fa 100644 --- a/src/pair_potential_coulomb.F +++ b/src/pair_potential_coulomb.F @@ -10,7 +10,6 @@ MODULE pair_potential_coulomb USE kinds, ONLY: dp USE mathconstants, ONLY: oorootpi USE pw_poisson_types, ONLY: do_ewald_none -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pair_potential_types.F b/src/pair_potential_types.F index 598161c1db..73795ed4ea 100644 --- a/src/pair_potential_types.F +++ b/src/pair_potential_types.F @@ -22,7 +22,6 @@ MODULE pair_potential_types spline_factor_copy,& spline_factor_release,& spline_factor_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pair_potential_util.F b/src/pair_potential_util.F index ce32c69673..b87fcafc1b 100644 --- a/src/pair_potential_util.F +++ b/src/pair_potential_util.F @@ -21,7 +21,6 @@ MODULE pair_potential_util pair_potential_single_type, wl_type USE physcon, ONLY: bohr,& evolt -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_input.F b/src/pao_input.F index 6cae89d399..ae91c4f579 100644 --- a/src/pao_input.F +++ b/src/pao_input.F @@ -5,6 +5,8 @@ MODULE pao_input USE bibliography, ONLY: Berghold2011 + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: add_last_numeric,& cp_print_key_section_create,& cp_print_key_unit_nr,& @@ -24,7 +26,6 @@ MODULE pao_input USE linesearch, ONLY: linesearch_create_section USE pao_types, ONLY: pao_env_type USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_io.F b/src/pao_io.F index 613a63650d..cd86d5ef2b 100644 --- a/src/pao_io.F +++ b/src/pao_io.F @@ -17,6 +17,8 @@ MODULE pao_io cp_dbcsr_row_block_sizes USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -37,7 +39,6 @@ MODULE pao_io qs_environment_type USE qs_kind_types, ONLY: get_qs_kind,& qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_linpot_full.F b/src/pao_linpot_full.F index bcbc6a08ca..cf4b0abb5c 100644 --- a/src/pao_linpot_full.F +++ b/src/pao_linpot_full.F @@ -17,7 +17,6 @@ MODULE pao_linpot_full qs_environment_type USE qs_kind_types, ONLY: get_qs_kind,& qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_linpot_rotinv.F b/src/pao_linpot_rotinv.F index e14bb96608..f881f9e898 100644 --- a/src/pao_linpot_rotinv.F +++ b/src/pao_linpot_rotinv.F @@ -26,7 +26,6 @@ MODULE pao_linpot_rotinv qs_kind_type USE spherical_harmonics, ONLY: y_lm USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_main.F b/src/pao_main.F index d7feefbff9..5e99a2d8d2 100644 --- a/src/pao_main.F +++ b/src/pao_main.F @@ -45,7 +45,6 @@ MODULE pao_main USE qs_kind_types, ONLY: get_qs_kind,& qs_kind_type USE qs_ks_types, ONLY: qs_ks_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_param.F b/src/pao_param.F index 8fc54bf74c..e9bb068a50 100644 --- a/src/pao_param.F +++ b/src/pao_param.F @@ -15,6 +15,7 @@ MODULE pao_param cp_dbcsr_iterator_next_block, cp_dbcsr_iterator_start, & cp_dbcsr_iterator_stop, cp_dbcsr_multiply, cp_dbcsr_p_type, & cp_dbcsr_release, cp_dbcsr_scale, cp_dbcsr_type + USE cp_log_handling, ONLY: cp_to_string USE dm_ls_scf_types, ONLY: ls_mstruct_type,& ls_scf_env_type USE kinds, ONLY: dp @@ -30,7 +31,6 @@ MODULE pao_param qs_environment_type USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_param_exp.F b/src/pao_param_exp.F index d17e7c8741..4a5887dd42 100644 --- a/src/pao_param_exp.F +++ b/src/pao_param_exp.F @@ -18,7 +18,6 @@ MODULE pao_param_exp USE pao_types, ONLY: pao_env_type USE qs_environment_types, ONLY: get_qs_env,& qs_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_param_fock.F b/src/pao_param_fock.F index 485017b0a4..b3183ab53c 100644 --- a/src/pao_param_fock.F +++ b/src/pao_param_fock.F @@ -25,7 +25,6 @@ MODULE pao_param_fock qs_environment_type USE qs_initial_guess, ONLY: calculate_atomic_fock_matrix USE qs_kind_types, ONLY: qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_param_linpot.F b/src/pao_param_linpot.F index a703a4e12f..579e14967c 100644 --- a/src/pao_param_linpot.F +++ b/src/pao_param_linpot.F @@ -16,6 +16,7 @@ MODULE pao_param_linpot cp_dbcsr_iterator_start, cp_dbcsr_iterator_stop, cp_dbcsr_p_type, & cp_dbcsr_release, cp_dbcsr_reserve_diag_blocks, cp_dbcsr_scale, & cp_dbcsr_set + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE mathlib, ONLY: diamat_all USE pao_input, ONLY: pao_fock_param,& @@ -33,7 +34,6 @@ MODULE pao_param_linpot USE pao_utils, ONLY: fill_randomly USE qs_environment_types, ONLY: get_qs_env,& qs_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_types.F b/src/pao_types.F index bcfbcbe792..759927b6a0 100644 --- a/src/pao_types.F +++ b/src/pao_types.F @@ -11,7 +11,6 @@ MODULE pao_types USE cp_dbcsr_interface, ONLY: cp_dbcsr_type USE kinds, ONLY: dp USE linesearch, ONLY: linesearch_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pao_utils.F b/src/pao_utils.F index 108306c465..e0935ddc9e 100644 --- a/src/pao_utils.F +++ b/src/pao_utils.F @@ -19,7 +19,6 @@ MODULE pao_utils delete_rng_stream,& next_random_number,& rng_stream_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/particle_methods.F b/src/particle_methods.F index 7d620fe2d5..47bb8cb867 100644 --- a/src/particle_methods.F +++ b/src/particle_methods.F @@ -21,6 +21,8 @@ MODULE particle_methods pbc,& real_to_scaled,& set_cell_param + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_units, ONLY: cp_unit_from_cp2k @@ -55,7 +57,6 @@ MODULE particle_methods USE termination, ONLY: stop_memory USE util, ONLY: sort,& sort_unique -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/paw_proj_set_types.F b/src/paw_proj_set_types.F index 48675be7c0..df6ca948d4 100644 --- a/src/paw_proj_set_types.F +++ b/src/paw_proj_set_types.F @@ -15,6 +15,8 @@ MODULE paw_proj_set_types USE basis_set_types, ONLY: get_gto_basis_set,& gto_basis_set_type USE cp_control_types, ONLY: qs_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_section_types, ONLY: section_vals_type @@ -32,7 +34,6 @@ MODULE paw_proj_set_types nso,& nsoset USE orbital_transformation_matrices, ONLY: orbtramat -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pexsi_interface.F b/src/pexsi_interface.F index 2573ab593b..367dfc3952 100644 --- a/src/pexsi_interface.F +++ b/src/pexsi_interface.F @@ -23,7 +23,6 @@ MODULE pexsi_interface #endif USE kinds, ONLY: int_8,& real_8 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pexsi_methods.F b/src/pexsi_methods.F index 912b62bab0..0eaa390c6c 100644 --- a/src/pexsi_methods.F +++ b/src/pexsi_methods.F @@ -26,6 +26,9 @@ MODULE pexsi_methods dbcsr_arnoldi_data, dbcsr_distribution_mp, dbcsr_mp_mynode, & dbcsr_type_no_symmetry, dbcsr_type_real_4, dbcsr_type_real_8, & deallocate_arnoldi_data, get_selected_ritz_val, get_selected_ritz_vec + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE dm_ls_scf_qs, ONLY: matrix_ls_to_qs USE dm_ls_scf_types, ONLY: ls_scf_env_type USE input_section_types, ONLY: section_vals_type,& @@ -48,7 +51,6 @@ MODULE pexsi_methods USE qs_environment_types, ONLY: get_qs_env,& qs_environment_type USE qs_ks_types, ONLY: qs_ks_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pexsi_types.F b/src/pexsi_types.F index 95f968d176..dd1717d6a5 100644 --- a/src/pexsi_types.F +++ b/src/pexsi_types.F @@ -21,6 +21,9 @@ MODULE pexsi_types cp_dbcsr_scale,& cp_dbcsr_type,& csr_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE kinds, ONLY: dp,& int_8 USE message_passing, ONLY: mp_dims_create,& @@ -30,7 +33,6 @@ MODULE pexsi_types cp_pexsi_plan_finalize,& cp_pexsi_plan_initialize,& cp_pexsi_set_options -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pme.F b/src/pme.F index b5d4bf1e58..c2d0957923 100644 --- a/src/pme.F +++ b/src/pme.F @@ -58,7 +58,6 @@ MODULE pme USE structure_factors, ONLY: structure_factor_allocate,& structure_factor_deallocate,& structure_factor_init -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pme_tools.F b/src/pme_tools.F index aea71481ae..27cd2fc6ea 100644 --- a/src/pme_tools.F +++ b/src/pme_tools.F @@ -19,7 +19,6 @@ MODULE pme_tools USE kinds, ONLY: dp USE particle_types, ONLY: particle_type USE realspace_grid_types, ONLY: realspace_grid_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/population_analyses.F b/src/population_analyses.F index 570be6ac34..7e779fbeaa 100644 --- a/src/population_analyses.F +++ b/src/population_analyses.F @@ -53,7 +53,6 @@ MODULE population_analyses USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/preconditioner.F b/src/preconditioner.F index 048b20d241..accb2aebb9 100644 --- a/src/preconditioner.F +++ b/src/preconditioner.F @@ -44,7 +44,6 @@ MODULE preconditioner USE qs_mo_types, ONLY: get_mo_set,& mo_set_p_type,& mo_set_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/preconditioner_apply.F b/src/preconditioner_apply.F index 58e48b1a12..8712a6e8f8 100644 --- a/src/preconditioner_apply.F +++ b/src/preconditioner_apply.F @@ -32,7 +32,6 @@ MODULE preconditioner_apply ot_precond_solver_update USE kinds, ONLY: dp USE preconditioner_types, ONLY: preconditioner_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/preconditioner_makes.F b/src/preconditioner_makes.F index 59a184dcf8..4fdacd82e1 100644 --- a/src/preconditioner_makes.F +++ b/src/preconditioner_makes.F @@ -48,7 +48,6 @@ MODULE preconditioner_makes ot_precond_solver_inv_chol USE kinds, ONLY: dp USE preconditioner_types, ONLY: preconditioner_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/preconditioner_solvers.F b/src/preconditioner_solvers.F index d8c3b99ab7..2c8799f529 100644 --- a/src/preconditioner_solvers.F +++ b/src/preconditioner_solvers.F @@ -40,7 +40,6 @@ MODULE preconditioner_solvers USE iterate_matrix, ONLY: invert_Hotelling USE kinds, ONLY: dp USE preconditioner_types, ONLY: preconditioner_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/preconditioner_types.F b/src/preconditioner_types.F index 1bd26da661..b98e2e9959 100644 --- a/src/preconditioner_types.F +++ b/src/preconditioner_types.F @@ -24,7 +24,6 @@ MODULE preconditioner_types USE cp_para_types, ONLY: cp_para_env_type USE input_constants, ONLY: ot_precond_solver_default USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/cp_linked_list_3d_r.F b/src/pw/cp_linked_list_3d_r.F index a69f84dd9b..a7faf8f7f3 100644 --- a/src/pw/cp_linked_list_3d_r.F +++ b/src/pw/cp_linked_list_3d_r.F @@ -47,7 +47,6 @@ MODULE cp_linked_list_3d_r USE cp_array_utils_r, ONLY: cp_3d_r_p_type USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../common/../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/cp_linked_list_pw.F b/src/pw/cp_linked_list_pw.F index 131739bb35..905c4baa3d 100644 --- a/src/pw/cp_linked_list_pw.F +++ b/src/pw/cp_linked_list_pw.F @@ -47,7 +47,6 @@ MODULE cp_linked_list_pw USE pw_types, ONLY: pw_p_type,& pw_type -#include "../common/cp_common_uses.f90" #include "../common/../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/cp_linked_list_rs.F b/src/pw/cp_linked_list_rs.F index b2166bbff9..cdfcc75e72 100644 --- a/src/pw/cp_linked_list_rs.F +++ b/src/pw/cp_linked_list_rs.F @@ -47,7 +47,6 @@ MODULE cp_linked_list_rs USE realspace_grid_types, ONLY: realspace_grid_p_type,& realspace_grid_type -#include "../common/cp_common_uses.f90" #include "../common/../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/cube_utils.F b/src/pw/cube_utils.F index 8b104c0178..de31507619 100644 --- a/src/pw/cube_utils.F +++ b/src/pw/cube_utils.F @@ -21,7 +21,6 @@ MODULE cube_utils USE mathlib, ONLY: matvec_3x3 USE realspace_grid_types, ONLY: realspace_grid_desc_type USE termination, ONLY: stop_memory -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/dct.F b/src/pw/dct.F index debb5ce51f..535f8706b9 100644 --- a/src/pw/dct.F +++ b/src/pw/dct.F @@ -27,7 +27,6 @@ MODULE dct REALDATA1D,& RECIPROCALSPACE,& pw_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/dg_rho0_types.F b/src/pw/dg_rho0_types.F index 4fb418c4a0..b67ea89027 100644 --- a/src/pw/dg_rho0_types.F +++ b/src/pw/dg_rho0_types.F @@ -21,7 +21,6 @@ MODULE dg_rho0_types pw_create,& pw_p_type,& pw_release -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/dg_types.F b/src/pw/dg_types.F index f46a41c2a3..b7ed8269d3 100644 --- a/src/pw/dg_types.F +++ b/src/pw/dg_types.F @@ -13,7 +13,6 @@ MODULE dg_types dg_rho0_release,& dg_rho0_retain,& dg_rho0_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/dgs.F b/src/pw/dgs.F index 3709293027..d0a4262776 100644 --- a/src/pw/dgs.F +++ b/src/pw/dgs.F @@ -36,7 +36,6 @@ MODULE dgs realspace_grid_type USE structure_factors, ONLY: structure_factor_evaluate USE termination, ONLY: stop_memory -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/dielectric_methods.F b/src/pw/dielectric_methods.F index 33e9b8779a..1791a1fad5 100644 --- a/src/pw/dielectric_methods.F +++ b/src/pw/dielectric_methods.F @@ -39,7 +39,6 @@ MODULE dielectric_methods derive_fdm_cd7,& pw_mollifier,& setup_grid_axes -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/dielectric_types.F b/src/pw/dielectric_types.F index c350a6cbba..2bbb14bff6 100644 --- a/src/pw/dielectric_types.F +++ b/src/pw/dielectric_types.F @@ -17,7 +17,6 @@ MODULE dielectric_types USE pw_types, ONLY: pw_p_type,& pw_release,& pw_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/dirichlet_bc_methods.F b/src/pw/dirichlet_bc_methods.F index 269a25dba4..c0d0aa6b81 100644 --- a/src/pw/dirichlet_bc_methods.F +++ b/src/pw/dirichlet_bc_methods.F @@ -11,6 +11,9 @@ ! ***************************************************************************** MODULE dirichlet_bc_methods + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE dirichlet_bc_types, ONLY: & AA_CUBOIDAL, AA_PLANAR, BWROT, CIRCUMSCRIBED, CYLINDRICAL, INSCRIBED, & PLANAR, cs_box_create, cs_rectangle, cs_rectangle_create, & @@ -39,7 +42,6 @@ MODULE dirichlet_bc_methods USE pw_types, ONLY: REALDATA3D,& REALSPACE USE rs_methods, ONLY: setup_grid_axes -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/dirichlet_bc_types.F b/src/pw/dirichlet_bc_types.F index 1da8039974..0cd5ab4708 100644 --- a/src/pw/dirichlet_bc_types.F +++ b/src/pw/dirichlet_bc_types.F @@ -18,7 +18,6 @@ MODULE dirichlet_bc_types pw_pool_type USE pw_types, ONLY: pw_release,& pw_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/dirichlet_bc_utils.F b/src/pw/dirichlet_bc_utils.F index 2c14acf973..7a3795f4bd 100644 --- a/src/pw/dirichlet_bc_utils.F +++ b/src/pw/dirichlet_bc_utils.F @@ -34,7 +34,6 @@ MODULE dirichlet_bc_utils rotate_vector,& vector_product USE pw_types, ONLY: pw_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/fft/fft_lib.F b/src/pw/fft/fft_lib.F index b491b4d4f4..0e4b44d507 100644 --- a/src/pw/fft/fft_lib.F +++ b/src/pw/fft/fft_lib.F @@ -19,7 +19,6 @@ MODULE fft_lib fftw3_do_cleanup,& fftw3_do_init,& fftw3_get_lengths -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/fft/fftw3_lib.F b/src/pw/fft/fftw3_lib.F index 213300b8e2..d5ed18d34b 100644 --- a/src/pw/fft/fftw3_lib.F +++ b/src/pw/fft/fftw3_lib.F @@ -20,7 +20,6 @@ MODULE fftw3_lib !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/fft/mltfftsg_tools.F b/src/pw/fft/mltfftsg_tools.F index ae80910a65..5015f8ba18 100644 --- a/src/pw/fft/mltfftsg_tools.F +++ b/src/pw/fft/mltfftsg_tools.F @@ -11,7 +11,6 @@ MODULE mltfftsg_tools !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "../../common/cp_common_uses.f90" #include "../../base/base_uses.f90" PRIVATE diff --git a/src/pw/fft_tools.F b/src/pw/fft_tools.F index a74cbd711b..c7376d8566 100644 --- a/src/pw/fft_tools.F +++ b/src/pw/fft_tools.F @@ -29,6 +29,7 @@ MODULE fft_tools C_LOC,& C_PTR,& C_SIZE_T + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_types, ONLY: cp_para_env_type USE fast, ONLY: zero_c USE fft_lib, ONLY: & @@ -48,7 +49,6 @@ MODULE fft_tools !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/lazy.F b/src/pw/lazy.F index 181b43fd38..26c63a8b76 100644 --- a/src/pw/lazy.F +++ b/src/pw/lazy.F @@ -11,7 +11,6 @@ MODULE lazy USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/lgrid_types.F b/src/pw/lgrid_types.F index b785b8a7d6..86be971758 100644 --- a/src/pw/lgrid_types.F +++ b/src/pw/lgrid_types.F @@ -17,7 +17,6 @@ MODULE lgrid_types USE kinds, ONLY: dp USE realspace_grid_types, ONLY: realspace_grid_desc_p_type,& rs_grid_max_ngpts -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/mt_util.F b/src/pw/mt_util.F index be4f745dd4..c9893455e7 100644 --- a/src/pw/mt_util.F +++ b/src/pw/mt_util.F @@ -26,7 +26,6 @@ MODULE mt_util REALSPACE,& RECIPROCALSPACE,& pw_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/ps_implicit_methods.F b/src/pw/ps_implicit_methods.F index 88ebeaae37..25cb844ace 100644 --- a/src/pw/ps_implicit_methods.F +++ b/src/pw/ps_implicit_methods.F @@ -11,6 +11,9 @@ ! ***************************************************************************** MODULE ps_implicit_methods + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE dct, ONLY: dct_type,& dct_type_init,& pw_adjust_bounds_local,& @@ -53,7 +56,6 @@ MODULE ps_implicit_methods pw_type USE rs_methods, ONLY: pw_mollifier,& setup_grid_axes -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/ps_implicit_types.F b/src/pw/ps_implicit_types.F index bee8b78bbc..d01ef7c9ec 100644 --- a/src/pw/ps_implicit_types.F +++ b/src/pw/ps_implicit_types.F @@ -24,7 +24,6 @@ MODULE ps_implicit_types pw_pool_type USE pw_types, ONLY: pw_release,& pw_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/ps_wavelet_base.F b/src/pw/ps_wavelet_base.F index 359d95c63e..ca1ef31e54 100644 --- a/src/pw/ps_wavelet_base.F +++ b/src/pw/ps_wavelet_base.F @@ -14,7 +14,6 @@ MODULE ps_wavelet_base USE ps_wavelet_fft3d, ONLY: ctrig,& ctrig_length,& fftstp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/ps_wavelet_fft3d.F b/src/pw/ps_wavelet_fft3d.F index 3163702062..8cc7f4452d 100644 --- a/src/pw/ps_wavelet_fft3d.F +++ b/src/pw/ps_wavelet_fft3d.F @@ -8,7 +8,6 @@ MODULE ps_wavelet_fft3d USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/ps_wavelet_kernel.F b/src/pw/ps_wavelet_kernel.F index 82522f9d26..8c142610bd 100644 --- a/src/pw/ps_wavelet_kernel.F +++ b/src/pw/ps_wavelet_kernel.F @@ -20,7 +20,6 @@ MODULE ps_wavelet_kernel scf_recursion USE ps_wavelet_util, ONLY: F_FFT_dimensions,& S_FFT_dimensions -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/ps_wavelet_methods.F b/src/pw/ps_wavelet_methods.F index 2d58f40523..da19759665 100644 --- a/src/pw/ps_wavelet_methods.F +++ b/src/pw/ps_wavelet_methods.F @@ -28,7 +28,6 @@ MODULE ps_wavelet_methods USE pw_poisson_types, ONLY: pw_poisson_parameter_type USE pw_types, ONLY: pw_type USE util, ONLY: get_limit -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/ps_wavelet_scaling_function.F b/src/pw/ps_wavelet_scaling_function.F index 85299d27c6..580f1bda76 100644 --- a/src/pw/ps_wavelet_scaling_function.F +++ b/src/pw/ps_wavelet_scaling_function.F @@ -10,7 +10,6 @@ MODULE ps_wavelet_scaling_function USE kinds, ONLY: dp USE lazy, ONLY: lazy_arrays -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/ps_wavelet_types.F b/src/pw/ps_wavelet_types.F index cf54fff105..1ea1244985 100644 --- a/src/pw/ps_wavelet_types.F +++ b/src/pw/ps_wavelet_types.F @@ -11,7 +11,6 @@ MODULE ps_wavelet_types USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/ps_wavelet_util.F b/src/pw/ps_wavelet_util.F index b54ee3de4e..56d1e9c8ec 100644 --- a/src/pw/ps_wavelet_util.F +++ b/src/pw/ps_wavelet_util.F @@ -17,7 +17,6 @@ MODULE ps_wavelet_util s_poissonsolver USE ps_wavelet_fft3d, ONLY: fourier_dim USE pw_grid_types, ONLY: pw_grid_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/pw_cuda.F b/src/pw/pw_cuda.F index 328a2a067e..4eae76f37a 100644 --- a/src/pw/pw_cuda.F +++ b/src/pw/pw_cuda.F @@ -37,7 +37,6 @@ MODULE pw_cuda RECIPROCALSPACE,& pw_type USE termination, ONLY: stop_memory -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/pw_grid_info.F b/src/pw/pw_grid_info.F index 8af4eba530..6833cd3650 100644 --- a/src/pw/pw_grid_info.F +++ b/src/pw/pw_grid_info.F @@ -17,7 +17,6 @@ MODULE pw_grid_info USE kinds, ONLY: dp USE mathconstants, ONLY: twopi USE pw_grid_types, ONLY: pw_grid_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/pw_grid_types.F b/src/pw/pw_grid_types.F index 00ad361a9c..63c7f9d19f 100644 --- a/src/pw/pw_grid_types.F +++ b/src/pw/pw_grid_types.F @@ -12,7 +12,6 @@ MODULE pw_grid_types USE kinds, ONLY: dp,& int_8 -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/pw_grids.F b/src/pw/pw_grids.F index 4c819b9174..d4c3ee0f6d 100644 --- a/src/pw/pw_grids.F +++ b/src/pw/pw_grids.F @@ -58,7 +58,6 @@ MODULE pw_grids pw_grid_type USE util, ONLY: get_limit,& sort -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/pw_methods.F b/src/pw/pw_methods.F index 0c45243f5f..e799998d3a 100644 --- a/src/pw/pw_methods.F +++ b/src/pw/pw_methods.F @@ -20,6 +20,8 @@ !> \author apsi ! ***************************************************************************** MODULE pw_methods + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit,& + cp_to_string USE fast, ONLY: copy_cr,& copy_rc,& zero_c @@ -48,7 +50,6 @@ MODULE pw_methods RECIPROCALSPACE,& pw_type USE termination, ONLY: stop_memory -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/pw_poisson_methods.F b/src/pw/pw_poisson_methods.F index 747c3aabf7..0570f784a8 100644 --- a/src/pw/pw_poisson_methods.F +++ b/src/pw/pw_poisson_methods.F @@ -10,6 +10,7 @@ ! ***************************************************************************** MODULE pw_poisson_methods + USE cp_log_handling, ONLY: cp_to_string USE dielectric_methods, ONLY: dielectric_compute USE kinds, ONLY: dp USE mathconstants, ONLY: fourpi @@ -61,7 +62,6 @@ MODULE pw_poisson_methods RECIPROCALSPACE,& pw_p_type,& pw_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/pw_poisson_types.F b/src/pw/pw_poisson_types.F index 3fed2e9137..359cb1f937 100644 --- a/src/pw/pw_poisson_types.F +++ b/src/pw/pw_poisson_types.F @@ -54,7 +54,6 @@ MODULE pw_poisson_types pw_type USE realspace_grid_types, ONLY: realspace_grid_type,& rs_grid_release -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/pw_pool_types.F b/src/pw/pw_pool_types.F index 126db1f23a..d936d1a907 100644 --- a/src/pw/pw_pool_types.F +++ b/src/pw/pw_pool_types.F @@ -34,6 +34,9 @@ MODULE pw_pool_types cp_sll_pw_next,& cp_sll_pw_rm_first_el,& cp_sll_pw_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE kinds, ONLY: dp USE pw_grid_types, ONLY: pw_grid_type USE pw_grids, ONLY: pw_grid_compare,& @@ -49,7 +52,6 @@ MODULE pw_pool_types pw_release,& pw_type USE timings, ONLY: print_stack -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/pw_spline_utils.F b/src/pw/pw_spline_utils.F index f9073ba08a..7a198b9cc6 100644 --- a/src/pw/pw_spline_utils.F +++ b/src/pw/pw_spline_utils.F @@ -14,6 +14,9 @@ !> \author Fawzi Mohamed ! ***************************************************************************** MODULE pw_spline_utils + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE kinds, ONLY: dp USE mathconstants, ONLY: twopi USE message_passing, ONLY: mp_alltoall,& @@ -37,7 +40,6 @@ MODULE pw_spline_utils RECIPROCALSPACE,& pw_p_type,& pw_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/pw_types.F b/src/pw/pw_types.F index 669258254e..af62973381 100644 --- a/src/pw/pw_types.F +++ b/src/pw/pw_types.F @@ -21,12 +21,15 @@ ! ***************************************************************************** MODULE pw_types + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type,& + cp_to_string USE kinds, ONLY: dp USE pw_grid_types, ONLY: pw_grid_type USE pw_grids, ONLY: pw_grid_release,& pw_grid_retain USE timings, ONLY: print_stack -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/realspace_grid_cube.F b/src/pw/realspace_grid_cube.F index 05968a29d0..98a29e955c 100644 --- a/src/pw/realspace_grid_cube.F +++ b/src/pw/realspace_grid_cube.F @@ -9,6 +9,7 @@ MODULE realspace_grid_cube USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE kinds, ONLY: dp USE message_passing, ONLY: mp_maxloc,& mp_recv,& @@ -17,7 +18,6 @@ MODULE realspace_grid_cube mp_sync USE pw_grid_types, ONLY: PW_MODE_LOCAL USE pw_types, ONLY: pw_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/realspace_grid_types.F b/src/pw/realspace_grid_types.F index 4e0819a4b8..64493b595e 100644 --- a/src/pw/realspace_grid_types.F +++ b/src/pw/realspace_grid_types.F @@ -15,6 +15,7 @@ ! ***************************************************************************** MODULE realspace_grid_types USE cp_array_utils_r, ONLY: cp_1d_r_p_type + USE cp_log_handling, ONLY: cp_to_string USE fast, ONLY: copy_cr,& copy_rc USE kahan_sum, ONLY: accurate_sum @@ -38,7 +39,6 @@ MODULE realspace_grid_types !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw/rs_methods.F b/src/pw/rs_methods.F index 64fd67e8d9..846f9b65a7 100644 --- a/src/pw/rs_methods.F +++ b/src/pw/rs_methods.F @@ -30,7 +30,6 @@ MODULE rs_methods pw2rs, realspace_grid_desc_type, realspace_grid_p_type, & realspace_grid_type, rs2pw, rs_grid_create, rs_grid_release, & rs_grid_zero, rs_pw_transfer -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw_env_methods.F b/src/pw_env_methods.F index 7bb25e1f9a..893b2604c0 100644 --- a/src/pw_env_methods.F +++ b/src/pw_env_methods.F @@ -19,6 +19,8 @@ MODULE pw_env_methods gto_basis_set_type USE cell_types, ONLY: cell_type USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -92,7 +94,6 @@ MODULE pw_env_methods xc_deriv_pw, xc_deriv_spline2, xc_deriv_spline2_smooth, & xc_deriv_spline3, xc_deriv_spline3_smooth, xc_rho_nn10, xc_rho_nn50, & xc_rho_no_smooth, xc_rho_spline2_smooth, xc_rho_spline3_smooth -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw_env_types.F b/src/pw_env_types.F index 837925f4c9..7c05452f7a 100644 --- a/src/pw_env_types.F +++ b/src/pw_env_types.F @@ -31,7 +31,6 @@ MODULE pw_env_types realspace_grid_type,& rs_grid_release,& rs_grid_release_descriptor -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/pw_poisson_read_input.F b/src/pw_poisson_read_input.F index f3d88ff51e..66bb39c7fd 100644 --- a/src/pw_poisson_read_input.F +++ b/src/pw_poisson_read_input.F @@ -34,7 +34,6 @@ MODULE pw_poisson_read_input do_ewald_none, pw_poisson_analytic, pw_poisson_implicit, & pw_poisson_mt, pw_poisson_multipole, pw_poisson_none, & pw_poisson_parameter_type, pw_poisson_periodic, pw_poisson_wavelet -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_create.F b/src/qmmm_create.F index 95d25d2dfc..4b9e4f7fe3 100644 --- a/src/qmmm_create.F +++ b/src/qmmm_create.F @@ -19,6 +19,8 @@ MODULE qmmm_create cell_release,& cell_type,& get_cell + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -68,7 +70,6 @@ MODULE qmmm_create qs_env_create,& qs_environment_type,& set_qs_env -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_elpot.F b/src/qmmm_elpot.F index b2ba6688dd..317820eb77 100644 --- a/src/qmmm_elpot.F +++ b/src/qmmm_elpot.F @@ -10,6 +10,9 @@ ! ***************************************************************************** MODULE qmmm_elpot USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -29,7 +32,6 @@ MODULE qmmm_elpot qmmm_gaussian_type USE qmmm_types_low, ONLY: qmmm_Pot_Type,& qmmm_pot_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_ff_fist.F b/src/qmmm_ff_fist.F index dc74ea954a..57357390fd 100644 --- a/src/qmmm_ff_fist.F +++ b/src/qmmm_ff_fist.F @@ -9,7 +9,6 @@ MODULE qmmm_ff_fist USE kinds, ONLY: default_string_length -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_force.F b/src/qmmm_force.F index 1e7e9b7183..277fa55c8b 100644 --- a/src/qmmm_force.F +++ b/src/qmmm_force.F @@ -11,6 +11,9 @@ ! ***************************************************************************** MODULE qmmm_force USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_iter_string,& cp_p_file,& cp_print_key_finished_output,& @@ -45,7 +48,6 @@ MODULE qmmm_force USE qs_environment_types, ONLY: get_qs_env USE qs_force, ONLY: qs_calc_energy_force USE qs_ks_qmmm_methods, ONLY: ks_qmmm_env_rebuild -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_gaussian_data.F b/src/qmmm_gaussian_data.F index 6feb1128dd..9aae20186b 100644 --- a/src/qmmm_gaussian_data.F +++ b/src/qmmm_gaussian_data.F @@ -15,7 +15,6 @@ MODULE qmmm_gaussian_data USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_gaussian_init.F b/src/qmmm_gaussian_init.F index 3b626655a6..bed7c88ee7 100644 --- a/src/qmmm_gaussian_init.F +++ b/src/qmmm_gaussian_init.F @@ -12,6 +12,8 @@ ! ***************************************************************************** MODULE qmmm_gaussian_init USE ao_util, ONLY: exp_radius + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -33,7 +35,6 @@ MODULE qmmm_gaussian_init set_mm_potential_swave USE qmmm_gaussian_types, ONLY: qmmm_gaussian_p_type,& qmmm_gaussian_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_gaussian_input.F b/src/qmmm_gaussian_input.F index 4f1d1a79b8..18611f29f5 100644 --- a/src/qmmm_gaussian_input.F +++ b/src/qmmm_gaussian_input.F @@ -10,6 +10,7 @@ !> \author Teodoro Laino ! ***************************************************************************** MODULE qmmm_gaussian_input + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_types, ONLY: cp_para_env_type USE cp_parser_methods, ONLY: parser_get_object,& parser_search_string @@ -110,7 +111,6 @@ MODULE qmmm_gaussian_input s9_b7, s9_b8, s9_b9, s9_rc USE qmmm_gaussian_types, ONLY: qmmm_gaussian_p_type USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_gaussian_types.F b/src/qmmm_gaussian_types.F index 1be4bb25cb..a97a5b572f 100644 --- a/src/qmmm_gaussian_types.F +++ b/src/qmmm_gaussian_types.F @@ -12,7 +12,6 @@ MODULE qmmm_gaussian_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_gpw_energy.F b/src/qmmm_gpw_energy.F index b5db8be4a7..0330990c91 100644 --- a/src/qmmm_gpw_energy.F +++ b/src/qmmm_gpw_energy.F @@ -13,6 +13,8 @@ MODULE qmmm_gpw_energy USE cell_types, ONLY: cell_type,& pbc USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -66,7 +68,6 @@ MODULE qmmm_gpw_energy USE qs_ks_qmmm_types, ONLY: qs_ks_qmmm_env_type USE qs_subsys_types, ONLY: qs_subsys_get,& qs_subsys_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_gpw_forces.F b/src/qmmm_gpw_forces.F index 647472c820..24d9c26fb8 100644 --- a/src/qmmm_gpw_forces.F +++ b/src/qmmm_gpw_forces.F @@ -13,6 +13,8 @@ MODULE qmmm_gpw_forces USE cell_types, ONLY: cell_type,& pbc USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -73,7 +75,6 @@ MODULE qmmm_gpw_forces USE qs_ks_qmmm_types, ONLY: qs_ks_qmmm_env_type USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_image_charge.F b/src/qmmm_image_charge.F index fe8c7318a3..61f2ca626f 100644 --- a/src/qmmm_image_charge.F +++ b/src/qmmm_image_charge.F @@ -16,6 +16,8 @@ MODULE qmmm_image_charge USE cp_control_types, ONLY: dft_control_type USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_generate_filename,& @@ -68,7 +70,6 @@ MODULE qmmm_image_charge rs_grid_retain,& rs_pw_transfer USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_init.F b/src/qmmm_init.F index aa4c5e6988..a70e46e8c3 100644 --- a/src/qmmm_init.F +++ b/src/qmmm_init.F @@ -18,6 +18,8 @@ MODULE qmmm_init USE cell_types, ONLY: cell_type,& use_perd_xyz USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -63,7 +65,6 @@ MODULE qmmm_init qmmm_links_type USE qs_environment_types, ONLY: get_qs_env,& qs_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_links_methods.F b/src/qmmm_links_methods.F index e72e2db85b..9297f080c2 100644 --- a/src/qmmm_links_methods.F +++ b/src/qmmm_links_methods.F @@ -11,13 +11,13 @@ ! ***************************************************************************** MODULE qmmm_links_methods + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE particle_types, ONLY: particle_type USE qmmm_types_low, ONLY: add_set_type,& qmmm_env_qm_type,& qmmm_imomm_link_type,& qmmm_links_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_per_elpot.F b/src/qmmm_per_elpot.F index 6042827f32..a5bcf46902 100644 --- a/src/qmmm_per_elpot.F +++ b/src/qmmm_per_elpot.F @@ -13,6 +13,9 @@ MODULE qmmm_per_elpot !> \author Teodoro Laino USE ao_util, ONLY: exp_radius USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -42,7 +45,6 @@ MODULE qmmm_per_elpot USE qmmm_types_low, ONLY: qmmm_per_pot_p_type,& qmmm_per_pot_type,& qmmm_pot_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_pw_grid.F b/src/qmmm_pw_grid.F index 3b8e328017..eef34f3eab 100644 --- a/src/qmmm_pw_grid.F +++ b/src/qmmm_pw_grid.F @@ -28,7 +28,6 @@ MODULE qmmm_pw_grid pw_pool_type,& pw_pools_dealloc USE qmmm_types_low, ONLY: qmmm_env_qm_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_se_energy.F b/src/qmmm_se_energy.F index 465a1e55c1..a8dae0c4eb 100644 --- a/src/qmmm_se_energy.F +++ b/src/qmmm_se_energy.F @@ -21,6 +21,8 @@ MODULE qmmm_se_energy cp_dbcsr_p_type,& cp_dbcsr_set USE cp_dbcsr_output, ONLY: cp_dbcsr_write_sparse_matrix + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -62,7 +64,6 @@ MODULE qmmm_se_energy setup_se_int_control_type USE semi_empirical_utils, ONLY: get_se_type,& se_param_set_default -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_se_forces.F b/src/qmmm_se_forces.F index 5f26a727ce..ec249ec42e 100644 --- a/src/qmmm_se_forces.F +++ b/src/qmmm_se_forces.F @@ -48,7 +48,6 @@ MODULE qmmm_se_forces setup_se_int_control_type USE semi_empirical_utils, ONLY: get_se_type,& se_param_set_default -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_topology_util.F b/src/qmmm_topology_util.F index 2b35fbb5f3..2e27e767de 100644 --- a/src/qmmm_topology_util.F +++ b/src/qmmm_topology_util.F @@ -7,6 +7,9 @@ !> \author teo ! ***************************************************************************** MODULE qmmm_topology_util + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_section_types, ONLY: section_vals_type @@ -20,7 +23,6 @@ MODULE qmmm_topology_util str2id USE string_utilities, ONLY: compress USE topology_types, ONLY: topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_types.F b/src/qmmm_types.F index 917794f729..2814c348d1 100644 --- a/src/qmmm_types.F +++ b/src/qmmm_types.F @@ -20,7 +20,6 @@ MODULE qmmm_types USE qs_environment_types, ONLY: get_qs_env,& qs_env_release,& qs_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_types_low.F b/src/qmmm_types_low.F index 0003ecbfb3..837a4c853c 100644 --- a/src/qmmm_types_low.F +++ b/src/qmmm_types_low.F @@ -32,7 +32,6 @@ MODULE qmmm_types_low pw_pools_dealloc USE pw_types, ONLY: pw_type USE qmmm_gaussian_types, ONLY: qmmm_gaussian_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmm_util.F b/src/qmmm_util.F index 8e7055d2a4..5de5e8a42e 100644 --- a/src/qmmm_util.F +++ b/src/qmmm_util.F @@ -10,6 +10,7 @@ ! ***************************************************************************** MODULE qmmm_util USE cell_types, ONLY: cell_type + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_subsys_types, ONLY: cp_subsys_type USE fist_environment_types, ONLY: fist_env_get USE force_env_types, ONLY: force_env_type,& @@ -31,7 +32,6 @@ MODULE qmmm_util USE qs_energy_types, ONLY: qs_energy_type USE qs_environment_types, ONLY: get_qs_env USE qs_kind_types, ONLY: qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmmx_create.F b/src/qmmmx_create.F index b7f95aae60..d16955781d 100644 --- a/src/qmmmx_create.F +++ b/src/qmmmx_create.F @@ -21,7 +21,6 @@ MODULE qmmmx_create USE qmmmx_types, ONLY: qmmmx_env_type USE qmmmx_util, ONLY: setup_force_mixing_qmmm_sections,& update_force_mixing_labels -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmmx_force.F b/src/qmmmx_force.F index e975a4a338..c9a474e441 100644 --- a/src/qmmmx_force.F +++ b/src/qmmmx_force.F @@ -36,7 +36,6 @@ MODULE qmmmx_force USE qmmmx_types, ONLY: qmmmx_env_type USE qmmmx_util, ONLY: apply_qmmmx_translate USE qs_environment_types, ONLY: get_qs_env -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmmx_types.F b/src/qmmmx_types.F index 0a408b21ce..7d96f11172 100644 --- a/src/qmmmx_types.F +++ b/src/qmmmx_types.F @@ -13,7 +13,6 @@ MODULE qmmmx_types USE qmmm_types, ONLY: qmmm_env_get,& qmmm_env_release,& qmmm_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmmx_update.F b/src/qmmmx_update.F index 755ff45632..93749c522e 100644 --- a/src/qmmmx_update.F +++ b/src/qmmmx_update.F @@ -27,7 +27,6 @@ MODULE qmmmx_update qmmmx_env_type USE qmmmx_util, ONLY: setup_force_mixing_qmmm_sections,& update_force_mixing_labels -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qmmmx_util.F b/src/qmmmx_util.F index ffb3602f44..f22812d6d5 100644 --- a/src/qmmmx_util.F +++ b/src/qmmmx_util.F @@ -16,6 +16,8 @@ MODULE qmmmx_util USE cell_types, ONLY: cell_copy,& cell_type,& pbc + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit,& + cp_logger_get_default_unit_nr USE cp_para_types, ONLY: cp_para_env_type USE cp_subsys_types, ONLY: cp_subsys_get,& cp_subsys_type @@ -47,7 +49,6 @@ MODULE qmmmx_util force_mixing_label_termination USE qmmm_util, ONLY: apply_qmmm_translate USE qmmmx_types, ONLY: qmmmx_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_block_davidson_types.F b/src/qs_block_davidson_types.F index c03201933e..f2a6afc263 100644 --- a/src/qs_block_davidson_types.F +++ b/src/qs_block_davidson_types.F @@ -24,7 +24,6 @@ MODULE qs_block_davidson_types USE input_section_types, ONLY: section_vals_type,& section_vals_val_get USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_charges_types.F b/src/qs_charges_types.F index b28e7818ab..f08b628f2b 100644 --- a/src/qs_charges_types.F +++ b/src/qs_charges_types.F @@ -12,7 +12,6 @@ MODULE qs_charges_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_collocate_density.F b/src/qs_collocate_density.F index 904bbe8c04..dc506407ca 100644 --- a/src/qs_collocate_density.F +++ b/src/qs_collocate_density.F @@ -134,7 +134,6 @@ MODULE qs_collocate_density !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_core_energies.F b/src/qs_core_energies.F index 10eb379f8b..3ab674e0d0 100644 --- a/src/qs_core_energies.F +++ b/src/qs_core_energies.F @@ -42,7 +42,6 @@ MODULE qs_core_energies neighbor_list_set_p_type USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_core_hamiltonian.F b/src/qs_core_hamiltonian.F index c0d7e71808..48171c87b9 100644 --- a/src/qs_core_hamiltonian.F +++ b/src/qs_core_hamiltonian.F @@ -87,6 +87,8 @@ MODULE qs_core_hamiltonian cp_dbcsr_type, dbcsr_distribution_obj USE cp_dbcsr_output, ONLY: cp_dbcsr_write_matrix_dist,& cp_dbcsr_write_sparse_matrix + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -126,7 +128,6 @@ MODULE qs_core_hamiltonian USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_density_mixing_types.F b/src/qs_density_mixing_types.F index 2c58c713cc..747a5b5667 100644 --- a/src/qs_density_mixing_types.F +++ b/src/qs_density_mixing_types.F @@ -32,7 +32,6 @@ MODULE qs_density_mixing_types dp USE qs_rho_atom_types, ONLY: rho_atom_coeff USE string_utilities, ONLY: s2a -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dftb3_methods.F b/src/qs_dftb3_methods.F index 65b86beaf9..2ef6860c01 100644 --- a/src/qs_dftb3_methods.F +++ b/src/qs_dftb3_methods.F @@ -40,7 +40,6 @@ MODULE qs_dftb3_methods qs_rho_type USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dftb_coulomb.F b/src/qs_dftb_coulomb.F index c2a2ca1b3b..6bb9fb061a 100644 --- a/src/qs_dftb_coulomb.F +++ b/src/qs_dftb_coulomb.F @@ -93,7 +93,6 @@ MODULE qs_dftb_coulomb USE spme, ONLY: get_patch USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dftb_dispersion.F b/src/qs_dftb_dispersion.F index 525443b6bc..5021dfaa28 100644 --- a/src/qs_dftb_dispersion.F +++ b/src/qs_dftb_dispersion.F @@ -39,7 +39,6 @@ MODULE qs_dftb_dispersion neighbor_list_set_p_type USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dftb_matrices.F b/src/qs_dftb_matrices.F index dad58457d0..7d0b42d4b3 100644 --- a/src/qs_dftb_matrices.F +++ b/src/qs_dftb_matrices.F @@ -30,6 +30,8 @@ MODULE qs_dftb_matrices cp_dbcsr_set, cp_dbcsr_trace, cp_dbcsr_type, dbcsr_distribution_obj, & dbcsr_type_antisymmetric, dbcsr_type_symmetric USE cp_dbcsr_output, ONLY: cp_dbcsr_write_sparse_matrix + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -97,7 +99,6 @@ MODULE qs_dftb_matrices spme_potential USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dftb_parameters.F b/src/qs_dftb_parameters.F index 6c0a4b04d4..d8dc3d1550 100644 --- a/src/qs_dftb_parameters.F +++ b/src/qs_dftb_parameters.F @@ -14,6 +14,8 @@ MODULE qs_dftb_parameters USE cp_files, ONLY: close_file,& get_unit_number,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -46,7 +48,6 @@ MODULE qs_dftb_parameters qs_kind_type,& set_qs_kind USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dftb_types.F b/src/qs_dftb_types.F index b451389dd8..93f22c68bb 100644 --- a/src/qs_dftb_types.F +++ b/src/qs_dftb_types.F @@ -12,7 +12,6 @@ MODULE qs_dftb_types USE kinds, ONLY: default_string_length,& dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dftb_utils.F b/src/qs_dftb_utils.F index 61a88a1f94..4f34103667 100644 --- a/src/qs_dftb_utils.F +++ b/src/qs_dftb_utils.F @@ -9,6 +9,8 @@ ! ***************************************************************************** MODULE qs_dftb_utils + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -17,7 +19,6 @@ MODULE qs_dftb_utils USE kinds, ONLY: default_string_length,& dp USE qs_dftb_types, ONLY: qs_dftb_atom_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_diis.F b/src/qs_diis.F index bb9397c073..e9fc5e96fb 100644 --- a/src/qs_diis.F +++ b/src/qs_diis.F @@ -34,6 +34,9 @@ MODULE qs_diis cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -51,7 +54,6 @@ MODULE qs_diis mo_set_p_type USE string_utilities, ONLY: compress USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_diis_types.F b/src/qs_diis_types.F index 95a41cdeb9..447dc481f9 100644 --- a/src/qs_diis_types.F +++ b/src/qs_diis_types.F @@ -15,7 +15,6 @@ MODULE qs_diis_types USE cp_fm_types, ONLY: cp_fm_p_type,& cp_fm_release USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dispersion_nonloc.F b/src/qs_dispersion_nonloc.F index 6c8d3337fd..25b5438ed5 100644 --- a/src/qs_dispersion_nonloc.F +++ b/src/qs_dispersion_nonloc.F @@ -48,7 +48,6 @@ MODULE qs_dispersion_nonloc pw_type USE qs_dispersion_types, ONLY: qs_dispersion_type USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dispersion_pairpot.F b/src/qs_dispersion_pairpot.F index 8fd1854cc0..04d208451f 100644 --- a/src/qs_dispersion_pairpot.F +++ b/src/qs_dispersion_pairpot.F @@ -23,6 +23,8 @@ MODULE qs_dispersion_pairpot plane_distance USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -68,7 +70,6 @@ MODULE qs_dispersion_pairpot neighbor_list_set_p_type USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dispersion_types.F b/src/qs_dispersion_types.F index 5e54effe18..101a773694 100644 --- a/src/qs_dispersion_types.F +++ b/src/qs_dispersion_types.F @@ -14,7 +14,6 @@ MODULE qs_dispersion_types dp USE qs_neighbor_list_types, ONLY: deallocate_neighbor_list_set,& neighbor_list_set_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_dispersion_utils.F b/src/qs_dispersion_utils.F index 95c0f9c8c2..b4fef27822 100644 --- a/src/qs_dispersion_utils.F +++ b/src/qs_dispersion_utils.F @@ -11,6 +11,8 @@ MODULE qs_dispersion_utils USE atomic_kind_types, ONLY: atomic_kind_type,& get_atomic_kind + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_constants, ONLY: vdw_nl_DRSLL,& @@ -36,7 +38,6 @@ MODULE qs_dispersion_utils qs_environment_type USE qs_kind_types, ONLY: get_qs_kind,& qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_efield_berry.F b/src/qs_efield_berry.F index 9148860b22..3d7c21cb40 100644 --- a/src/qs_efield_berry.F +++ b/src/qs_efield_berry.F @@ -77,7 +77,6 @@ MODULE qs_efield_berry set_efield_matrices USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_efield_local.F b/src/qs_efield_local.F index 430d74f3c3..09795134b5 100644 --- a/src/qs_efield_local.F +++ b/src/qs_efield_local.F @@ -51,7 +51,6 @@ MODULE qs_efield_local set_efield_matrices USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_elec_field.F b/src/qs_elec_field.F index d8006fef47..a1ca1a7c32 100644 --- a/src/qs_elec_field.F +++ b/src/qs_elec_field.F @@ -19,6 +19,8 @@ MODULE qs_elec_field USE cp_dbcsr_interface, ONLY: cp_dbcsr_get_block_p,& cp_dbcsr_p_type USE cp_dbcsr_output, ONLY: cp_dbcsr_write_sparse_matrix + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -43,7 +45,6 @@ MODULE qs_elec_field neighbor_list_iterator_release,& neighbor_list_set_p_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_electric_field_gradient.F b/src/qs_electric_field_gradient.F index e8ce21a61c..f8deaa82ef 100644 --- a/src/qs_electric_field_gradient.F +++ b/src/qs_electric_field_gradient.F @@ -16,6 +16,8 @@ MODULE qs_electric_field_gradient USE basis_set_types, ONLY: get_gto_basis_set,& gto_basis_set_type USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type USE eigenvalueproblems, ONLY: diagonalise @@ -69,7 +71,6 @@ MODULE qs_electric_field_gradient USE qs_rho_types, ONLY: qs_rho_type USE util, ONLY: get_limit,& sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_energy.F b/src/qs_energy.F index 6e67ab26e3..386fec89a8 100644 --- a/src/qs_energy.F +++ b/src/qs_energy.F @@ -23,7 +23,6 @@ MODULE qs_energy qs_environment_type USE qs_ks_methods, ONLY: qs_ks_update_qs_env USE qs_scf, ONLY: scf -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_energy_types.F b/src/qs_energy_types.F index 5884f07e4a..e94a08a72d 100644 --- a/src/qs_energy_types.F +++ b/src/qs_energy_types.F @@ -16,7 +16,6 @@ MODULE qs_energy_types dp_size,& int_size USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_energy_utils.F b/src/qs_energy_utils.F index a38080c744..3a6e2c1764 100644 --- a/src/qs_energy_utils.F +++ b/src/qs_energy_utils.F @@ -87,7 +87,6 @@ MODULE qs_energy_utils USE se_core_core, ONLY: se_core_core_interaction USE se_core_matrix, ONLY: build_se_core_matrix USE xas_methods, ONLY: xas -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_environment.F b/src/qs_environment.F index d918ff778a..3cc9131ace 100644 --- a/src/qs_environment.F +++ b/src/qs_environment.F @@ -41,6 +41,9 @@ MODULE qs_environment write_dft_control,& write_qs_control USE cp_ddapc_types, ONLY: cp_ddapc_ewald_create + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -178,7 +181,6 @@ MODULE qs_environment USE semi_empirical_utils, ONLY: se_cutoff_compatible USE transport, ONLY: transport_env_create ! USE xas_control, ONLY: write_xas_control -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_environment_methods.F b/src/qs_environment_methods.F index 1c062518f4..8096167e0e 100644 --- a/src/qs_environment_methods.F +++ b/src/qs_environment_methods.F @@ -78,7 +78,6 @@ MODULE qs_environment_methods USE task_list_types, ONLY: allocate_task_list,& deallocate_task_list,& task_list_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_environment_types.F b/src/qs_environment_types.F index 71273fd407..8cbd5e8c33 100644 --- a/src/qs_environment_types.F +++ b/src/qs_environment_types.F @@ -150,7 +150,6 @@ MODULE qs_environment_types USE xas_env_types, ONLY: xas_env_release,& xas_env_retain,& xas_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_epr_hyp.F b/src/qs_epr_hyp.F index 2f6b8e8f4f..1f2ddd91d8 100644 --- a/src/qs_epr_hyp.F +++ b/src/qs_epr_hyp.F @@ -16,6 +16,8 @@ MODULE qs_epr_hyp USE cell_types, ONLY: cell_type,& pbc USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type USE input_section_types, ONLY: section_vals_get_subs_vals,& @@ -58,7 +60,6 @@ MODULE qs_epr_hyp USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_external_density.F b/src/qs_external_density.F index 208f957892..2030cab8c7 100644 --- a/src/qs_external_density.F +++ b/src/qs_external_density.F @@ -34,7 +34,6 @@ MODULE qs_external_density rs_grid_create,& rs_grid_zero USE rs_pw_interface, ONLY: density_rs2pw -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_external_potential.F b/src/qs_external_potential.F index de47191298..e281dee1df 100644 --- a/src/qs_external_potential.F +++ b/src/qs_external_potential.F @@ -13,6 +13,7 @@ MODULE qs_external_potential USE cell_types, ONLY: cell_type,& pbc USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_to_string USE force_fields_util, ONLY: get_generic_info USE fparser, ONLY: evalf,& evalfd,& @@ -38,7 +39,6 @@ MODULE qs_external_potential qs_kind_type USE realspace_grid_cube, ONLY: cube_to_pw USE string_utilities, ONLY: compress -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_atomic_halo_types.F b/src/qs_fb_atomic_halo_types.F index e9abb140c3..120ab8bdbf 100644 --- a/src/qs_fb_atomic_halo_types.F +++ b/src/qs_fb_atomic_halo_types.F @@ -9,6 +9,8 @@ MODULE qs_fb_atomic_halo_types get_atomic_kind USE cell_types, ONLY: cell_type,& pbc + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -27,7 +29,6 @@ MODULE qs_fb_atomic_halo_types USE string_utilities, ONLY: compress USE util, ONLY: locate,& sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_atomic_matrix_methods.F b/src/qs_fb_atomic_matrix_methods.F index dc962be4ad..ece6ddc889 100644 --- a/src/qs_fb_atomic_matrix_methods.F +++ b/src/qs_fb_atomic_matrix_methods.F @@ -35,7 +35,6 @@ MODULE qs_fb_atomic_matrix_methods USE qs_fb_matrix_data_types, ONLY: fb_matrix_data_get,& fb_matrix_data_has_data,& fb_matrix_data_obj -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_com_tasks_types.F b/src/qs_fb_com_tasks_types.F index f62096f218..72447eead7 100644 --- a/src/qs_fb_com_tasks_types.F +++ b/src/qs_fb_com_tasks_types.F @@ -21,7 +21,6 @@ MODULE qs_fb_com_tasks_types fb_matrix_data_has_data,& fb_matrix_data_obj USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_distribution_methods.F b/src/qs_fb_distribution_methods.F index 92d3adff47..f556370f9f 100644 --- a/src/qs_fb_distribution_methods.F +++ b/src/qs_fb_distribution_methods.F @@ -10,6 +10,8 @@ MODULE qs_fb_distribution_methods cp_dbcsr_get_info, cp_dbcsr_nblkcols_total, cp_dbcsr_p_type, & cp_dbcsr_type, dbcsr_distribution_mp, dbcsr_distribution_obj, & dbcsr_mp_get_process, dbcsr_mp_npcols, dbcsr_mp_nprows, dbcsr_mp_obj + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -28,7 +30,6 @@ MODULE qs_fb_distribution_methods fb_env_set USE qs_kind_types, ONLY: qs_kind_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_env_methods.F b/src/qs_fb_env_methods.F index 0aa522f989..a8ee767fb2 100644 --- a/src/qs_fb_env_methods.F +++ b/src/qs_fb_env_methods.F @@ -44,6 +44,8 @@ MODULE qs_fb_env_methods cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -104,7 +106,6 @@ MODULE qs_fb_env_methods USE scf_control_types, ONLY: scf_control_type USE string_utilities, ONLY: compress,& uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_env_types.F b/src/qs_fb_env_types.F index fe7f945ffa..6573937d48 100644 --- a/src/qs_fb_env_types.F +++ b/src/qs_fb_env_types.F @@ -18,7 +18,6 @@ MODULE qs_fb_env_types fb_trial_fns_obj,& fb_trial_fns_release,& fb_trial_fns_retain -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_filter_matrix_methods.F b/src/qs_fb_filter_matrix_methods.F index ee0eb8bd06..a81397ceeb 100644 --- a/src/qs_fb_filter_matrix_methods.F +++ b/src/qs_fb_filter_matrix_methods.F @@ -53,7 +53,6 @@ MODULE qs_fb_filter_matrix_methods fb_trial_fns_obj USE string_utilities, ONLY: compress,& uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_hash_table_types.F b/src/qs_fb_hash_table_types.F index ce51b40c77..4494ef8ace 100644 --- a/src/qs_fb_hash_table_types.F +++ b/src/qs_fb_hash_table_types.F @@ -23,7 +23,6 @@ MODULE qs_fb_hash_table_types USE kinds, ONLY: int_8 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_input.F b/src/qs_fb_input.F index 16a93c943f..98a15b2367 100644 --- a/src/qs_fb_input.F +++ b/src/qs_fb_input.F @@ -15,7 +15,6 @@ MODULE qs_fb_input USE input_val_types, ONLY: logical_t,& real_t USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_matrix_data_types.F b/src/qs_fb_matrix_data_types.F index c50de70e96..af0cc388bb 100644 --- a/src/qs_fb_matrix_data_types.F +++ b/src/qs_fb_matrix_data_types.F @@ -14,7 +14,6 @@ MODULE qs_fb_matrix_data_types fb_hash_table_nullify,& fb_hash_table_obj,& fb_hash_table_release -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fb_trial_fns_types.F b/src/qs_fb_trial_fns_types.F index 9564dd4b2f..ac61808f3e 100644 --- a/src/qs_fb_trial_fns_types.F +++ b/src/qs_fb_trial_fns_types.F @@ -5,7 +5,6 @@ MODULE qs_fb_trial_fns_types -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_fermi_contact.F b/src/qs_fermi_contact.F index 340b29e8c8..0a7498441b 100644 --- a/src/qs_fermi_contact.F +++ b/src/qs_fermi_contact.F @@ -19,6 +19,8 @@ MODULE qs_fermi_contact USE cp_dbcsr_interface, ONLY: cp_dbcsr_get_block_p,& cp_dbcsr_p_type USE cp_dbcsr_output, ONLY: cp_dbcsr_write_sparse_matrix + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -43,7 +45,6 @@ MODULE qs_fermi_contact neighbor_list_iterator_release,& neighbor_list_set_p_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_force.F b/src/qs_force.F index 702eed6323..6881b2cfe7 100644 --- a/src/qs_force.F +++ b/src/qs_force.F @@ -23,6 +23,8 @@ MODULE qs_force cp_dbcsr_set USE cp_dbcsr_output, ONLY: cp_dbcsr_write_sparse_matrix USE cp_fm_types, ONLY: cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -75,7 +77,6 @@ MODULE qs_force USE se_core_matrix, ONLY: build_se_core_matrix USE termination, ONLY: stop_memory USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_force_types.F b/src/qs_force_types.F index c9ad5fb696..d0adb62cfe 100644 --- a/src/qs_force_types.F +++ b/src/qs_force_types.F @@ -14,7 +14,6 @@ MODULE qs_force_types USE atomic_kind_types, ONLY: atomic_kind_type,& get_atomic_kind USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_gapw_densities.F b/src/qs_gapw_densities.F index b5882cc82e..726b0054c7 100644 --- a/src/qs_gapw_densities.F +++ b/src/qs_gapw_densities.F @@ -9,6 +9,7 @@ MODULE qs_gapw_densities get_atomic_kind USE cp_control_types, ONLY: dft_control_type,& gapw_control_type + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp USE message_passing, ONLY: mp_sum @@ -26,7 +27,6 @@ MODULE qs_gapw_densities rho0_mpole_type USE qs_rho_atom_methods, ONLY: calculate_rho_atom USE qs_rho_atom_types, ONLY: rho_atom_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_grid_atom.F b/src/qs_grid_atom.F index c020ba8705..a2227e84b1 100644 --- a/src/qs_grid_atom.F +++ b/src/qs_grid_atom.F @@ -13,7 +13,6 @@ MODULE qs_grid_atom USE lebedev, ONLY: lebedev_grid USE mathconstants, ONLY: pi USE memory_utilities, ONLY: reallocate -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_gspace_mixing.F b/src/qs_gspace_mixing.F index 35729c526f..a4915d6ace 100644 --- a/src/qs_gspace_mixing.F +++ b/src/qs_gspace_mixing.F @@ -49,7 +49,6 @@ MODULE qs_gspace_mixing USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type USE qs_scf_methods, ONLY: cp_sm_mix -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_harmonics_atom.F b/src/qs_harmonics_atom.F index f5addfe4ad..32df8ed34d 100644 --- a/src/qs_harmonics_atom.F +++ b/src/qs_harmonics_atom.F @@ -19,7 +19,6 @@ MODULE qs_harmonics_atom soset USE orbital_transformation_matrices, ONLY: orbtramat USE spherical_harmonics, ONLY: y_lm -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_initial_guess.F b/src/qs_initial_guess.F index 0686cfb5b5..e8dc03bb45 100644 --- a/src/qs_initial_guess.F +++ b/src/qs_initial_guess.F @@ -33,6 +33,10 @@ MODULE qs_initial_guess cp_fm_create, cp_fm_get_submatrix, cp_fm_init_random, cp_fm_p_type, & cp_fm_release, cp_fm_set_all, cp_fm_set_submatrix, cp_fm_to_fm, & cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -84,7 +88,6 @@ MODULE qs_initial_guess USE qs_wf_history_methods, ONLY: wfi_update USE scf_control_types, ONLY: scf_control_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_integral_utils.F b/src/qs_integral_utils.F index df5dcd3b9e..81102e74cf 100644 --- a/src/qs_integral_utils.F +++ b/src/qs_integral_utils.F @@ -17,7 +17,6 @@ MODULE qs_integral_utils USE qs_kind_types, ONLY: get_qs_kind,& get_qs_kind_set,& qs_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_integrate_potential.F b/src/qs_integrate_potential.F index 6771d2d745..52e6281e20 100644 --- a/src/qs_integrate_potential.F +++ b/src/qs_integrate_potential.F @@ -25,7 +25,6 @@ MODULE qs_integrate_potential integrate_scp_rspace,& integrate_v_core_rspace,& integrate_v_rspace_one_center -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_integrate_potential_low.F b/src/qs_integrate_potential_low.F index ba6e2dc6bf..fba59b71ab 100644 --- a/src/qs_integrate_potential_low.F +++ b/src/qs_integrate_potential_low.F @@ -18,7 +18,6 @@ MODULE qs_integrate_potential_low current_maxl,& ncoset USE realspace_grid_types, ONLY: realspace_grid_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_integrate_potential_product.F b/src/qs_integrate_potential_product.F index 882154da6c..c91ab522ac 100644 --- a/src/qs_integrate_potential_product.F +++ b/src/qs_integrate_potential_product.F @@ -73,7 +73,6 @@ MODULE qs_integrate_potential_product !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_integrate_potential_single.F b/src/qs_integrate_potential_single.F index 8b4107ccbf..d60fe842ff 100644 --- a/src/qs_integrate_potential_single.F +++ b/src/qs_integrate_potential_single.F @@ -75,7 +75,6 @@ MODULE qs_integrate_potential_single scp_vector_type,& scptb_parameter_type USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_interactions.F b/src/qs_interactions.F index a58c0725e7..b2e9f342fb 100644 --- a/src/qs_interactions.F +++ b/src/qs_interactions.F @@ -22,6 +22,8 @@ MODULE qs_interactions set_gto_basis_set USE cp_control_types, ONLY: qs_control_type,& semi_empirical_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_units, ONLY: cp_unit_from_cp2k @@ -40,7 +42,6 @@ MODULE qs_interactions get_qs_kind_set,& qs_kind_type USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_kind_types.F b/src/qs_kind_types.F index f6dfc574af..13eba389a7 100644 --- a/src/qs_kind_types.F +++ b/src/qs_kind_types.F @@ -32,6 +32,8 @@ MODULE qs_kind_types write_orb_basis_set USE cp_control_types, ONLY: dft_control_type,& qs_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -85,7 +87,6 @@ MODULE qs_kind_types se_param_set_default USE soft_basis_set, ONLY: create_soft_basis USE string_utilities, ONLY: uppercase -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_kinetic.F b/src/qs_kinetic.F index 723acd1bf8..ffb63e6623 100644 --- a/src/qs_kinetic.F +++ b/src/qs_kinetic.F @@ -48,7 +48,6 @@ MODULE qs_kinetic USE qs_overlap, ONLY: create_sab_matrix USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_kpp1_env_methods.F b/src/qs_kpp1_env_methods.F index 2f2c0463ec..6ed246bd36 100644 --- a/src/qs_kpp1_env_methods.F +++ b/src/qs_kpp1_env_methods.F @@ -19,6 +19,9 @@ MODULE qs_kpp1_env_methods cp_dbcsr_p_type,& cp_dbcsr_scale,& cp_dbcsr_set + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_should_output,& cp_print_key_unit_nr @@ -81,7 +84,6 @@ MODULE qs_kpp1_env_methods xc_rho_set_release,& xc_rho_set_type,& xc_rho_set_update -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_kpp1_env_types.F b/src/qs_kpp1_env_types.F index 782c651a11..341d0f224f 100644 --- a/src/qs_kpp1_env_types.F +++ b/src/qs_kpp1_env_types.F @@ -18,7 +18,6 @@ MODULE qs_kpp1_env_types xc_dset_release USE xc_rho_set_types, ONLY: xc_rho_set_release,& xc_rho_set_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ks_apply_restraints.F b/src/qs_ks_apply_restraints.F index b0539ebd3f..ee47fc1619 100644 --- a/src/qs_ks_apply_restraints.F +++ b/src/qs_ks_apply_restraints.F @@ -36,7 +36,6 @@ MODULE qs_ks_apply_restraints USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type USE s_square_methods, ONLY: s2_restraint -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ks_atom.F b/src/qs_ks_atom.F index 1a652823a2..3a8ac6432c 100644 --- a/src/qs_ks_atom.F +++ b/src/qs_ks_atom.F @@ -49,7 +49,6 @@ MODULE qs_ks_atom USE util, ONLY: get_limit USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ks_methods.F b/src/qs_ks_methods.F index a9b16eb7e2..cce722a861 100644 --- a/src/qs_ks_methods.F +++ b/src/qs_ks_methods.F @@ -56,6 +56,9 @@ MODULE qs_ks_methods cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_should_output USE cp_para_types, ONLY: cp_para_env_type @@ -148,7 +151,6 @@ MODULE qs_ks_methods USE se_fock_matrix, ONLY: build_se_fock_matrix USE surface_dipole, ONLY: calc_dipsurf_potential USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ks_qmmm_methods.F b/src/qs_ks_qmmm_methods.F index 9546f82c9e..9556cef9f4 100644 --- a/src/qs_ks_qmmm_methods.F +++ b/src/qs_ks_qmmm_methods.F @@ -8,6 +8,8 @@ ! ***************************************************************************** MODULE qs_ks_qmmm_methods USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cube_utils, ONLY: cube_info_type,& @@ -32,7 +34,6 @@ MODULE qs_ks_qmmm_methods set_qs_env USE qs_ks_qmmm_types, ONLY: qs_ks_qmmm_env_type,& qs_ks_qmmm_release -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ks_qmmm_types.F b/src/qs_ks_qmmm_types.F index 475b506f30..58d47760b6 100644 --- a/src/qs_ks_qmmm_types.F +++ b/src/qs_ks_qmmm_types.F @@ -20,7 +20,6 @@ MODULE qs_ks_qmmm_types USE pw_pool_types, ONLY: pw_pool_give_back_pw,& pw_pool_type USE pw_types, ONLY: pw_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ks_types.F b/src/qs_ks_types.F index 17804188d3..bcf3ee3951 100644 --- a/src/qs_ks_types.F +++ b/src/qs_ks_types.F @@ -68,7 +68,6 @@ MODULE qs_ks_types USE task_list_types, ONLY: deallocate_task_list,& task_list_type USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ks_utils.F b/src/qs_ks_utils.F index 29cc2d1ee0..3c22c51445 100644 --- a/src/qs_ks_utils.F +++ b/src/qs_ks_utils.F @@ -42,6 +42,9 @@ MODULE qs_ks_utils cp_fm_set_all,& cp_fm_to_fm,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -102,7 +105,6 @@ MODULE qs_ks_utils USE virial_types, ONLY: virial_type USE xc, ONLY: xc_exc_calc,& xc_vxc_pw_create1 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_atom_current.F b/src/qs_linres_atom_current.F index 785baea6ea..a3965353a7 100644 --- a/src/qs_linres_atom_current.F +++ b/src/qs_linres_atom_current.F @@ -23,6 +23,7 @@ MODULE qs_linres_atom_current USE cp_control_types, ONLY: dft_control_type USE cp_dbcsr_interface, ONLY: cp_dbcsr_get_block_p,& cp_dbcsr_p_type + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_types, ONLY: cp_para_env_type USE input_constants, ONLY: current_gauge_atom,& current_gauge_r,& @@ -64,7 +65,6 @@ MODULE qs_linres_atom_current alist_type,& get_alist USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_current.F b/src/qs_linres_current.F index c97eceac7e..1531f66788 100644 --- a/src/qs_linres_current.F +++ b/src/qs_linres_current.F @@ -45,6 +45,10 @@ MODULE qs_linres_current cp_fm_set_all,& cp_fm_to_fm,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -123,7 +127,6 @@ MODULE qs_linres_current int2pair,& rs_distribute_matrix,& task_list_inner_loop -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_current_utils.F b/src/qs_linres_current_utils.F index c5baf20d23..18f6c5cf43 100644 --- a/src/qs_linres_current_utils.F +++ b/src/qs_linres_current_utils.F @@ -42,6 +42,9 @@ MODULE qs_linres_current_utils cp_fm_set_all,& cp_fm_to_fm,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -106,7 +109,6 @@ MODULE qs_linres_current_utils USE realspace_grid_types, ONLY: realspace_grid_desc_p_type,& rs_grid_release USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_epr_nablavks.F b/src/qs_linres_epr_nablavks.F index 3f11d92cc0..15b1aee91e 100644 --- a/src/qs_linres_epr_nablavks.F +++ b/src/qs_linres_epr_nablavks.F @@ -15,6 +15,8 @@ MODULE qs_linres_epr_nablavks USE cell_types, ONLY: cell_type USE cp_control_types, ONLY: dft_control_type USE cp_dbcsr_interface, ONLY: cp_dbcsr_p_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -83,7 +85,6 @@ MODULE qs_linres_epr_nablavks USE qs_vxc, ONLY: qs_vxc_create USE qs_vxc_atom, ONLY: calculate_vxc_atom USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_epr_ownutils.F b/src/qs_linres_epr_ownutils.F index 3a5abea266..19adde9fde 100644 --- a/src/qs_linres_epr_ownutils.F +++ b/src/qs_linres_epr_ownutils.F @@ -14,6 +14,8 @@ MODULE qs_linres_epr_ownutils USE cell_types, ONLY: cell_type USE cp_control_types, ONLY: dft_control_type USE cp_dbcsr_interface, ONLY: cp_dbcsr_p_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -76,7 +78,6 @@ MODULE qs_linres_epr_ownutils qs_rho_type USE realspace_grid_types, ONLY: realspace_grid_desc_type USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_epr_utils.F b/src/qs_linres_epr_utils.F index b01a648de8..39903e1af9 100644 --- a/src/qs_linres_epr_utils.F +++ b/src/qs_linres_epr_utils.F @@ -21,6 +21,8 @@ MODULE qs_linres_epr_utils USE atomic_kind_types, ONLY: atomic_kind_type USE cell_types, ONLY: cell_type USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_section_types, ONLY: section_vals_get_subs_vals,& @@ -57,7 +59,6 @@ MODULE qs_linres_epr_utils qs_rho_create,& qs_rho_set USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_issc_utils.F b/src/qs_linres_issc_utils.F index f85de488bd..5254ee5fa4 100644 --- a/src/qs_linres_issc_utils.F +++ b/src/qs_linres_issc_utils.F @@ -39,6 +39,9 @@ MODULE qs_linres_issc_utils cp_fm_set_all,& cp_fm_to_fm,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -73,7 +76,6 @@ MODULE qs_linres_issc_utils USE qs_neighbor_list_types, ONLY: neighbor_list_set_p_type USE qs_p_env_types, ONLY: qs_p_env_type USE qs_spin_orbit, ONLY: build_pso_matrix -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_methods.F b/src/qs_linres_methods.F index 7e1f42afb9..95b41d6d83 100644 --- a/src/qs_linres_methods.F +++ b/src/qs_linres_methods.F @@ -39,6 +39,9 @@ MODULE qs_linres_methods cp_fm_type USE cp_fm_vect, ONLY: cp_fm_vect_dealloc USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_generate_filename,& @@ -119,7 +122,6 @@ MODULE qs_linres_methods xc_rho_set_release,& xc_rho_set_type,& xc_rho_set_update -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_module.F b/src/qs_linres_module.F index 5ab6dd551f..43b92a1f84 100644 --- a/src/qs_linres_module.F +++ b/src/qs_linres_module.F @@ -18,6 +18,8 @@ MODULE qs_linres_module cite_reference USE cp_control_types, ONLY: dft_control_type USE cp_dbcsr_interface, ONLY: cp_dbcsr_p_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE force_env_types, ONLY: force_env_get,& @@ -87,7 +89,6 @@ MODULE qs_linres_module USE qs_rho_methods, ONLY: qs_rho_update_rho USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_nmr_epr_common_utils.F b/src/qs_linres_nmr_epr_common_utils.F index a84a1e2e8c..c8d0ac18c1 100644 --- a/src/qs_linres_nmr_epr_common_utils.F +++ b/src/qs_linres_nmr_epr_common_utils.F @@ -25,7 +25,6 @@ MODULE qs_linres_nmr_epr_common_utils RECIPROCALSPACE,& pw_p_type,& pw_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_nmr_shift.F b/src/qs_linres_nmr_shift.F index cb115e4b4d..04f60b1c71 100644 --- a/src/qs_linres_nmr_shift.F +++ b/src/qs_linres_nmr_shift.F @@ -16,6 +16,9 @@ MODULE qs_linres_nmr_shift USE cell_types, ONLY: cell_type,& pbc USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -73,7 +76,6 @@ MODULE qs_linres_nmr_shift USE qs_rho_types, ONLY: qs_rho_get USE realspace_grid_types, ONLY: realspace_grid_desc_type USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_nmr_utils.F b/src/qs_linres_nmr_utils.F index 5cb2ef650e..5db785d5dd 100644 --- a/src/qs_linres_nmr_utils.F +++ b/src/qs_linres_nmr_utils.F @@ -22,6 +22,8 @@ MODULE qs_linres_nmr_utils USE atomic_kind_types, ONLY: atomic_kind_type USE cell_types, ONLY: cell_type USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -48,7 +50,6 @@ MODULE qs_linres_nmr_utils nmr_env_type USE qs_matrix_pools, ONLY: qs_matrix_pools_type USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_op.F b/src/qs_linres_op.F index b859d5dd4d..bbe671a86a 100644 --- a/src/qs_linres_op.F +++ b/src/qs_linres_op.F @@ -43,6 +43,9 @@ MODULE qs_linres_op cp_fm_release, cp_fm_set_all, cp_fm_set_submatrix, cp_fm_to_fm, & cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -74,7 +77,6 @@ MODULE qs_linres_op build_lin_mom_matrix,& rRc_xyz_ao USE qs_spin_orbit, ONLY: build_pso_matrix -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_polar_utils.F b/src/qs_linres_polar_utils.F index 07086c0218..4f92f020d6 100644 --- a/src/qs_linres_polar_utils.F +++ b/src/qs_linres_polar_utils.F @@ -30,6 +30,9 @@ MODULE qs_linres_polar_utils cp_fm_set_all,& cp_fm_to_fm,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -56,7 +59,6 @@ MODULE qs_linres_polar_utils USE qs_mo_types, ONLY: get_mo_set,& mo_set_p_type USE qs_p_env_types, ONLY: qs_p_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_linres_types.F b/src/qs_linres_types.F index 8f02868d45..58a4018fb3 100644 --- a/src/qs_linres_types.F +++ b/src/qs_linres_types.F @@ -29,7 +29,6 @@ MODULE qs_linres_types USE qs_rho_types, ONLY: qs_rho_p_type,& qs_rho_release USE realspace_grid_types, ONLY: realspace_grid_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_loc_methods.F b/src/qs_loc_methods.F index 3d1893ee8c..03f621073b 100644 --- a/src/qs_loc_methods.F +++ b/src/qs_loc_methods.F @@ -36,6 +36,9 @@ MODULE qs_loc_methods cp_fm_p_type, cp_fm_release, cp_fm_set_all, cp_fm_set_submatrix, & cp_fm_to_fm, cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_iter_string,& cp_p_file,& cp_print_key_finished_output,& @@ -97,7 +100,6 @@ MODULE qs_loc_methods USE qs_subsys_types, ONLY: qs_subsys_get,& qs_subsys_type USE string_utilities, ONLY: xstring -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_loc_molecules.F b/src/qs_loc_molecules.F index 10b7b7b04f..71ddb04fd4 100644 --- a/src/qs_loc_molecules.F +++ b/src/qs_loc_molecules.F @@ -11,6 +11,8 @@ MODULE qs_loc_molecules get_atomic_kind USE cell_types, ONLY: cell_type,& pbc + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -37,7 +39,6 @@ MODULE qs_loc_molecules USE qs_kind_types, ONLY: get_qs_kind,& qs_kind_type USE qs_loc_types, ONLY: qs_loc_env_new_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_loc_types.F b/src/qs_loc_types.F index df380402a9..f1a10c7b8b 100644 --- a/src/qs_loc_types.F +++ b/src/qs_loc_types.F @@ -39,7 +39,6 @@ MODULE qs_loc_types USE kinds, ONLY: default_string_length,& dp USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_loc_utils.F b/src/qs_loc_utils.F index 454a52e1f3..f27f6e15e0 100644 --- a/src/qs_loc_utils.F +++ b/src/qs_loc_utils.F @@ -37,6 +37,10 @@ MODULE qs_loc_utils cp_fm_maxabsval, cp_fm_p_type, cp_fm_release, cp_fm_set_all, & cp_fm_set_submatrix, cp_fm_to_fm, cp_fm_type, cp_fm_write_unformatted USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_generate_filename,& @@ -85,7 +89,6 @@ MODULE qs_loc_utils neighbor_list_set_p_type USE qs_scf_types, ONLY: ot_method_nr USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_local_rho_types.F b/src/qs_local_rho_types.F index fc2bca4565..98e307122e 100644 --- a/src/qs_local_rho_types.F +++ b/src/qs_local_rho_types.F @@ -20,7 +20,6 @@ MODULE qs_local_rho_types USE qs_rho_atom_types, ONLY: deallocate_rho_atom_set,& rho_atom_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_localization_methods.F b/src/qs_localization_methods.F index dd13cc62b8..edb52c6b11 100644 --- a/src/qs_localization_methods.F +++ b/src/qs_localization_methods.F @@ -44,6 +44,8 @@ MODULE qs_localization_methods cp_fm_maxabsrownorm, cp_fm_maxabsval, cp_fm_p_type, cp_fm_release, & cp_fm_set_all, cp_fm_set_submatrix, cp_fm_to_fm, cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit,& + cp_logger_get_default_unit_nr USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp USE machine, ONLY: m_flush,& @@ -58,7 +60,6 @@ MODULE qs_localization_methods mp_sendrecv,& mp_sum,& mp_sync -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_matrix_pools.F b/src/qs_matrix_pools.F index 1b5499b41f..7ccd6b586f 100644 --- a/src/qs_matrix_pools.F +++ b/src/qs_matrix_pools.F @@ -27,7 +27,6 @@ MODULE qs_matrix_pools USE cp_para_types, ONLY: cp_para_env_type USE qs_mo_types, ONLY: get_mo_set,& mo_set_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_mo_io.F b/src/qs_mo_io.F index 1658b061e9..fd5b14ef62 100644 --- a/src/qs_mo_io.F +++ b/src/qs_mo_io.F @@ -33,6 +33,10 @@ MODULE qs_mo_io cp_fm_set_submatrix,& cp_fm_to_fm,& cp_fm_write_unformatted + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_generate_filename,& @@ -64,7 +68,6 @@ MODULE qs_mo_io USE qs_mo_types, ONLY: mo_set_p_type,& mo_set_type USE string_utilities, ONLY: compress -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_mo_methods.F b/src/qs_mo_methods.F index 208a0c2b7e..e9fb4df6eb 100644 --- a/src/qs_mo_methods.F +++ b/src/qs_mo_methods.F @@ -42,6 +42,7 @@ MODULE qs_mo_methods cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp USE message_passing, ONLY: mp_max @@ -51,7 +52,6 @@ MODULE qs_mo_methods mo_set_p_type,& mo_set_type USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_mo_occupation.F b/src/qs_mo_occupation.F index 02437fd2a2..fd3e828585 100644 --- a/src/qs_mo_occupation.F +++ b/src/qs_mo_occupation.F @@ -12,6 +12,7 @@ MODULE qs_mo_occupation + USE cp_log_handling, ONLY: cp_to_string USE fermi_utils, ONLY: FermiFixed,& FermiFixedDeriv USE input_constants, ONLY: smear_energy_window,& @@ -27,7 +28,6 @@ MODULE qs_mo_occupation USE util, ONLY: sort USE xas_env_types, ONLY: get_xas_env,& xas_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_mo_types.F b/src/qs_mo_types.F index 44d8eb4147..d5d1f1c5f0 100644 --- a/src/qs_mo_types.F +++ b/src/qs_mo_types.F @@ -31,7 +31,6 @@ MODULE qs_mo_types cp_fm_to_fm,& cp_fm_type USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_modify_pab_block.F b/src/qs_modify_pab_block.F index 1292c0ed0f..05980073b7 100644 --- a/src/qs_modify_pab_block.F +++ b/src/qs_modify_pab_block.F @@ -13,7 +13,6 @@ MODULE qs_modify_pab_block USE kinds, ONLY: dp USE orbital_pointers, ONLY: coset -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_moments.F b/src/qs_moments.F index 0f67aeb30b..20bd4864a7 100644 --- a/src/qs_moments.F +++ b/src/qs_moments.F @@ -78,7 +78,6 @@ MODULE qs_moments qs_rho_type USE rt_propagation_types, ONLY: get_rtp,& rt_prop_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_neighbor_list_types.F b/src/qs_neighbor_list_types.F index 5e7cab7ce2..2f5a0f9fb2 100644 --- a/src/qs_neighbor_list_types.F +++ b/src/qs_neighbor_list_types.F @@ -19,7 +19,6 @@ MODULE qs_neighbor_list_types USE termination, ONLY: stop_memory USE util, ONLY: locate,& sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_neighbor_lists.F b/src/qs_neighbor_lists.F index fe42ea5e4d..b9659862ca 100644 --- a/src/qs_neighbor_lists.F +++ b/src/qs_neighbor_lists.F @@ -28,6 +28,8 @@ MODULE qs_neighbor_lists real_to_scaled,& scaled_to_real USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -89,7 +91,6 @@ MODULE qs_neighbor_lists subcell_type USE util, ONLY: locate,& sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_oce_methods.F b/src/qs_oce_methods.F index 01ab1a2a8a..91e0df7806 100644 --- a/src/qs_oce_methods.F +++ b/src/qs_oce_methods.F @@ -42,7 +42,6 @@ MODULE qs_oce_methods USE sap_kind_types, ONLY: clist_type,& sap_int_type,& sap_sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_oce_types.F b/src/qs_oce_types.F index a1eedaf5c3..54ed0fed6c 100644 --- a/src/qs_oce_types.F +++ b/src/qs_oce_types.F @@ -10,7 +10,6 @@ MODULE qs_oce_types USE sap_kind_types, ONLY: release_sap_int,& sap_int_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_operators_ao.F b/src/qs_operators_ao.F index aac3bedba9..de7ba79f3a 100644 --- a/src/qs_operators_ao.F +++ b/src/qs_operators_ao.F @@ -23,6 +23,8 @@ MODULE qs_operators_ao cp_dbcsr_p_type,& dbcsr_type_antisymmetric,& dbcsr_type_no_symmetry + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp USE mathconstants, ONLY: pi @@ -41,7 +43,6 @@ MODULE qs_operators_ao neighbor_list_iterator_p_type,& neighbor_list_iterator_release,& neighbor_list_set_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ot.F b/src/qs_ot.F index 4269486e4b..7fa563cdba 100644 --- a/src/qs_ot.F +++ b/src/qs_ot.F @@ -28,12 +28,12 @@ MODULE qs_ot cp_dbcsr_release_p, cp_dbcsr_scale, cp_dbcsr_scale_by_vector, & cp_dbcsr_set, cp_dbcsr_transposed, cp_dbcsr_type, & dbcsr_distribution_mp, dbcsr_mp_group + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE kinds, ONLY: dp USE message_passing, ONLY: mp_sum USE preconditioner, ONLY: apply_preconditioner USE preconditioner_types, ONLY: preconditioner_type USE qs_ot_types, ONLY: qs_ot_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ot_eigensolver.F b/src/qs_ot_eigensolver.F index 1fd52e7fdd..91e2658d5b 100644 --- a/src/qs_ot_eigensolver.F +++ b/src/qs_ot_eigensolver.F @@ -21,6 +21,7 @@ MODULE qs_ot_eigensolver cp_fm_to_dbcsr_row_template USE cp_fm_types, ONLY: cp_fm_get_info,& cp_fm_type + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE kinds, ONLY: dp USE preconditioner_types, ONLY: preconditioner_in_use,& preconditioner_type @@ -35,7 +36,6 @@ MODULE qs_ot_eigensolver qs_ot_settings_init,& qs_ot_settings_type,& qs_ot_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ot_minimizer.F b/src/qs_ot_minimizer.F index d3c4e0c45f..c97bd79c69 100644 --- a/src/qs_ot_minimizer.F +++ b/src/qs_ot_minimizer.F @@ -19,6 +19,9 @@ MODULE qs_ot_minimizer cp_dbcsr_scale,& cp_dbcsr_set,& cp_dbcsr_trace + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE kinds, ONLY: dp,& int_8 USE mathlib, ONLY: diamat_all @@ -26,7 +29,6 @@ MODULE qs_ot_minimizer USE qs_ot, ONLY: qs_ot_get_derivative,& qs_ot_get_derivative_ref USE qs_ot_types, ONLY: qs_ot_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ot_scf.F b/src/qs_ot_scf.F index 5e1d44d326..e0da0579a4 100644 --- a/src/qs_ot_scf.F +++ b/src/qs_ot_scf.F @@ -19,6 +19,8 @@ MODULE qs_ot_scf USE cp_dbcsr_operations, ONLY: copy_fm_to_dbcsr,& cp_dbcsr_m_by_n_from_row_template USE cp_fm_types, ONLY: cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_section_types, ONLY: section_vals_get,& @@ -40,7 +42,6 @@ MODULE qs_ot_scf qs_ot_settings_init,& qs_ot_type USE scf_control_types, ONLY: smear_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_ot_types.F b/src/qs_ot_types.F index b6c27b5ee7..8313bae96f 100644 --- a/src/qs_ot_types.F +++ b/src/qs_ot_types.F @@ -41,7 +41,6 @@ MODULE qs_ot_types section_vals_val_get USE kinds, ONLY: dp USE preconditioner_types, ONLY: preconditioner_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_outer_scf.F b/src/qs_outer_scf.F index ae7ccc1737..38df22d1e3 100644 --- a/src/qs_outer_scf.F +++ b/src/qs_outer_scf.F @@ -28,7 +28,6 @@ MODULE qs_outer_scf set_qs_env USE qs_scf_types, ONLY: qs_scf_env_type USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_overlap.F b/src/qs_overlap.F index 0a1b4128d3..89cb4f9e08 100644 --- a/src/qs_overlap.F +++ b/src/qs_overlap.F @@ -57,7 +57,6 @@ MODULE qs_overlap uppercase USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_p_env_methods.F b/src/qs_p_env_methods.F index 3364ac190a..2a1680825c 100644 --- a/src/qs_p_env_methods.F +++ b/src/qs_p_env_methods.F @@ -48,6 +48,9 @@ MODULE qs_p_env_methods USE cp_fm_vect, ONLY: cp_fm_vect_copy,& cp_fm_vect_dealloc USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -84,7 +87,6 @@ MODULE qs_p_env_methods qs_rho_get,& qs_rho_type USE string_utilities, ONLY: compress -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_p_env_types.F b/src/qs_p_env_types.F index 9d1074e094..1b789aa75c 100644 --- a/src/qs_p_env_types.F +++ b/src/qs_p_env_types.F @@ -25,7 +25,6 @@ MODULE qs_p_env_types local_rho_type USE qs_rho_types, ONLY: qs_rho_release,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_pdos.F b/src/qs_pdos.F index 905009ec61..d73294fcc6 100644 --- a/src/qs_pdos.F +++ b/src/qs_pdos.F @@ -33,6 +33,10 @@ MODULE qs_pdos cp_fm_release,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -74,7 +78,6 @@ MODULE qs_pdos mo_set_type USE qs_ot_eigensolver, ONLY: ot_eigensolver USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_period_efield_types.F b/src/qs_period_efield_types.F index 09b9e582d9..a33d3a2eb4 100644 --- a/src/qs_period_efield_types.F +++ b/src/qs_period_efield_types.F @@ -16,7 +16,6 @@ MODULE qs_period_efield_types USE cp_dbcsr_interface, ONLY: cp_dbcsr_deallocate_matrix_set,& cp_dbcsr_p_type USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_resp.F b/src/qs_resp.F index 842a42d2c0..a1561e4f16 100644 --- a/src/qs_resp.F +++ b/src/qs_resp.F @@ -22,6 +22,8 @@ MODULE qs_resp use_perd_none,& use_perd_xyz USE cp_control_types, ONLY: dft_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_generate_filename,& @@ -80,7 +82,6 @@ MODULE qs_resp USE qs_kind_types, ONLY: qs_kind_type USE qs_subsys_types, ONLY: qs_subsys_get,& qs_subsys_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_rho0_ggrid.F b/src/qs_rho0_ggrid.F index 5d44995653..796fc913bf 100644 --- a/src/qs_rho0_ggrid.F +++ b/src/qs_rho0_ggrid.F @@ -68,7 +68,6 @@ MODULE qs_rho0_ggrid USE termination, ONLY: stop_memory USE util, ONLY: get_limit USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_rho0_methods.F b/src/qs_rho0_methods.F index 658e74b528..05b62caab4 100644 --- a/src/qs_rho0_methods.F +++ b/src/qs_rho0_methods.F @@ -16,6 +16,8 @@ MODULE qs_rho0_methods gto_basis_set_type USE cp_control_types, ONLY: dft_control_type,& gapw_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_section_types, ONLY: section_vals_get_subs_vals,& @@ -56,7 +58,6 @@ MODULE qs_rho0_methods USE qs_rho_atom_types, ONLY: get_rho_atom,& rho_atom_coeff,& rho_atom_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_rho0_types.F b/src/qs_rho0_types.F index 512248c0f5..202e35dcd1 100644 --- a/src/qs_rho0_types.F +++ b/src/qs_rho0_types.F @@ -21,7 +21,6 @@ MODULE qs_rho0_types USE termination, ONLY: stop_memory USE whittaker, ONLY: whittaker_c0a,& whittaker_ci -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_rho_atom_methods.F b/src/qs_rho_atom_methods.F index 295948e820..c64f8f7a40 100644 --- a/src/qs_rho_atom_methods.F +++ b/src/qs_rho_atom_methods.F @@ -63,7 +63,6 @@ MODULE qs_rho_atom_methods USE util, ONLY: get_limit USE whittaker, ONLY: whittaker_c0a,& whittaker_ci -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_rho_atom_types.F b/src/qs_rho_atom_types.F index b0a94a7c7a..41e693be5f 100644 --- a/src/qs_rho_atom_types.F +++ b/src/qs_rho_atom_types.F @@ -9,7 +9,6 @@ MODULE qs_rho_atom_types USE kinds, ONLY: dp,& int_size USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_rho_methods.F b/src/qs_rho_methods.F index 1b94256f82..eb7a603f0e 100644 --- a/src/qs_rho_methods.F +++ b/src/qs_rho_methods.F @@ -20,6 +20,7 @@ MODULE qs_rho_methods cp_dbcsr_distribution, cp_dbcsr_init, cp_dbcsr_p_type, & cp_dbcsr_row_block_sizes, cp_dbcsr_set, cp_dbcsr_type, & dbcsr_type_symmetric + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: default_string_length,& dp @@ -51,7 +52,6 @@ MODULE qs_rho_methods qs_rho_set,& qs_rho_type USE task_list_types, ONLY: task_list_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_rho_types.F b/src/qs_rho_types.F index 1c4a75abba..ff0cb859da 100644 --- a/src/qs_rho_types.F +++ b/src/qs_rho_types.F @@ -25,7 +25,6 @@ MODULE qs_rho_types set_2d_pointer USE pw_types, ONLY: pw_p_type,& pw_release -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_sccs.F b/src/qs_sccs.F index 96824037b5..1d1377f1df 100644 --- a/src/qs_sccs.F +++ b/src/qs_sccs.F @@ -27,6 +27,8 @@ MODULE qs_sccs USE cp_control_types, ONLY: dft_control_type,& sccs_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -93,7 +95,6 @@ MODULE qs_sccs USE rs_methods, ONLY: derive_fdm_cd3,& derive_fdm_cd5,& derive_fdm_cd7 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf.F b/src/qs_scf.F index 525dde1c8a..824ccf0934 100644 --- a/src/qs_scf.F +++ b/src/qs_scf.F @@ -53,6 +53,9 @@ MODULE qs_scf USE cp_dbcsr_operations, ONLY: copy_dbcsr_to_fm USE cp_fm_types, ONLY: cp_fm_release,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_p_file,& @@ -132,7 +135,6 @@ MODULE qs_scf special_diag_method_nr USE qs_wf_history_methods, ONLY: wfi_update USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_block_davidson.F b/src/qs_scf_block_davidson.F index 308b17d422..9dc5970c65 100644 --- a/src/qs_scf_block_davidson.F +++ b/src/qs_scf_block_davidson.F @@ -57,7 +57,6 @@ MODULE qs_scf_block_davidson USE qs_block_davidson_types, ONLY: davidson_type USE qs_mo_types, ONLY: get_mo_set,& mo_set_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_diagonalization.F b/src/qs_scf_diagonalization.F index b82aee72c3..9a241fdf4c 100644 --- a/src/qs_scf_diagonalization.F +++ b/src/qs_scf_diagonalization.F @@ -50,6 +50,8 @@ MODULE qs_scf_diagonalization cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -109,7 +111,6 @@ MODULE qs_scf_diagonalization USE qs_scf_types, ONLY: qs_scf_env_type,& subspace_env_type USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_initialization.F b/src/qs_scf_initialization.F index f754533697..bd5e44c0cd 100644 --- a/src/qs_scf_initialization.F +++ b/src/qs_scf_initialization.F @@ -33,6 +33,9 @@ MODULE qs_scf_initialization cp_fm_to_fm,& cp_fm_to_fm_triangular,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -107,7 +110,6 @@ MODULE qs_scf_initialization USE scf_control_types, ONLY: scf_control_type USE xas_env_types, ONLY: xas_environment_type USE xas_restart, ONLY: xas_initialize_rho -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_lanczos.F b/src/qs_scf_lanczos.F index 41b515d344..7e8dffd556 100644 --- a/src/qs_scf_lanczos.F +++ b/src/qs_scf_lanczos.F @@ -27,13 +27,13 @@ MODULE qs_scf_lanczos cp_fm_set_all, cp_fm_set_submatrix, cp_fm_to_fm, cp_fm_type, & cp_fm_vectorsnorm USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE message_passing, ONLY: mp_sum USE qs_mo_types, ONLY: get_mo_set,& mo_set_p_type USE qs_scf_types, ONLY: krylov_space_type USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_loop_utils.F b/src/qs_scf_loop_utils.F index 4e3865b4c7..5ad6f50b0c 100644 --- a/src/qs_scf_loop_utils.F +++ b/src/qs_scf_loop_utils.F @@ -12,6 +12,7 @@ MODULE qs_scf_loop_utils cp_dbcsr_p_type,& cp_dbcsr_type USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE input_section_types, ONLY: section_vals_type USE kinds, ONLY: dp @@ -60,7 +61,6 @@ MODULE qs_scf_loop_utils special_diag_method_nr USE scf_control_types, ONLY: scf_control_type,& smear_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_methods.F b/src/qs_scf_methods.F index 7fd52306ad..f376741586 100644 --- a/src/qs_scf_methods.F +++ b/src/qs_scf_methods.F @@ -48,7 +48,6 @@ MODULE qs_scf_methods USE qs_mo_types, ONLY: correct_mo_eigenvalues,& get_mo_set,& mo_set_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_output.F b/src/qs_scf_output.F index 423e37e577..7dfb276938 100644 --- a/src/qs_scf_output.F +++ b/src/qs_scf_output.F @@ -8,6 +8,8 @@ MODULE qs_scf_output USE cp_control_types, ONLY: dft_control_type USE cp_dbcsr_interface, ONLY: cp_dbcsr_p_type USE cp_dbcsr_output, ONLY: cp_dbcsr_write_sparse_matrix + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -45,7 +47,6 @@ MODULE qs_scf_output USE qs_scf_types, ONLY: qs_scf_env_type,& special_diag_method_nr USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_post_dftb.F b/src/qs_scf_post_dftb.F index 3629da2a1a..29100480b4 100644 --- a/src/qs_scf_post_dftb.F +++ b/src/qs_scf_post_dftb.F @@ -29,6 +29,9 @@ MODULE qs_scf_post_dftb cp_fm_release,& cp_fm_to_fm_submat,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -59,7 +62,6 @@ MODULE qs_scf_post_dftb qs_rho_type USE qs_scf_types, ONLY: qs_scf_env_type USE qs_scf_wfn_mix, ONLY: wfn_mix -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_post_gpw.F b/src/qs_scf_post_gpw.F index 9ef420d650..445956b4a7 100644 --- a/src/qs_scf_post_gpw.F +++ b/src/qs_scf_post_gpw.F @@ -40,6 +40,10 @@ MODULE qs_scf_post_gpw cp_fm_to_fm,& cp_fm_type USE cp_fm_vect, ONLY: cp_fm_vect_dealloc + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_iter_string,& cp_p_file,& cp_print_key_finished_output,& @@ -174,7 +178,6 @@ MODULE qs_scf_post_gpw USE wannier_states_types, ONLY: wannier_centres_type USE xray_diffraction, ONLY: calculate_rhotot_elec_gspace,& xray_diffraction_spectrum -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_post_scptb.F b/src/qs_scf_post_scptb.F index 7ecc6633c9..23ab5bbaaa 100644 --- a/src/qs_scf_post_scptb.F +++ b/src/qs_scf_post_scptb.F @@ -16,6 +16,9 @@ MODULE qs_scf_post_scptb USE cp_control_types, ONLY: dft_control_type USE cp_dbcsr_interface, ONLY: cp_dbcsr_p_type USE cp_dbcsr_output, ONLY: cp_dbcsr_write_sparse_matrix + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -34,7 +37,6 @@ MODULE qs_scf_post_scptb qs_rho_type USE qs_subsys_types, ONLY: qs_subsys_get,& qs_subsys_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_post_se.F b/src/qs_scf_post_se.F index f180873793..1af8e03088 100644 --- a/src/qs_scf_post_se.F +++ b/src/qs_scf_post_se.F @@ -22,6 +22,9 @@ MODULE qs_scf_post_se USE cp_dbcsr_interface, ONLY: cp_dbcsr_get_block_p,& cp_dbcsr_p_type USE cp_dbcsr_output, ONLY: cp_dbcsr_write_sparse_matrix + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -56,7 +59,6 @@ MODULE qs_scf_post_se qs_subsys_type USE semi_empirical_types, ONLY: get_se_param,& semi_empirical_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_types.F b/src/qs_scf_types.F index 8abf735358..4715f4197d 100644 --- a/src/qs_scf_types.F +++ b/src/qs_scf_types.F @@ -38,7 +38,6 @@ MODULE qs_scf_types fb_env_release USE qs_ot_types, ONLY: qs_ot_destroy,& qs_ot_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_scf_wfn_mix.F b/src/qs_scf_wfn_mix.F index ea8f0b9a5c..67f286359e 100644 --- a/src/qs_scf_wfn_mix.F +++ b/src/qs_scf_wfn_mix.F @@ -35,7 +35,6 @@ MODULE qs_scf_wfn_mix mo_set_p_type USE qs_scf_types, ONLY: qs_scf_env_type,& special_diag_method_nr -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_spin_orbit.F b/src/qs_spin_orbit.F index 632304a2fd..27138c0dee 100644 --- a/src/qs_spin_orbit.F +++ b/src/qs_spin_orbit.F @@ -18,6 +18,8 @@ MODULE qs_spin_orbit USE cp_dbcsr_interface, ONLY: cp_dbcsr_get_block_p,& cp_dbcsr_p_type USE cp_dbcsr_output, ONLY: cp_dbcsr_write_sparse_matrix + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -42,7 +44,6 @@ MODULE qs_spin_orbit neighbor_list_iterator_release,& neighbor_list_set_p_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_subsys_methods.F b/src/qs_subsys_methods.F index dd3a76d505..2f62810d76 100644 --- a/src/qs_subsys_methods.F +++ b/src/qs_subsys_methods.F @@ -39,7 +39,6 @@ MODULE qs_subsys_methods qs_kind_type USE qs_subsys_types, ONLY: qs_subsys_set,& qs_subsys_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_subsys_types.F b/src/qs_subsys_types.F index 27b5b26bce..c37994ceb9 100644 --- a/src/qs_subsys_types.F +++ b/src/qs_subsys_types.F @@ -38,7 +38,6 @@ MODULE qs_subsys_types USE qs_kind_types, ONLY: deallocate_qs_kind_set,& qs_kind_type USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_tddfpt_eigensolver.F b/src/qs_tddfpt_eigensolver.F index a23786326a..68b4f6f630 100644 --- a/src/qs_tddfpt_eigensolver.F +++ b/src/qs_tddfpt_eigensolver.F @@ -30,6 +30,8 @@ MODULE qs_tddfpt_eigensolver cp_fm_set_all,& cp_fm_set_element,& cp_fm_to_fm + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit,& + cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE input_constants, ONLY: tddfpt_davidson,& tddfpt_lanczos @@ -48,7 +50,6 @@ MODULE qs_tddfpt_eigensolver USE qs_tddfpt_utils, ONLY: co_initial_guess,& normalize,& reorthogonalize -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_tddfpt_module.F b/src/qs_tddfpt_module.F index 0e28469d48..022d6aabad 100644 --- a/src/qs_tddfpt_module.F +++ b/src/qs_tddfpt_module.F @@ -12,6 +12,9 @@ MODULE qs_tddfpt_module USE bibliography, ONLY: Iannuzzi2005,& cite_reference USE cp_dbcsr_interface, ONLY: cp_dbcsr_p_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE header, ONLY: tddfpt_header @@ -44,7 +47,6 @@ MODULE qs_tddfpt_module tddfpt_cleanup,& tddfpt_init USE xc_pot_saop, ONLY: add_saop_pot -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_tddfpt_types.F b/src/qs_tddfpt_types.F index 611333eb86..91b51fa3a1 100644 --- a/src/qs_tddfpt_types.F +++ b/src/qs_tddfpt_types.F @@ -25,7 +25,6 @@ MODULE qs_tddfpt_types USE qs_matrix_pools, ONLY: mpools_get USE qs_p_env_types, ONLY: qs_p_env_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_tddfpt_utils.F b/src/qs_tddfpt_utils.F index edf673cff9..c66c99b492 100644 --- a/src/qs_tddfpt_utils.F +++ b/src/qs_tddfpt_utils.F @@ -26,6 +26,7 @@ MODULE qs_tddfpt_utils cp_fm_set_all,& cp_fm_set_submatrix,& cp_fm_to_fm + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE kinds, ONLY: dp USE physcon, ONLY: evolt USE qs_environment_types, ONLY: get_qs_env,& @@ -38,7 +39,6 @@ MODULE qs_tddfpt_utils USE qs_tddfpt_types, ONLY: tddfpt_env_allocate,& tddfpt_env_deallocate,& tddfpt_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_vxc.F b/src/qs_vxc.F index c5644059e2..01f22b48e3 100644 --- a/src/qs_vxc.F +++ b/src/qs_vxc.F @@ -53,7 +53,6 @@ MODULE qs_vxc USE virial_types, ONLY: virial_type USE xc, ONLY: xc_exc_calc,& xc_vxc_pw_create1 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_vxc_atom.F b/src/qs_vxc_atom.F index 2459222980..42f854fe5a 100644 --- a/src/qs_vxc_atom.F +++ b/src/qs_vxc_atom.F @@ -54,7 +54,6 @@ MODULE qs_vxc_atom USE xc_rho_set_types, ONLY: xc_rho_set_create,& xc_rho_set_release,& xc_rho_set_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_wf_history_methods.F b/src/qs_wf_history_methods.F index bedd066540..5a71748a14 100644 --- a/src/qs_wf_history_methods.F +++ b/src/qs_wf_history_methods.F @@ -44,6 +44,9 @@ MODULE qs_wf_history_methods cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr,& low_print_level @@ -87,7 +90,6 @@ MODULE qs_wf_history_methods qs_wf_snapshot_type,& wfi_get_snapshot USE scf_control_types, ONLY: scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/qs_wf_history_types.F b/src/qs_wf_history_types.F index 72863fc63f..7000a47e32 100644 --- a/src/qs_wf_history_types.F +++ b/src/qs_wf_history_types.F @@ -22,7 +22,6 @@ MODULE qs_wf_history_types USE pw_types, ONLY: pw_p_type USE qs_rho_types, ONLY: qs_rho_release,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/rel_control_types.F b/src/rel_control_types.F index b44146fc81..eedc622a53 100644 --- a/src/rel_control_types.F +++ b/src/rel_control_types.F @@ -20,7 +20,6 @@ MODULE rel_control_types USE input_section_types, ONLY: section_vals_get_subs_vals,& section_vals_type,& section_vals_val_get -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/replica_methods.F b/src/replica_methods.F index 0b7e721161..2d7d1da1ea 100644 --- a/src/replica_methods.F +++ b/src/replica_methods.F @@ -15,6 +15,10 @@ MODULE replica_methods USE cp_control_types, ONLY: dft_control_type USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_add_iter_level USE cp_para_env, ONLY: cp_cart_create,& cp_para_env_create @@ -57,7 +61,6 @@ MODULE replica_methods rep_envs_add_rep_env,& rep_envs_get_rep_env,& replica_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/replica_types.F b/src/replica_types.F index 8170b8d14c..1d31f72307 100644 --- a/src/replica_types.F +++ b/src/replica_types.F @@ -17,6 +17,9 @@ !> \author fawzi ! ***************************************************************************** MODULE replica_types + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_rm_iter_level USE cp_para_env, ONLY: cp_cart_release,& cp_para_env_release @@ -34,7 +37,6 @@ MODULE replica_types USE message_passing, ONLY: mp_sum USE qs_wf_history_types, ONLY: qs_wf_history_p_type,& wfi_release -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/restraint.F b/src/restraint.F index 7ac0db6ad3..87c6041e3f 100644 --- a/src/restraint.F +++ b/src/restraint.F @@ -47,7 +47,6 @@ MODULE restraint USE particle_list_types, ONLY: particle_list_type USE particle_types, ONLY: particle_type,& update_particle_set -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/rmsd.F b/src/rmsd.F index f182f637e4..8f77b2e5a4 100644 --- a/src/rmsd.F +++ b/src/rmsd.F @@ -13,7 +13,6 @@ MODULE rmsd USE mathlib, ONLY: diamat_all,& matvec_3x3 USE particle_types, ONLY: particle_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/rpa_communication.F b/src/rpa_communication.F index 61274dd9b8..77a14c4693 100644 --- a/src/rpa_communication.F +++ b/src/rpa_communication.F @@ -23,7 +23,6 @@ MODULE rpa_communication mp_wait,& mp_waitall USE mp2_types, ONLY: integ_mat_buffer_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/rpa_ri_gpw.F b/src/rpa_ri_gpw.F index 29974a9d0f..cec32a01ba 100644 --- a/src/rpa_ri_gpw.F +++ b/src/rpa_ri_gpw.F @@ -56,7 +56,6 @@ MODULE rpa_ri_gpw initialize_buffer,& release_buffer USE util, ONLY: get_limit -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/rs_pw_interface.F b/src/rs_pw_interface.F index 7d6dc1ec07..68dd0d04e8 100644 --- a/src/rs_pw_interface.F +++ b/src/rs_pw_interface.F @@ -10,6 +10,7 @@ !> \author JGH (04.2014) ! ***************************************************************************** MODULE rs_pw_interface + USE cp_log_handling, ONLY: cp_to_string USE cp_spline_utils, ONLY: pw_prolongate_s3,& pw_restrict_s3 USE gaussian_gridlevels, ONLY: gridlevel_info_type @@ -37,7 +38,6 @@ MODULE rs_pw_interface rs2pw,& rs_grid_release,& rs_pw_transfer -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/rt_propagation_forces.F b/src/rt_propagation_forces.F index 8734d03292..e59226688a 100644 --- a/src/rt_propagation_forces.F +++ b/src/rt_propagation_forces.F @@ -47,7 +47,6 @@ MODULE rt_propagation_forces USE qs_overlap, ONLY: build_overlap_force USE rt_propagation_types, ONLY: get_rtp,& rt_prop_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/rt_propagation_types.F b/src/rt_propagation_types.F index 56d0b18703..9fd4758a32 100644 --- a/src/rt_propagation_types.F +++ b/src/rt_propagation_types.F @@ -40,12 +40,12 @@ MODULE rt_propagation_types cp_fm_p_type,& cp_fm_release USE cp_fm_vect, ONLY: cp_fm_vect_dealloc + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE qs_matrix_pools, ONLY: mpools_get,& qs_matrix_pools_type USE qs_mo_types, ONLY: get_mo_set,& mo_set_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/rtp_admm_methods.F b/src/rtp_admm_methods.F index bc81b34936..72a8f50087 100644 --- a/src/rtp_admm_methods.F +++ b/src/rtp_admm_methods.F @@ -56,7 +56,6 @@ MODULE rtp_admm_methods qs_rho_type USE rt_propagation_types, ONLY: get_rtp,& rt_prop_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/s_square_methods.F b/src/s_square_methods.F index 287c41c234..4ef9d6701e 100644 --- a/src/s_square_methods.F +++ b/src/s_square_methods.F @@ -31,7 +31,6 @@ MODULE s_square_methods USE message_passing, ONLY: mp_sum USE qs_mo_types, ONLY: get_mo_set,& mo_set_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/sap_kind_types.F b/src/sap_kind_types.F index d24f9f2af6..2dedd7b479 100644 --- a/src/sap_kind_types.F +++ b/src/sap_kind_types.F @@ -12,7 +12,6 @@ MODULE sap_kind_types USE kinds, ONLY: dp USE util, ONLY: locate,& sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/scf_control_types.F b/src/scf_control_types.F index ad572cdc32..6a1bddc728 100644 --- a/src/scf_control_types.F +++ b/src/scf_control_types.F @@ -14,6 +14,8 @@ ! ***************************************************************************** MODULE scf_control_types + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_units, ONLY: cp_unit_from_cp2k @@ -41,7 +43,6 @@ MODULE scf_control_types USE qs_ot_types, ONLY: ot_readwrite_input,& qs_ot_settings_init,& qs_ot_settings_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/scptb_core_interactions.F b/src/scptb_core_interactions.F index 9a64f15d50..bbc937305a 100644 --- a/src/scptb_core_interactions.F +++ b/src/scptb_core_interactions.F @@ -37,7 +37,6 @@ MODULE scptb_core_interactions scptb_parameter_type USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/scptb_core_matrix.F b/src/scptb_core_matrix.F index 27c98eaca1..7d7fbb1a5d 100644 --- a/src/scptb_core_matrix.F +++ b/src/scptb_core_matrix.F @@ -22,6 +22,8 @@ MODULE scptb_core_matrix cp_dbcsr_get_block_p,& cp_dbcsr_init,& cp_dbcsr_p_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_should_output USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: dp @@ -51,7 +53,6 @@ MODULE scptb_core_matrix scptb_parameter_type USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/scptb_ks_matrix.F b/src/scptb_ks_matrix.F index fedb7f64a9..428a1b1643 100644 --- a/src/scptb_ks_matrix.F +++ b/src/scptb_ks_matrix.F @@ -23,6 +23,8 @@ MODULE scptb_ks_matrix cp_dbcsr_iterator_blocks_left, cp_dbcsr_iterator_next_block, & cp_dbcsr_iterator_start, cp_dbcsr_iterator_stop, cp_dbcsr_multiply, & cp_dbcsr_p_type, cp_dbcsr_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -94,7 +96,6 @@ MODULE scptb_ks_matrix scptb_parameter_type USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/scptb_parameters.F b/src/scptb_parameters.F index e4f138942c..f96b3c3751 100644 --- a/src/scptb_parameters.F +++ b/src/scptb_parameters.F @@ -24,7 +24,6 @@ MODULE scptb_parameters USE kinds, ONLY: dp USE periodic_table, ONLY: ptable USE scptb_types, ONLY: scptb_parameter_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/scptb_types.F b/src/scptb_types.F index e749a7b9df..b36fb64274 100644 --- a/src/scptb_types.F +++ b/src/scptb_types.F @@ -9,6 +9,8 @@ ! ***************************************************************************** MODULE scptb_types + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -18,7 +20,6 @@ MODULE scptb_types USE kinds, ONLY: default_string_length,& dp USE message_passing, ONLY: mp_sum -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/scptb_utils.F b/src/scptb_utils.F index d0fab3300e..5ac005e42e 100644 --- a/src/scptb_utils.F +++ b/src/scptb_utils.F @@ -19,6 +19,8 @@ MODULE scptb_utils set_sto_basis_set,& sto_basis_set_type USE cp_control_types, ONLY: scptb_control_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -41,7 +43,6 @@ MODULE scptb_utils xml_get,& xml_ok,& xml_open -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/se_core_core.F b/src/se_core_core.F index 03b5afa1df..e08f7394be 100644 --- a/src/se_core_core.F +++ b/src/se_core_core.F @@ -59,7 +59,6 @@ MODULE se_core_core initialize_se_taper USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/se_core_matrix.F b/src/se_core_matrix.F index 1e2bc875df..1d9e017895 100644 --- a/src/se_core_matrix.F +++ b/src/se_core_matrix.F @@ -20,6 +20,8 @@ MODULE se_core_matrix cp_dbcsr_p_type, cp_dbcsr_replicate_all, cp_dbcsr_set, & cp_dbcsr_sum_replicated, cp_dbcsr_type USE cp_dbcsr_output, ONLY: cp_dbcsr_write_sparse_matrix + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -60,7 +62,6 @@ MODULE se_core_matrix USE semi_empirical_utils, ONLY: get_se_type USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/se_fock_matrix.F b/src/se_fock_matrix.F index 611d80e39a..675fa98364 100644 --- a/src/se_fock_matrix.F +++ b/src/se_fock_matrix.F @@ -25,6 +25,8 @@ MODULE se_fock_matrix cp_dbcsr_p_type,& cp_dbcsr_trace,& cp_dbcsr_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -56,7 +58,6 @@ MODULE se_fock_matrix USE semi_empirical_store_int_types, ONLY: semi_empirical_si_finalize,& semi_empirical_si_initialize,& semi_empirical_si_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/se_fock_matrix_coulomb.F b/src/se_fock_matrix_coulomb.F index 16bf046ccb..278276e184 100644 --- a/src/se_fock_matrix_coulomb.F +++ b/src/se_fock_matrix_coulomb.F @@ -27,6 +27,8 @@ MODULE se_fock_matrix_coulomb cp_dbcsr_get_block_diag, cp_dbcsr_get_block_p, cp_dbcsr_init, & cp_dbcsr_p_type, cp_dbcsr_replicate_all, cp_dbcsr_set, & cp_dbcsr_sum_replicated + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -87,7 +89,6 @@ MODULE se_fock_matrix_coulomb initialize_se_taper USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/se_fock_matrix_dbg.F b/src/se_fock_matrix_dbg.F index fc6ebfe85c..c5f18ecee7 100644 --- a/src/se_fock_matrix_dbg.F +++ b/src/se_fock_matrix_dbg.F @@ -13,7 +13,6 @@ MODULE se_fock_matrix_dbg USE qs_environment_types, ONLY: qs_environment_type USE se_fock_matrix_coulomb, ONLY: build_fock_matrix_coulomb_lr USE semi_empirical_store_int_types, ONLY: semi_empirical_si_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/se_fock_matrix_exchange.F b/src/se_fock_matrix_exchange.F index bb4c529019..6fbcebbe09 100644 --- a/src/se_fock_matrix_exchange.F +++ b/src/se_fock_matrix_exchange.F @@ -51,7 +51,6 @@ MODULE se_fock_matrix_exchange initialize_se_taper USE virial_methods, ONLY: virial_pair_force USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/se_fock_matrix_integrals.F b/src/se_fock_matrix_integrals.F index 36247c3f13..b39a050cfc 100644 --- a/src/se_fock_matrix_integrals.F +++ b/src/se_fock_matrix_integrals.F @@ -25,7 +25,6 @@ MODULE se_fock_matrix_integrals USE semi_empirical_types, ONLY: se_int_control_type,& se_taper_type,& semi_empirical_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_expns3_methods.F b/src/semi_empirical_expns3_methods.F index 0938520f75..a439c9cb93 100644 --- a/src/semi_empirical_expns3_methods.F +++ b/src/semi_empirical_expns3_methods.F @@ -20,7 +20,6 @@ MODULE semi_empirical_expns3_methods l_index USE semi_empirical_types, ONLY: semi_empirical_type USE semi_empirical_utils, ONLY: get_se_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_expns3_types.F b/src/semi_empirical_expns3_types.F index 45dda35fd7..fb0ac2c117 100644 --- a/src/semi_empirical_expns3_types.F +++ b/src/semi_empirical_expns3_types.F @@ -10,7 +10,6 @@ MODULE semi_empirical_expns3_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_int3_utils.F b/src/semi_empirical_int3_utils.F index ff174c20e7..aa42cfed00 100644 --- a/src/semi_empirical_int3_utils.F +++ b/src/semi_empirical_int3_utils.F @@ -16,7 +16,6 @@ MODULE semi_empirical_int3_utils USE semi_empirical_int_arrays, ONLY: clm_d,& indexb USE semi_empirical_types, ONLY: semi_empirical_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_int_ana.F b/src/semi_empirical_int_ana.F index cb9c990d91..61e0e886ae 100644 --- a/src/semi_empirical_int_ana.F +++ b/src/semi_empirical_int_ana.F @@ -49,7 +49,6 @@ MODULE semi_empirical_int_ana setup_se_int_control_type USE taper_types, ONLY: dtaper_eval,& taper_eval -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_int_arrays.F b/src/semi_empirical_int_arrays.F index 4fb2dccd31..af16b1d8c8 100644 --- a/src/semi_empirical_int_arrays.F +++ b/src/semi_empirical_int_arrays.F @@ -16,7 +16,6 @@ MODULE semi_empirical_int_arrays USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_int_debug.F b/src/semi_empirical_int_debug.F index 630bb0c658..cbc75e0c96 100644 --- a/src/semi_empirical_int_debug.F +++ b/src/semi_empirical_int_debug.F @@ -23,7 +23,6 @@ SUBROUTINE check_rotmat_der( sepi, sepj, rjiv, ij_matrix, do_invert) rotmat_type,& semi_empirical_type,& se_int_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj @@ -160,7 +159,6 @@ SUBROUTINE rot_2el_2c_first_debug(sepi, sepj, rijv, se_int_control, se_taper, in se_int_control_type,& se_taper_type USE semi_empirical_int_utils, ONLY: rot_2el_2c_first -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj @@ -256,7 +254,6 @@ SUBROUTINE check_dssss_nucint_ana (sepi,sepj,r,dssss,itype,se_int_control,se_tap USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj @@ -309,7 +306,6 @@ SUBROUTINE check_dcore_nucint_ana (sepi,sepj,r,dcore,itype,se_int_control,se_tap USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj @@ -411,7 +407,6 @@ SUBROUTINE check_drotnuc_ana(sepi, sepj, rijv, itype, se_int_control, se_taper, USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj @@ -517,7 +512,6 @@ SUBROUTINE check_dcorecore_ana(sepi, sepj, rijv, itype,se_int_control, se_taper, USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj @@ -581,7 +575,6 @@ SUBROUTINE check_dterep_ana (sepi,sepj,r,ri,dri,se_int_control,se_taper,lgrad) USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj @@ -653,7 +646,6 @@ SUBROUTINE check_rotint_ana(sepi,sepj,rijv,w,dw,se_int_control,se_taper) USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj diff --git a/src/semi_empirical_int_debug.h b/src/semi_empirical_int_debug.h index 96616f124a..135b7b3185 100644 --- a/src/semi_empirical_int_debug.h +++ b/src/semi_empirical_int_debug.h @@ -14,7 +14,6 @@ INTERFACE USE kinds, ONLY: dp USE semi_empirical_types, ONLY: rotmat_type,& semi_empirical_type -#include "./common/cp_common_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj REAL(KIND=dp), DIMENSION(3), INTENT(IN) :: rjiv @@ -38,7 +37,6 @@ INTERFACE USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj REAL(dp), INTENT(IN) :: r @@ -64,7 +62,6 @@ INTERFACE USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj REAL(dp), INTENT(IN) :: r @@ -90,7 +87,6 @@ INTERFACE USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj REAL(dp), DIMENSION(3), INTENT(IN) :: rijv @@ -119,7 +115,6 @@ INTERFACE USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj REAL(dp), DIMENSION(3), INTENT(IN) :: rijv @@ -148,7 +143,6 @@ INTERFACE USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj REAL(KIND=dp), DIMENSION(3), INTENT(IN) :: rijv @@ -175,7 +169,6 @@ INTERFACE USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj REAL(dp), INTENT(IN) :: r @@ -200,7 +193,6 @@ INTERFACE USE semi_empirical_types, ONLY: semi_empirical_type,& se_int_control_type,& se_taper_type -#include "./common/cp_common_uses.f90" IMPLICIT NONE TYPE(semi_empirical_type), POINTER :: sepi, sepj REAL(dp), DIMENSION(3), INTENT(IN) :: rijv diff --git a/src/semi_empirical_int_gks.F b/src/semi_empirical_int_gks.F index 4a60fd92a6..0d2f9387aa 100644 --- a/src/semi_empirical_int_gks.F +++ b/src/semi_empirical_int_gks.F @@ -33,7 +33,6 @@ MODULE semi_empirical_int_gks USE semi_empirical_types, ONLY: se_int_control_type,& semi_empirical_type,& setup_se_int_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_int_num.F b/src/semi_empirical_int_num.F index 56005edf72..11581a739c 100644 --- a/src/semi_empirical_int_num.F +++ b/src/semi_empirical_int_num.F @@ -43,7 +43,6 @@ MODULE semi_empirical_int_num semi_empirical_type,& setup_se_int_control_type USE taper_types, ONLY: taper_eval -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_int_utils.F b/src/semi_empirical_int_utils.F index 9dea4142a5..923d58ab08 100644 --- a/src/semi_empirical_int_utils.F +++ b/src/semi_empirical_int_utils.F @@ -24,7 +24,6 @@ MODULE semi_empirical_int_utils se_int_screen_type,& se_taper_type,& semi_empirical_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_integrals.F b/src/semi_empirical_integrals.F index 9b4df790a8..e8ce767eb3 100644 --- a/src/semi_empirical_integrals.F +++ b/src/semi_empirical_integrals.F @@ -41,7 +41,6 @@ MODULE semi_empirical_integrals USE semi_empirical_types, ONLY: se_int_control_type,& se_taper_type,& semi_empirical_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_mpole_methods.F b/src/semi_empirical_mpole_methods.F index 778930075c..67ed79cddf 100644 --- a/src/semi_empirical_mpole_methods.F +++ b/src/semi_empirical_mpole_methods.F @@ -23,7 +23,6 @@ MODULE semi_empirical_mpole_methods semi_empirical_mpole_type USE semi_empirical_par_utils, ONLY: amn_l USE semi_empirical_types, ONLY: semi_empirical_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_mpole_types.F b/src/semi_empirical_mpole_types.F index fe5656d237..46d2a91ff5 100644 --- a/src/semi_empirical_mpole_types.F +++ b/src/semi_empirical_mpole_types.F @@ -10,7 +10,6 @@ MODULE semi_empirical_mpole_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_par_utils.F b/src/semi_empirical_par_utils.F index 482104433b..f30adb980f 100644 --- a/src/semi_empirical_par_utils.F +++ b/src/semi_empirical_par_utils.F @@ -23,7 +23,6 @@ MODULE semi_empirical_par_utils int_onec2el USE semi_empirical_types, ONLY: get_se_param,& semi_empirical_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_parameters.F b/src/semi_empirical_parameters.F index a52882ab86..31f5060935 100644 --- a/src/semi_empirical_parameters.F +++ b/src/semi_empirical_parameters.F @@ -55,7 +55,6 @@ MODULE semi_empirical_parameters convert_param_to_cp2k,& valence_electrons USE semi_empirical_types, ONLY: semi_empirical_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_store_int_types.F b/src/semi_empirical_store_int_types.F index f48046faab..c21973f8a3 100644 --- a/src/semi_empirical_store_int_types.F +++ b/src/semi_empirical_store_int_types.F @@ -24,7 +24,6 @@ MODULE semi_empirical_store_int_types section_vals_val_get USE kinds, ONLY: dp USE memory_utilities, ONLY: reallocate -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_types.F b/src/semi_empirical_types.F index 31ac078dd1..9e9394ce06 100644 --- a/src/semi_empirical_types.F +++ b/src/semi_empirical_types.F @@ -10,6 +10,9 @@ MODULE semi_empirical_types USE basis_set_types, ONLY: deallocate_sto_basis_set,& sto_basis_set_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -37,7 +40,6 @@ MODULE semi_empirical_types USE taper_types, ONLY: taper_create,& taper_release,& taper_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/semi_empirical_utils.F b/src/semi_empirical_utils.F index d5311fc7b2..cf5c3612e0 100644 --- a/src/semi_empirical_utils.F +++ b/src/semi_empirical_utils.F @@ -35,7 +35,6 @@ MODULE semi_empirical_utils rm1_default_parameter USE semi_empirical_types, ONLY: se_taper_type,& semi_empirical_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/simpar_types.F b/src/simpar_types.F index 39bb4c89b2..8886aa218f 100644 --- a/src/simpar_types.F +++ b/src/simpar_types.F @@ -12,7 +12,6 @@ MODULE simpar_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/splines_methods.F b/src/splines_methods.F index 3fa7ac9725..c454e006a9 100644 --- a/src/splines_methods.F +++ b/src/splines_methods.F @@ -12,13 +12,14 @@ MODULE splines_methods + USE cp_log_handling, ONLY: cp_logger_get_default_unit_nr,& + cp_logger_type USE kinds, ONLY: dp,& dp_size USE splines_types, ONLY: spline_data_p_type,& spline_data_type,& spline_factor_type USE termination, ONLY: stop_memory -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/splines_types.F b/src/splines_types.F index 1cc996fc29..47c265a504 100644 --- a/src/splines_types.F +++ b/src/splines_types.F @@ -13,7 +13,6 @@ MODULE splines_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/spme.F b/src/spme.F index 2499b2b54f..9c7e598045 100644 --- a/src/spme.F +++ b/src/spme.F @@ -53,7 +53,6 @@ MODULE spme realspace_grid_type, rs2pw, rs_grid_create, rs_grid_release, & rs_grid_set_box, rs_grid_zero, rs_pw_transfer USE shell_potential_types, ONLY: shell_kind_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/start/cp2k.F b/src/start/cp2k.F index cd78791950..8ae416e061 100644 --- a/src/start/cp2k.F +++ b/src/start/cp2k.F @@ -60,7 +60,6 @@ PROGRAM cp2k m_getarg,& m_iargc USE message_passing, ONLY: mp_max -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/start/cp2k_runs.F b/src/start/cp2k_runs.F index 3c60c07d97..daa547c04c 100644 --- a/src/start/cp2k_runs.F +++ b/src/start/cp2k_runs.F @@ -25,6 +25,9 @@ MODULE cp2k_runs USE cp_files, ONLY: close_file,& open_file USE cp_log_handling, ONLY: cp_failure_level,& + cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& cp_logger_would_log,& cp_note_level USE cp_output_handling, ONLY: cp_add_iter_level,& @@ -131,7 +134,6 @@ MODULE cp2k_runs USE tmc_setup, ONLY: do_analyze_files,& do_tmc USE vibrational_analysis, ONLY: vb_anal -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/start/cp2k_shell.F b/src/start/cp2k_shell.F index 0ed8aea76d..33ef9f93ca 100644 --- a/src/start/cp2k_shell.F +++ b/src/start/cp2k_shell.F @@ -37,6 +37,8 @@ PROGRAM cp2k_shell USE cp_files, ONLY: close_file,& get_unit_number,& open_file + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_para_types, ONLY: cp_para_env_type USE f77_interface, ONLY: & calc_energy_force, calc_force, create_force_env, destroy_force_env, & @@ -57,7 +59,6 @@ PROGRAM cp2k_shell evolt USE string_utilities, ONLY: compress,& uppercase -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/start/input_cp2k.F b/src/start/input_cp2k.F index 53f348448d..b40949c822 100644 --- a/src/start/input_cp2k.F +++ b/src/start/input_cp2k.F @@ -54,7 +54,6 @@ MODULE input_cp2k USE string_utilities, ONLY: newline,& s2a USE swarm_input, ONLY: create_swarm_section -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/start/input_cp2k_motion.F b/src/start/input_cp2k_motion.F index 50e99af741..83e997cd83 100644 --- a/src/start/input_cp2k_motion.F +++ b/src/start/input_cp2k_motion.F @@ -49,7 +49,6 @@ MODULE input_cp2k_motion real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/statistical_methods.F b/src/statistical_methods.F index e2cf040dd9..301b9625b1 100644 --- a/src/statistical_methods.F +++ b/src/statistical_methods.F @@ -12,12 +12,12 @@ !> module made publicly available ! ***************************************************************************** MODULE statistical_methods + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit USE erf_fn, ONLY: erf USE global_types, ONLY: global_environment_type USE kinds, ONLY: dp USE parallel_rng_types, ONLY: next_random_number USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/stm_images.F b/src/stm_images.F index 493de14875..3d7b4bf841 100644 --- a/src/stm_images.F +++ b/src/stm_images.F @@ -28,6 +28,9 @@ MODULE stm_images cp_fm_release,& cp_fm_to_fm,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_realspace_grid_cube, ONLY: cp_pw_to_cube @@ -57,7 +60,6 @@ MODULE stm_images mo_set_p_type USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/subcell_types.F b/src/subcell_types.F index cfa98fe93b..b435b3745f 100644 --- a/src/subcell_types.F +++ b/src/subcell_types.F @@ -16,7 +16,6 @@ MODULE subcell_types scaled_to_real USE kinds, ONLY: dp USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/atomic_kind_list_types.F b/src/subsys/atomic_kind_list_types.F index fe7114dd11..c1f7d76e94 100644 --- a/src/subsys/atomic_kind_list_types.F +++ b/src/subsys/atomic_kind_list_types.F @@ -35,7 +35,6 @@ MODULE atomic_kind_list_types USE atomic_kind_types, ONLY: atomic_kind_type,& deallocate_atomic_kind_set -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/atomic_kind_types.F b/src/subsys/atomic_kind_types.F index aacb5a6950..9696b9dedd 100644 --- a/src/subsys/atomic_kind_types.F +++ b/src/subsys/atomic_kind_types.F @@ -30,7 +30,6 @@ MODULE atomic_kind_types USE shell_potential_types, ONLY: shell_kind_type,& shell_release,& shell_retain -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/atprop_types.F b/src/subsys/atprop_types.F index 14754d6d0a..86c97a9120 100644 --- a/src/subsys/atprop_types.F +++ b/src/subsys/atprop_types.F @@ -12,7 +12,6 @@ MODULE atprop_types USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/cell_types.F b/src/subsys/cell_types.F index 69c8b818a4..4486c8009e 100644 --- a/src/subsys/cell_types.F +++ b/src/subsys/cell_types.F @@ -19,7 +19,6 @@ MODULE cell_types USE mathlib, ONLY: angle,& det_3x3,& inv_3x3 -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/colvar_types.F b/src/subsys/colvar_types.F index a292cf153a..b796c23143 100644 --- a/src/subsys/colvar_types.F +++ b/src/subsys/colvar_types.F @@ -17,7 +17,6 @@ MODULE colvar_types default_string_length,& dp USE particle_types, ONLY: particle_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/cp_subsys_types.F b/src/subsys/cp_subsys_types.F index d66ed0d456..bad6e248ca 100644 --- a/src/subsys/cp_subsys_types.F +++ b/src/subsys/cp_subsys_types.F @@ -54,7 +54,6 @@ MODULE cp_subsys_types USE particle_types, ONLY: particle_type USE virial_types, ONLY: virial_release,& virial_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/damping_dipole_types.F b/src/subsys/damping_dipole_types.F index c940b2d0e6..5813461e51 100644 --- a/src/subsys/damping_dipole_types.F +++ b/src/subsys/damping_dipole_types.F @@ -10,7 +10,6 @@ MODULE damping_dipole_types USE kinds, ONLY: default_string_length,& dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/external_potential_types.F b/src/subsys/external_potential_types.F index 22f5271e51..4af79f24a3 100644 --- a/src/subsys/external_potential_types.F +++ b/src/subsys/external_potential_types.F @@ -52,7 +52,6 @@ MODULE external_potential_types USE periodic_table, ONLY: ptable USE string_utilities, ONLY: remove_word,& uppercase -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/force_field_kind_types.F b/src/subsys/force_field_kind_types.F index 35cc5535a8..f5187b17f5 100644 --- a/src/subsys/force_field_kind_types.F +++ b/src/subsys/force_field_kind_types.F @@ -12,7 +12,6 @@ MODULE force_field_kind_types USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/mol_kind_new_list_types.F b/src/subsys/mol_kind_new_list_types.F index 637eb849bf..69cfaf58da 100644 --- a/src/subsys/mol_kind_new_list_types.F +++ b/src/subsys/mol_kind_new_list_types.F @@ -35,7 +35,6 @@ MODULE mol_kind_new_list_types USE molecule_kind_types, ONLY: deallocate_molecule_kind_set,& molecule_kind_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/mol_new_list_types.F b/src/subsys/mol_new_list_types.F index b5749da6e6..8423e65172 100644 --- a/src/subsys/mol_new_list_types.F +++ b/src/subsys/mol_new_list_types.F @@ -35,7 +35,6 @@ MODULE mol_new_list_types USE molecule_types_new, ONLY: deallocate_molecule_set,& molecule_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/molecule_kind_types.F b/src/subsys/molecule_kind_types.F index cbb96ee444..b5bab0a8c9 100644 --- a/src/subsys/molecule_kind_types.F +++ b/src/subsys/molecule_kind_types.F @@ -28,6 +28,8 @@ MODULE molecule_kind_types plane_plane_angle_colvar_id, population_colvar_id, qparm_colvar_id, & reaction_path_colvar_id, rotation_colvar_id, torsion_colvar_id, & xyz_diag_colvar_id, xyz_outerdiag_colvar_id + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE force_field_kind_types, ONLY: & @@ -38,7 +40,6 @@ MODULE molecule_kind_types USE kinds, ONLY: default_string_length,& dp USE shell_potential_types, ONLY: shell_kind_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/molecule_types_new.F b/src/subsys/molecule_types_new.F index 9a91c0d595..00156e360d 100644 --- a/src/subsys/molecule_types_new.F +++ b/src/subsys/molecule_types_new.F @@ -26,7 +26,6 @@ MODULE molecule_types_new molecule_kind_type,& vsite_constraint_type USE termination, ONLY: stop_memory -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/multipole_types.F b/src/subsys/multipole_types.F index afb8c2216d..8e5af40350 100644 --- a/src/subsys/multipole_types.F +++ b/src/subsys/multipole_types.F @@ -17,7 +17,6 @@ MODULE multipole_types section_vals_val_get USE kinds, ONLY: dp USE particle_types, ONLY: particle_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/particle_list_types.F b/src/subsys/particle_list_types.F index d06123e7fc..faa451aea7 100644 --- a/src/subsys/particle_list_types.F +++ b/src/subsys/particle_list_types.F @@ -35,7 +35,6 @@ MODULE particle_list_types USE particle_types, ONLY: deallocate_particle_set,& particle_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/particle_types.F b/src/subsys/particle_types.F index c9923eff2a..cbfd4a3e0d 100644 --- a/src/subsys/particle_types.F +++ b/src/subsys/particle_types.F @@ -18,7 +18,6 @@ MODULE particle_types USE atomic_kind_types, ONLY: atomic_kind_type USE kinds, ONLY: dp USE message_passing, ONLY: mp_sum -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/shell_potential_types.F b/src/subsys/shell_potential_types.F index aa9e951ec6..98b01dd909 100644 --- a/src/subsys/shell_potential_types.F +++ b/src/subsys/shell_potential_types.F @@ -11,7 +11,6 @@ MODULE shell_potential_types USE kinds, ONLY: default_string_length,& dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/subsys/virial_types.F b/src/subsys/virial_types.F index 0a20bd947d..c040522cf3 100644 --- a/src/subsys/virial_types.F +++ b/src/subsys/virial_types.F @@ -11,7 +11,6 @@ MODULE virial_types USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/surface_dipole.F b/src/surface_dipole.F index 203f5fc48f..d30d78e256 100644 --- a/src/surface_dipole.F +++ b/src/surface_dipole.F @@ -32,7 +32,6 @@ MODULE surface_dipole USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type USE qs_subsys_types, ONLY: qs_subsys_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/glbopt_history.F b/src/swarm/glbopt_history.F index 1c5ac72751..d0ad29826e 100644 --- a/src/swarm/glbopt_history.F +++ b/src/swarm/glbopt_history.F @@ -12,7 +12,6 @@ MODULE glbopt_history USE input_section_types, ONLY: section_vals_type,& section_vals_val_get USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/glbopt_input.F b/src/swarm/glbopt_input.F index bac7353e48..8523e35b5e 100644 --- a/src/swarm/glbopt_input.F +++ b/src/swarm/glbopt_input.F @@ -25,7 +25,6 @@ MODULE glbopt_input real_t USE kinds, ONLY: dp USE string_utilities, ONLY: s2a -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/glbopt_master.F b/src/swarm/glbopt_master.F index b34651ff68..7fb9908153 100644 --- a/src/swarm/glbopt_master.F +++ b/src/swarm/glbopt_master.F @@ -12,6 +12,8 @@ MODULE glbopt_master deallocate_atomic_kind_set USE colvar_types, ONLY: colvar_p_release,& colvar_p_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -49,7 +51,6 @@ MODULE glbopt_master USE swarm_message, ONLY: swarm_message_get,& swarm_message_type USE topology, ONLY: topology_control -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/glbopt_mincrawl.F b/src/swarm/glbopt_mincrawl.F index 7003db6694..ca23170023 100644 --- a/src/swarm/glbopt_mincrawl.F +++ b/src/swarm/glbopt_mincrawl.F @@ -8,6 +8,8 @@ !> \author Ole Schuett ! ***************************************************************************** MODULE glbopt_mincrawl + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_units, ONLY: cp_unit_from_cp2k @@ -34,7 +36,6 @@ MODULE glbopt_mincrawl USE swarm_message, ONLY: swarm_message_add,& swarm_message_get,& swarm_message_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/glbopt_minhop.F b/src/swarm/glbopt_minhop.F index 2df14f9762..a614d5c19a 100644 --- a/src/swarm/glbopt_minhop.F +++ b/src/swarm/glbopt_minhop.F @@ -27,7 +27,6 @@ MODULE glbopt_minhop USE swarm_message, ONLY: swarm_message_add,& swarm_message_get,& swarm_message_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/glbopt_worker.F b/src/swarm/glbopt_worker.F index adeea8737e..4513b91a01 100644 --- a/src/swarm/glbopt_worker.F +++ b/src/swarm/glbopt_worker.F @@ -38,7 +38,6 @@ MODULE glbopt_worker USE swarm_message, ONLY: swarm_message_add,& swarm_message_get,& swarm_message_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/swarm.F b/src/swarm/swarm.F index 25374bbc4a..3da8b2db40 100644 --- a/src/swarm/swarm.F +++ b/src/swarm/swarm.F @@ -8,6 +8,8 @@ !> \author Ole Schuett ! ***************************************************************************** MODULE swarm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type USE global_types, ONLY: global_environment_type @@ -34,7 +36,6 @@ MODULE swarm swarm_worker_finalize,& swarm_worker_init,& swarm_worker_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/swarm_input.F b/src/swarm/swarm_input.F index b4a48dd8fe..9be117890b 100644 --- a/src/swarm/swarm_input.F +++ b/src/swarm/swarm_input.F @@ -23,7 +23,6 @@ MODULE swarm_input section_type USE input_val_types, ONLY: integer_t USE string_utilities, ONLY: s2a -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/swarm_master.F b/src/swarm/swarm_master.F index 33fca49b2b..859d079602 100644 --- a/src/swarm/swarm_master.F +++ b/src/swarm/swarm_master.F @@ -10,6 +10,8 @@ ! ***************************************************************************** MODULE swarm_master USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -34,7 +36,6 @@ MODULE swarm_master swarm_message_free,& swarm_message_get,& swarm_message_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/swarm_message.F b/src/swarm/swarm_message.F index 7a8e9808c2..4261fd6790 100644 --- a/src/swarm/swarm_message.F +++ b/src/swarm/swarm_message.F @@ -20,7 +20,6 @@ MODULE swarm_message mp_environ,& mp_recv,& mp_send -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/swarm_mpi.F b/src/swarm/swarm_mpi.F index e26dbf6380..d55a38136f 100644 --- a/src/swarm/swarm_mpi.F +++ b/src/swarm/swarm_mpi.F @@ -14,8 +14,10 @@ MODULE swarm_mpi cp_iteration_info_release,& cp_iteration_info_type USE cp_log_handling, ONLY: cp_add_default_logger,& + cp_get_default_logger,& cp_logger_create,& cp_logger_release,& + cp_logger_type,& cp_rm_default_logger USE cp_para_env, ONLY: cp_para_env_create,& cp_para_env_release @@ -38,7 +40,6 @@ MODULE swarm_mpi swarm_message_mpi_recv,& swarm_message_mpi_send,& swarm_message_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/swarm/swarm_worker.F b/src/swarm/swarm_worker.F index 284bbe0c0e..7ce68e6cf8 100644 --- a/src/swarm/swarm_worker.F +++ b/src/swarm/swarm_worker.F @@ -8,6 +8,8 @@ !> \author Ole Schuett ! ***************************************************************************** MODULE swarm_worker + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type USE glbopt_worker, ONLY: glbopt_worker_execute,& @@ -23,7 +25,6 @@ MODULE swarm_worker swarm_message_get,& swarm_message_haskey,& swarm_message_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/t_c_g0.F b/src/t_c_g0.F index 4439718c11..b61e8be6a9 100644 --- a/src/t_c_g0.F +++ b/src/t_c_g0.F @@ -49,7 +49,6 @@ MODULE t_c_g0 USE kinds, ONLY: dp USE message_passing, ONLY: mp_bcast -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/t_sh_p_s_c.F b/src/t_sh_p_s_c.F index f2e26b7651..b95e3e3490 100644 --- a/src/t_sh_p_s_c.F +++ b/src/t_sh_p_s_c.F @@ -26,7 +26,6 @@ MODULE t_sh_p_s_c USE kinds, ONLY: dp USE message_passing, ONLY: mp_bcast -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/taper_types.F b/src/taper_types.F index b731d0be3b..9029b178e5 100644 --- a/src/taper_types.F +++ b/src/taper_types.F @@ -10,7 +10,6 @@ MODULE taper_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/task_list_methods.F b/src/task_list_methods.F index 32bd144319..eb0e471613 100644 --- a/src/task_list_methods.F +++ b/src/task_list_methods.F @@ -63,7 +63,6 @@ MODULE task_list_methods !$ USE OMP_LIB, ONLY: omp_get_max_threads, omp_get_thread_num, omp_get_num_threads,& !$ omp_set_lock, omp_unset_lock, omp_init_lock, omp_lock_kind, omp_destroy_lock -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/task_list_types.F b/src/task_list_types.F index 244f0b030e..c924f6dbfd 100644 --- a/src/task_list_types.F +++ b/src/task_list_types.F @@ -13,7 +13,6 @@ MODULE task_list_types USE kinds, ONLY: dp,& int_8 -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/input_cp2k_tmc.F b/src/tmc/input_cp2k_tmc.F index bf12fb825b..cfac1752e1 100644 --- a/src/tmc/input_cp2k_tmc.F +++ b/src/tmc/input_cp2k_tmc.F @@ -24,7 +24,6 @@ MODULE input_cp2k_tmc USE kinds, ONLY: dp USE tmc_stati, ONLY: tmc_default_dot_file_name,& tmc_default_unspecified_name -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_analysis.F b/src/tmc/tmc_analysis.F index 5e76114c96..9b2bbc6805 100644 --- a/src/tmc/tmc_analysis.F +++ b/src/tmc/tmc_analysis.F @@ -17,6 +17,7 @@ MODULE tmc_analysis pbc USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_to_string USE force_fields_input, ONLY: read_chrg_section USE input_section_types, ONLY: section_vals_get,& section_vals_get_subs_vals,& @@ -61,7 +62,6 @@ MODULE tmc_analysis write_subtree_elem_unformated USE tmc_types, ONLY: tmc_atom_type,& tmc_param_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_analysis_types.F b/src/tmc/tmc_analysis_types.F index b11beda882..848de42861 100644 --- a/src/tmc/tmc_analysis_types.F +++ b/src/tmc/tmc_analysis_types.F @@ -17,7 +17,6 @@ MODULE tmc_analysis_types dp USE tmc_tree_types, ONLY: tree_type USE tmc_types, ONLY: tmc_atom_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_calculations.F b/src/tmc/tmc_calculations.F index cc77d6f245..f5885ae4c4 100644 --- a/src/tmc/tmc_calculations.F +++ b/src/tmc/tmc_calculations.F @@ -16,6 +16,7 @@ MODULE tmc_calculations get_cell,& init_cell,& pbc + USE cp_log_handling, ONLY: cp_to_string USE erf_fn, ONLY: erfc USE f77_interface, ONLY: calc_energy,& calc_force,& @@ -36,7 +37,6 @@ MODULE tmc_calculations USE tmc_types, ONLY: tmc_atom_type,& tmc_env_type,& tmc_param_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_cancelation.F b/src/tmc/tmc_cancelation.F index ea0736edcf..96a79ec1ec 100644 --- a/src/tmc/tmc_cancelation.F +++ b/src/tmc/tmc_cancelation.F @@ -22,6 +22,7 @@ ! ***************************************************************************** MODULE tmc_cancelation + USE cp_log_handling, ONLY: cp_to_string USE tmc_dot_tree, ONLY: create_dot_color USE tmc_tree_types, ONLY: & add_to_list, elem_list_type, status_accepted, status_accepted_result, & @@ -32,7 +33,6 @@ MODULE tmc_cancelation status_deleted, status_deleted_result, status_rejected, & status_rejected_result, tree_type USE tmc_types, ONLY: tmc_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_dot_tree.F b/src/tmc/tmc_dot_tree.F index 4769a89d3d..0fa4832d07 100644 --- a/src/tmc/tmc_dot_tree.F +++ b/src/tmc/tmc_dot_tree.F @@ -17,6 +17,7 @@ MODULE tmc_dot_tree USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_to_string USE tmc_file_io, ONLY: expand_file_name_char,& expand_file_name_temp USE tmc_move_types, ONLY: mv_type_swap_conf @@ -29,7 +30,6 @@ MODULE tmc_dot_tree status_deleted, status_deleted_result, status_rejected, & status_rejected_result, tree_type USE tmc_types, ONLY: tmc_param_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_file_io.F b/src/tmc/tmc_file_io.F index f8601de6c9..a2da25dae3 100644 --- a/src/tmc/tmc_file_io.F +++ b/src/tmc/tmc_file_io.F @@ -18,6 +18,7 @@ MODULE tmc_file_io USE cp_files, ONLY: close_file,& open_file + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: default_path_length,& default_string_length,& dp @@ -36,7 +37,6 @@ MODULE tmc_file_io tree_type USE tmc_types, ONLY: tmc_env_type,& tmc_param_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_master.F b/src/tmc/tmc_master.F index 90c5f48991..5dc5c5f1ff 100644 --- a/src/tmc/tmc_master.F +++ b/src/tmc/tmc_master.F @@ -21,6 +21,7 @@ MODULE tmc_master USE cell_types, ONLY: init_cell USE cp_external_control, ONLY: external_control + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE global_types, ONLY: global_environment_type USE kinds, ONLY: dp,& @@ -73,7 +74,6 @@ MODULE tmc_master status_canceled_ener, status_canceled_nmc, status_created, & status_rejected, tree_type USE tmc_types, ONLY: tmc_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_messages.F b/src/tmc/tmc_messages.F index 08c7f8b145..15f27c7a94 100644 --- a/src/tmc/tmc_messages.F +++ b/src/tmc/tmc_messages.F @@ -15,6 +15,7 @@ !> \author Mandes ! ***************************************************************************** MODULE tmc_messages + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE kinds, ONLY: default_string_length,& dp @@ -44,7 +45,6 @@ MODULE tmc_messages USE tmc_types, ONLY: allocate_tmc_atom_type,& tmc_atom_type,& tmc_param_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_move_handle.F b/src/tmc/tmc_move_handle.F index 6efef6ec0f..9c30c34040 100644 --- a/src/tmc/tmc_move_handle.F +++ b/src/tmc/tmc_move_handle.F @@ -23,6 +23,7 @@ ! ***************************************************************************** MODULE tmc_move_handle + USE cp_log_handling, ONLY: cp_to_string USE input_section_types, ONLY: section_vals_get,& section_vals_get_subs_vals,& section_vals_type,& @@ -45,7 +46,6 @@ MODULE tmc_move_handle status_rejected_result,& tree_type USE tmc_types, ONLY: tmc_param_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_move_types.F b/src/tmc/tmc_move_types.F index bce3d5584d..705814d14e 100644 --- a/src/tmc/tmc_move_types.F +++ b/src/tmc/tmc_move_types.F @@ -13,7 +13,6 @@ MODULE tmc_move_types USE kinds, ONLY: default_string_length,& dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_moves.F b/src/tmc/tmc_moves.F index 0ebca22de2..486c45c8a1 100644 --- a/src/tmc/tmc_moves.F +++ b/src/tmc/tmc_moves.F @@ -14,6 +14,7 @@ MODULE tmc_moves USE cell_types, ONLY: cell_type,& get_cell,& pbc + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE mathconstants, ONLY: pi USE mathlib, ONLY: dihedral_angle,& @@ -37,7 +38,6 @@ MODULE tmc_moves tree_type USE tmc_types, ONLY: tmc_atom_type,& tmc_param_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_setup.F b/src/tmc/tmc_setup.F index 42450de1f0..48a24b5c30 100644 --- a/src/tmc/tmc_setup.F +++ b/src/tmc/tmc_setup.F @@ -17,11 +17,10 @@ MODULE tmc_setup destroy_force_env USE cp_files, ONLY: close_file,& open_file - USE cp_log_handling, ONLY: cp_add_default_logger,& - cp_logger_create,& - cp_logger_release,& - cp_logger_set,& - cp_rm_default_logger + USE cp_log_handling, ONLY: & + cp_add_default_logger, cp_get_default_logger, cp_logger_create, & + cp_logger_get_default_io_unit, cp_logger_release, cp_logger_set, & + cp_logger_type, cp_rm_default_logger, cp_to_string USE cp_para_env, ONLY: cp_para_env_create USE cp_para_types, ONLY: cp_para_env_type USE environment, ONLY: cp2k_get_walltime @@ -79,7 +78,6 @@ MODULE tmc_setup USE tmc_worker, ONLY: do_tmc_worker,& get_atom_kinds_and_cell,& get_initial_conf -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_stati.F b/src/tmc/tmc_stati.F index f56baf34d3..4dd9a71eb4 100644 --- a/src/tmc/tmc_stati.F +++ b/src/tmc/tmc_stati.F @@ -11,7 +11,6 @@ ! ***************************************************************************** MODULE tmc_stati -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_tree_acceptance.F b/src/tmc/tmc_tree_acceptance.F index b126f433d6..56c4f45d7f 100644 --- a/src/tmc/tmc_tree_acceptance.F +++ b/src/tmc/tmc_tree_acceptance.F @@ -14,6 +14,7 @@ ! ***************************************************************************** MODULE tmc_tree_acceptance + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE physcon, ONLY: boltzmann,& joule @@ -41,7 +42,6 @@ MODULE tmc_tree_acceptance status_rejected_result, tree_type USE tmc_types, ONLY: tmc_env_type,& tmc_param_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_tree_build.F b/src/tmc/tmc_tree_build.F index b2c6caed86..b061b1564d 100644 --- a/src/tmc/tmc_tree_build.F +++ b/src/tmc/tmc_tree_build.F @@ -31,6 +31,7 @@ ! ***************************************************************************** MODULE tmc_tree_build + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE parallel_rng_types, ONLY: get_rng_stream,& next_random_number,& @@ -74,7 +75,6 @@ MODULE tmc_tree_build status_rejected_result, tree_type USE tmc_types, ONLY: tmc_env_type,& tmc_param_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_tree_references.F b/src/tmc/tmc_tree_references.F index 2ae3f07991..e4bf7fc236 100644 --- a/src/tmc/tmc_tree_references.F +++ b/src/tmc/tmc_tree_references.F @@ -18,12 +18,12 @@ ! ***************************************************************************** MODULE tmc_tree_references + USE cp_log_handling, ONLY: cp_to_string USE tmc_cancelation, ONLY: add_to_canceling_list USE tmc_tree_types, ONLY: global_tree_type,& gt_elem_list_type,& tree_type USE tmc_types, ONLY: tmc_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_tree_search.F b/src/tmc/tmc_tree_search.F index 080cd9f008..2f5794be9a 100644 --- a/src/tmc/tmc_tree_search.F +++ b/src/tmc/tmc_tree_search.F @@ -11,6 +11,7 @@ ! ***************************************************************************** MODULE tmc_tree_search + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE tmc_stati, ONLY: TMC_STATUS_WAIT_FOR_NEW_TASK USE tmc_tree_references, ONLY: add_to_references,& @@ -24,7 +25,6 @@ MODULE tmc_tree_search status_deleted, status_deleted_result, status_rejected, & status_rejected_result, tree_type USE tmc_types, ONLY: tmc_env_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_tree_types.F b/src/tmc/tmc_tree_types.F index 39f51b82c7..d7cfc033d8 100644 --- a/src/tmc/tmc_tree_types.F +++ b/src/tmc/tmc_tree_types.F @@ -29,7 +29,6 @@ MODULE tmc_tree_types USE kinds, ONLY: dp -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_types.F b/src/tmc/tmc_types.F index 45db05ce11..6e03553d89 100644 --- a/src/tmc/tmc_types.F +++ b/src/tmc/tmc_types.F @@ -42,7 +42,6 @@ MODULE tmc_types elem_array_type,& elem_list_type,& global_tree_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_utils.F b/src/tmc/tmc_utils.F index 6ccce4586c..2a2dc48399 100644 --- a/src/tmc/tmc_utils.F +++ b/src/tmc/tmc_utils.F @@ -13,7 +13,6 @@ MODULE tmc_utils -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/tmc/tmc_worker.F b/src/tmc/tmc_worker.F index f1d18ac217..2c0a383737 100644 --- a/src/tmc/tmc_worker.F +++ b/src/tmc/tmc_worker.F @@ -30,6 +30,7 @@ MODULE tmc_worker cell_type,& init_cell USE cp_external_control, ONLY: set_external_comm + USE cp_log_handling, ONLY: cp_to_string USE cp_para_types, ONLY: cp_para_env_type USE cp_result_methods, ONLY: cp_results_erase,& put_results @@ -91,7 +92,6 @@ MODULE tmc_worker tmc_atom_type,& tmc_env_type,& tmc_param_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology.F b/src/topology.F index 9f1f015303..c89959a6be 100644 --- a/src/topology.F +++ b/src/topology.F @@ -18,6 +18,8 @@ MODULE topology cell_type USE colvar_types, ONLY: colvar_p_type USE colvar_utils, ONLY: post_process_colvar + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -84,7 +86,6 @@ MODULE topology topology_set_atm_mass USE topology_xtl, ONLY: read_coordinate_xtl USE topology_xyz, ONLY: read_coordinate_xyz -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_amber.F b/src/topology_amber.F index 33dce04799..efb5047e51 100644 --- a/src/topology_amber.F +++ b/src/topology_amber.F @@ -10,6 +10,9 @@ !> \author Teodoro Laino [tlaino] - University of Zurich 10.2008 ! ***************************************************************************** MODULE topology_amber + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -38,7 +41,6 @@ MODULE topology_amber connectivity_info_type,& topology_parameters_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_cif.F b/src/topology_cif.F index 355cb2d5c4..ad029b6243 100644 --- a/src/topology_cif.F +++ b/src/topology_cif.F @@ -17,6 +17,9 @@ MODULE topology_cif real_to_scaled,& scaled_to_real,& set_cell_param + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -42,7 +45,6 @@ MODULE topology_cif USE string_utilities, ONLY: s2a USE topology_types, ONLY: atom_info_type,& topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_connectivity_util.F b/src/topology_connectivity_util.F index 48a317a49d..18f3c3d176 100644 --- a/src/topology_connectivity_util.F +++ b/src/topology_connectivity_util.F @@ -10,6 +10,9 @@ ! ***************************************************************************** MODULE topology_connectivity_util + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE force_field_kind_types, ONLY: do_ff_charmm,& @@ -36,7 +39,6 @@ MODULE topology_connectivity_util connectivity_info_type,& topology_parameters_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_constraint_util.F b/src/topology_constraint_util.F index 0b0718d9d8..b825fb04c7 100644 --- a/src/topology_constraint_util.F +++ b/src/topology_constraint_util.F @@ -25,6 +25,9 @@ MODULE topology_constraint_util colvar_release, colvar_setup, colvar_type, dist_colvar_id, & torsion_colvar_id, xyz_diag_colvar_id, xyz_outerdiag_colvar_id USE colvar_utils, ONLY: post_process_colvar + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_constants, ONLY: do_constr_atomic,& @@ -56,7 +59,6 @@ MODULE topology_constraint_util USE topology_types, ONLY: constr_list_type,& constraint_info_type,& topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_coordinate_util.F b/src/topology_coordinate_util.F index 1bfe4253fc..3ea63c6a17 100644 --- a/src/topology_coordinate_util.F +++ b/src/topology_coordinate_util.F @@ -12,6 +12,8 @@ MODULE topology_coordinate_util USE atomic_kind_types, ONLY: atomic_kind_type,& get_atomic_kind,& set_atomic_kind + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE exclusion_types, ONLY: exclusion_type @@ -48,7 +50,6 @@ MODULE topology_coordinate_util topology_parameters_type USE topology_util, ONLY: array1_list_type,& reorder_structure -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_cp2k.F b/src/topology_cp2k.F index 756f4e1cbd..27778fe3f3 100644 --- a/src/topology_cp2k.F +++ b/src/topology_cp2k.F @@ -7,6 +7,8 @@ MODULE topology_cp2k USE cell_types, ONLY: cell_type,& scaled_to_real + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -31,7 +33,6 @@ MODULE topology_cp2k str2id USE topology_types, ONLY: atom_info_type,& topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_generate_util.F b/src/topology_generate_util.F index 7653508cd2..e1f07b82f4 100644 --- a/src/topology_generate_util.F +++ b/src/topology_generate_util.F @@ -13,6 +13,10 @@ MODULE topology_generate_util deallocate_atomic_kind_set,& set_atomic_kind USE cell_types, ONLY: pbc + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -55,7 +59,6 @@ MODULE topology_generate_util reorder_structure USE util, ONLY: find_boundary,& sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_gromos.F b/src/topology_gromos.F index 70dc64f36f..14018c7990 100644 --- a/src/topology_gromos.F +++ b/src/topology_gromos.F @@ -5,6 +5,8 @@ ! ***************************************************************************** MODULE topology_gromos + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -27,7 +29,6 @@ MODULE topology_gromos USE topology_types, ONLY: atom_info_type,& connectivity_info_type,& topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_input.F b/src/topology_input.F index f3d186444a..1247f66910 100644 --- a/src/topology_input.F +++ b/src/topology_input.F @@ -12,6 +12,8 @@ MODULE topology_input USE colvar_types, ONLY: colvar_clone,& colvar_p_type + USE cp_log_handling, ONLY: cp_logger_get_default_io_unit,& + cp_to_string USE input_constants, ONLY: do_conn_generate,& do_conn_mol_set,& do_conn_off,& @@ -28,7 +30,6 @@ MODULE topology_input USE memory_utilities, ONLY: reallocate USE topology_types, ONLY: constraint_info_type,& topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_multiple_unit_cell.F b/src/topology_multiple_unit_cell.F index 70a42a21f6..afe9b31f14 100644 --- a/src/topology_multiple_unit_cell.F +++ b/src/topology_multiple_unit_cell.F @@ -19,7 +19,6 @@ MODULE topology_multiple_unit_cell dp USE memory_utilities, ONLY: reallocate USE topology_types, ONLY: topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_pdb.F b/src/topology_pdb.F index e40fc35b17..529840d798 100644 --- a/src/topology_pdb.F +++ b/src/topology_pdb.F @@ -50,6 +50,8 @@ MODULE topology_pdb r_datx,& r_host_name,& r_user_name + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_generate_filename,& cp_print_key_unit_nr @@ -75,7 +77,6 @@ MODULE topology_pdb str2id USE topology_types, ONLY: atom_info_type,& topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_psf.F b/src/topology_psf.F index 422fd027e7..e2d4f7c530 100644 --- a/src/topology_psf.F +++ b/src/topology_psf.F @@ -10,6 +10,10 @@ !> tlaino 10.2006 ! ***************************************************************************** MODULE topology_psf + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_generate_filename,& cp_print_key_unit_nr @@ -43,7 +47,6 @@ MODULE topology_psf reorder_structure,& tag_molecule USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_types.F b/src/topology_types.F index cba78795ee..0f13ab023e 100644 --- a/src/topology_types.F +++ b/src/topology_types.F @@ -25,7 +25,6 @@ MODULE topology_types USE kinds, ONLY: default_path_length,& default_string_length,& dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_util.F b/src/topology_util.F index 2a1f7c9b54..df5478682a 100644 --- a/src/topology_util.F +++ b/src/topology_util.F @@ -9,6 +9,10 @@ !> jgh (23-05-2004) Last atom of molecule information added ! ***************************************************************************** MODULE topology_util + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE graphcon, ONLY: graph_type,& @@ -34,7 +38,6 @@ MODULE topology_util connectivity_info_type,& topology_parameters_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_xtl.F b/src/topology_xtl.F index dbb676446b..c1de9accbe 100644 --- a/src/topology_xtl.F +++ b/src/topology_xtl.F @@ -16,6 +16,9 @@ MODULE topology_xtl pbc,& scaled_to_real,& set_cell_param + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -37,7 +40,6 @@ MODULE topology_xtl str2id USE topology_types, ONLY: atom_info_type,& topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/topology_xyz.F b/src/topology_xyz.F index 8974eadff3..e2cabf6066 100644 --- a/src/topology_xyz.F +++ b/src/topology_xyz.F @@ -4,6 +4,8 @@ !-----------------------------------------------------------------------------! ! ***************************************************************************** MODULE topology_xyz + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -22,7 +24,6 @@ MODULE topology_xyz str2id USE topology_types, ONLY: atom_info_type,& topology_parameters_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/transport.F b/src/transport.F index 8d8b8c210e..4fce4baa2e 100644 --- a/src/transport.F +++ b/src/transport.F @@ -29,6 +29,9 @@ MODULE transport cp_dbcsr_copy_into_existing, cp_dbcsr_create, cp_dbcsr_desymmetrize, & cp_dbcsr_has_symmetry, cp_dbcsr_init, cp_dbcsr_set, cp_dbcsr_type, & csr_type, dbcsr_type_real_4 + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type USE input_section_types, ONLY: section_vals_get_subs_vals,& section_vals_type,& section_vals_val_get @@ -45,7 +48,6 @@ MODULE transport csr_interop_matrix_get_info,& csr_interop_nullify,& transport_env_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/transport_env_types.F b/src/transport_env_types.F index 077ec21e33..40851dcc2d 100644 --- a/src/transport_env_types.F +++ b/src/transport_env_types.F @@ -26,7 +26,6 @@ MODULE transport_env_types cp_dbcsr_type,& csr_type USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/virial_methods.F b/src/virial_methods.F index 3b7711a147..c27f4b3d1d 100644 --- a/src/virial_methods.F +++ b/src/virial_methods.F @@ -21,7 +21,6 @@ MODULE virial_methods USE particle_list_types, ONLY: particle_list_type USE particle_types, ONLY: particle_type USE virial_types, ONLY: virial_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/wannier_states.F b/src/wannier_states.F index 87290dce89..70c44de612 100644 --- a/src/wannier_states.F +++ b/src/wannier_states.F @@ -20,6 +20,9 @@ MODULE wannier_states cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE cp_para_types, ONLY: cp_para_env_type @@ -33,7 +36,6 @@ MODULE wannier_states qs_environment_type USE wannier_states_types, ONLY: wannier_centres_type !!!! this ones are needed to mapping -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/wannier_states_types.F b/src/wannier_states_types.F index 06d6d58efa..61bd6902bd 100644 --- a/src/wannier_states_types.F +++ b/src/wannier_states_types.F @@ -9,7 +9,6 @@ ! ***************************************************************************** MODULE wannier_states_types USE kinds, ONLY: dp -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/xas_control.F b/src/xas_control.F index 320a3ccb4a..0fcacde6bf 100644 --- a/src/xas_control.F +++ b/src/xas_control.F @@ -9,6 +9,9 @@ ! ***************************************************************************** MODULE xas_control + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_print_key_finished_output,& cp_print_key_unit_nr USE input_constants, ONLY: xas_1s_type,& @@ -23,7 +26,6 @@ MODULE xas_control section_vals_val_get USE kinds, ONLY: dp USE memory_utilities, ONLY: reallocate -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/xas_env_types.F b/src/xas_env_types.F index 291169fca4..4ffc6d0edb 100644 --- a/src/xas_env_types.F +++ b/src/xas_env_types.F @@ -32,7 +32,6 @@ MODULE xas_env_types USE scf_control_types, ONLY: scf_c_release,& scf_c_retain,& scf_control_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/xas_methods.F b/src/xas_methods.F index 12346a4f2c..d65e9c9366 100644 --- a/src/xas_methods.F +++ b/src/xas_methods.F @@ -46,6 +46,10 @@ MODULE xas_methods cp_fm_to_fm,& cp_fm_type USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_should_output,& @@ -114,7 +118,6 @@ MODULE xas_methods USE xas_restart, ONLY: xas_read_restart USE xas_tp_scf, ONLY: xas_do_tp_scf,& xes_scf_once -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/xas_restart.F b/src/xas_restart.F index e63db7ee29..d404f94ce6 100644 --- a/src/xas_restart.F +++ b/src/xas_restart.F @@ -28,6 +28,9 @@ MODULE xas_restart cp_fm_type,& cp_fm_write_unformatted USE cp_gemm_interface, ONLY: cp_gemm + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_p_file,& cp_print_key_finished_output,& cp_print_key_generate_filename,& @@ -59,7 +62,6 @@ MODULE xas_restart USE xas_env_types, ONLY: get_xas_env,& set_xas_env,& xas_environment_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/xas_tp_scf.F b/src/xas_tp_scf.F index 98d40d146d..95aeb2fed0 100644 --- a/src/xas_tp_scf.F +++ b/src/xas_tp_scf.F @@ -26,6 +26,10 @@ MODULE xas_tp_scf cp_fm_set_submatrix,& cp_fm_to_fm,& cp_fm_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_io_unit,& + cp_logger_type,& + cp_to_string USE cp_output_handling, ONLY: cp_add_iter_level,& cp_iterate,& cp_p_file,& @@ -95,7 +99,6 @@ MODULE xas_tp_scf xas_environment_type USE xas_restart, ONLY: find_excited_core_orbital,& xas_write_restart -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/cp_linked_list_xc_deriv.F b/src/xc/cp_linked_list_xc_deriv.F index 4174313b64..197faac0f2 100644 --- a/src/xc/cp_linked_list_xc_deriv.F +++ b/src/xc/cp_linked_list_xc_deriv.F @@ -46,7 +46,6 @@ MODULE cp_linked_list_xc_deriv USE xc_derivative_types, ONLY: xc_derivative_p_type,& xc_derivative_type -#include "../common/cp_common_uses.f90" #include "../common/../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc.F b/src/xc/xc.F index 35caeffe8e..6bb77d9f3b 100644 --- a/src/xc/xc.F +++ b/src/xc/xc.F @@ -16,6 +16,10 @@ MODULE xc USE cp_array_utils_r, ONLY: cp_3d_r_p_type USE cp_linked_list_xc_deriv, ONLY: cp_sll_xc_deriv_next,& cp_sll_xc_deriv_type + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_get_default_unit_nr,& + cp_logger_type,& + cp_to_string USE input_section_types, ONLY: section_get_ival,& section_get_rval,& section_vals_get_subs_vals,& @@ -72,7 +76,6 @@ MODULE xc xc_rho_set_release,& xc_rho_set_type,& xc_rho_set_update -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_atom.F b/src/xc/xc_atom.F index 7860368fb3..b86abc5fab 100644 --- a/src/xc/xc_atom.F +++ b/src/xc/xc_atom.F @@ -23,7 +23,6 @@ MODULE xc_atom USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_b97.F b/src/xc/xc_b97.F index 874417b5d2..bb565a0746 100644 --- a/src/xc/xc_b97.F +++ b/src/xc/xc_b97.F @@ -37,7 +37,6 @@ MODULE xc_b97 USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_cs1.F b/src/xc/xc_cs1.F index 3521233e7d..1f3123e691 100644 --- a/src/xc/xc_cs1.F +++ b/src/xc/xc_cs1.F @@ -22,7 +22,6 @@ MODULE xc_cs1 USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_derivative_desc.F b/src/xc/xc_derivative_desc.F index 956d132668..33dd4ae872 100644 --- a/src/xc/xc_derivative_desc.F +++ b/src/xc/xc_derivative_desc.F @@ -26,7 +26,6 @@ MODULE xc_derivative_desc -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_derivative_set_types.F b/src/xc/xc_derivative_set_types.F index 0cac10ac4f..887522d4e5 100644 --- a/src/xc/xc_derivative_set_types.F +++ b/src/xc/xc_derivative_set_types.F @@ -29,7 +29,6 @@ MODULE xc_derivative_set_types USE xc_derivative_types, ONLY: xc_derivative_create,& xc_derivative_release,& xc_derivative_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_derivative_types.F b/src/xc/xc_derivative_types.F index 4c5d68d8a8..1b9a13dfef 100644 --- a/src/xc/xc_derivative_types.F +++ b/src/xc/xc_derivative_types.F @@ -16,7 +16,6 @@ MODULE xc_derivative_types MAX_LABEL_LENGTH,& create_split_derivative_desc,& standardize_derivative_desc -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_derivatives.F b/src/xc/xc_derivatives.F index 1116f2b6bc..eb537c1e7d 100644 --- a/src/xc/xc_derivatives.F +++ b/src/xc/xc_derivatives.F @@ -116,7 +116,6 @@ MODULE xc_derivatives xwpbe_lda_info,& xwpbe_lsd_eval,& xwpbe_lsd_info -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_exchange_gga.F b/src/xc/xc_exchange_gga.F index a98eff3400..b9f77acd76 100644 --- a/src/xc/xc_exchange_gga.F +++ b/src/xc/xc_exchange_gga.F @@ -14,6 +14,7 @@ MODULE xc_exchange_gga USE cp_array_utils_r, ONLY: cp_3d_r_p_type + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE mathconstants, ONLY: pi USE xc_derivative_set_types, ONLY: xc_derivative_set_type,& @@ -32,7 +33,6 @@ MODULE xc_exchange_gga USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_functionals_utilities.F b/src/xc/xc_functionals_utilities.F index f6d17ae90e..b3b2bb6ba0 100644 --- a/src/xc/xc_functionals_utilities.F +++ b/src/xc/xc_functionals_utilities.F @@ -15,7 +15,6 @@ MODULE xc_functionals_utilities USE kinds, ONLY: dp USE mathconstants, ONLY: pi -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_hcth.F b/src/xc/xc_hcth.F index 143a07ca5a..c5eea65874 100644 --- a/src/xc/xc_hcth.F +++ b/src/xc/xc_hcth.F @@ -10,6 +10,7 @@ ! ***************************************************************************** MODULE xc_hcth + USE cp_log_handling, ONLY: cp_to_string USE kinds, ONLY: dp USE mathconstants, ONLY: pi USE xc_derivative_set_types, ONLY: xc_derivative_set_type,& @@ -19,7 +20,6 @@ MODULE xc_hcth USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_ke_gga.F b/src/xc/xc_ke_gga.F index 9da7662bfb..9a580e3e05 100644 --- a/src/xc/xc_ke_gga.F +++ b/src/xc/xc_ke_gga.F @@ -28,7 +28,6 @@ MODULE xc_ke_gga USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_libxc.F b/src/xc/xc_libxc.F index d6e54d34bd..5fce4bdeda 100644 --- a/src/xc/xc_libxc.F +++ b/src/xc/xc_libxc.F @@ -100,7 +100,6 @@ MODULE xc_libxc xc_libxc_wrap_functional_buggy #endif -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_libxc_wrap.F b/src/xc/xc_libxc_wrap.F index b0d78ec540..f17f0aa0a4 100644 --- a/src/xc/xc_libxc_wrap.F +++ b/src/xc/xc_libxc_wrap.F @@ -141,7 +141,6 @@ MODULE xc_libxc_wrap XC_GGA_XC_LB,& XC_GGA_K_ABSR1 -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_lyp.F b/src/xc/xc_lyp.F index 65c8c5e92c..0674911a0f 100644 --- a/src/xc/xc_lyp.F +++ b/src/xc/xc_lyp.F @@ -23,7 +23,6 @@ MODULE xc_lyp USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_lyp_adiabatic.F b/src/xc/xc_lyp_adiabatic.F index 095e5c5774..1b80f8e70a 100644 --- a/src/xc/xc_lyp_adiabatic.F +++ b/src/xc/xc_lyp_adiabatic.F @@ -28,7 +28,6 @@ MODULE xc_lyp_adiabatic USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_optx.F b/src/xc/xc_optx.F index f5063ab96b..ad067b24b9 100644 --- a/src/xc/xc_optx.F +++ b/src/xc/xc_optx.F @@ -21,7 +21,6 @@ MODULE xc_optx USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_pade.F b/src/xc/xc_pade.F index c7361647d6..d9948931a2 100644 --- a/src/xc/xc_pade.F +++ b/src/xc/xc_pade.F @@ -28,7 +28,6 @@ MODULE xc_pade set_util USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_pbe.F b/src/xc/xc_pbe.F index 4e1b40d0e1..65183ca194 100644 --- a/src/xc/xc_pbe.F +++ b/src/xc/xc_pbe.F @@ -35,7 +35,6 @@ MODULE xc_pbe USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_perdew86.F b/src/xc/xc_perdew86.F index be718bb314..45ddc8771d 100644 --- a/src/xc/xc_perdew86.F +++ b/src/xc/xc_perdew86.F @@ -26,7 +26,6 @@ MODULE xc_perdew86 USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_perdew_wang.F b/src/xc/xc_perdew_wang.F index 887e27dd5c..1f9bb8d46f 100644 --- a/src/xc/xc_perdew_wang.F +++ b/src/xc/xc_perdew_wang.F @@ -29,7 +29,6 @@ MODULE xc_perdew_wang USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_perdew_zunger.F b/src/xc/xc_perdew_zunger.F index 44b99d026f..adf08f09ec 100644 --- a/src/xc/xc_perdew_zunger.F +++ b/src/xc/xc_perdew_zunger.F @@ -33,7 +33,6 @@ MODULE xc_perdew_zunger USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_rho_cflags_types.F b/src/xc/xc_rho_cflags_types.F index 6e030d5790..80442bac95 100644 --- a/src/xc/xc_rho_cflags_types.F +++ b/src/xc/xc_rho_cflags_types.F @@ -12,7 +12,6 @@ MODULE xc_rho_cflags_types -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE PRIVATE diff --git a/src/xc/xc_rho_set_types.F b/src/xc/xc_rho_set_types.F index 04957407cc..f50d7a8a5f 100644 --- a/src/xc/xc_rho_set_types.F +++ b/src/xc/xc_rho_set_types.F @@ -42,7 +42,6 @@ MODULE xc_rho_set_types USE xc_rho_cflags_types, ONLY: xc_rho_cflags_equal,& xc_rho_cflags_setall,& xc_rho_cflags_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_tfw.F b/src/xc/xc_tfw.F index 4f485e99b1..e65c020a2f 100644 --- a/src/xc/xc_tfw.F +++ b/src/xc/xc_tfw.F @@ -22,7 +22,6 @@ MODULE xc_tfw USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_thomas_fermi.F b/src/xc/xc_thomas_fermi.F index 37233312f7..a3ed45713f 100644 --- a/src/xc/xc_thomas_fermi.F +++ b/src/xc/xc_thomas_fermi.F @@ -24,7 +24,6 @@ MODULE xc_thomas_fermi USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_tpss.F b/src/xc/xc_tpss.F index 37d1d227a0..26c45b080d 100644 --- a/src/xc/xc_tpss.F +++ b/src/xc/xc_tpss.F @@ -15,6 +15,8 @@ MODULE xc_tpss USE bibliography, ONLY: Tao2003,& cite_reference + USE cp_log_handling, ONLY: cp_get_default_logger,& + cp_logger_type USE input_section_types, ONLY: section_vals_type,& section_vals_val_get USE kinds, ONLY: dp @@ -26,7 +28,6 @@ MODULE xc_tpss USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_vwn.F b/src/xc/xc_vwn.F index 2f9c061b0e..d8fc7e644d 100644 --- a/src/xc/xc_vwn.F +++ b/src/xc/xc_vwn.F @@ -33,7 +33,6 @@ MODULE xc_vwn USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_xalpha.F b/src/xc/xc_xalpha.F index 741857fab8..b71549b11a 100644 --- a/src/xc/xc_xalpha.F +++ b/src/xc/xc_xalpha.F @@ -27,7 +27,6 @@ MODULE xc_xalpha USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_xbecke88.F b/src/xc/xc_xbecke88.F index 4419234a18..f5da4eae0c 100644 --- a/src/xc/xc_xbecke88.F +++ b/src/xc/xc_xbecke88.F @@ -24,7 +24,6 @@ MODULE xc_xbecke88 USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_xbecke88_long_range.F b/src/xc/xc_xbecke88_long_range.F index bacc0a6a0b..a1df70acfb 100644 --- a/src/xc/xc_xbecke88_long_range.F +++ b/src/xc/xc_xbecke88_long_range.F @@ -26,7 +26,6 @@ MODULE xc_xbecke88_long_range USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_xbecke88_lr_adiabatic.F b/src/xc/xc_xbecke88_lr_adiabatic.F index 73db5d3b98..5177be35f8 100644 --- a/src/xc/xc_xbecke88_lr_adiabatic.F +++ b/src/xc/xc_xbecke88_lr_adiabatic.F @@ -32,7 +32,6 @@ MODULE xc_xbecke88_lr_adiabatic USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_xbecke_roussel.F b/src/xc/xc_xbecke_roussel.F index aa39ac523c..93056e3f2d 100644 --- a/src/xc/xc_xbecke_roussel.F +++ b/src/xc/xc_xbecke_roussel.F @@ -28,7 +28,6 @@ MODULE xc_xbecke_roussel USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_xbeef.F b/src/xc/xc_xbeef.F index a0ee02892a..1f4f061ccf 100644 --- a/src/xc/xc_xbeef.F +++ b/src/xc/xc_xbeef.F @@ -26,7 +26,6 @@ MODULE xc_xbeef USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_xbr_pbe_lda_hole_t_c_lr.F b/src/xc/xc_xbr_pbe_lda_hole_t_c_lr.F index 76265c4531..344fe8900c 100644 --- a/src/xc/xc_xbr_pbe_lda_hole_t_c_lr.F +++ b/src/xc/xc_xbr_pbe_lda_hole_t_c_lr.F @@ -44,7 +44,6 @@ MODULE xc_xbr_pbe_lda_hole_t_c_lr USE xc_xlda_hole_t_c_lr, ONLY: xlda_hole_t_c_lr_lda_calc_0 USE xc_xpbe_hole_t_c_lr, ONLY: xpbe_hole_t_c_lr_lda_calc_1,& xpbe_hole_t_c_lr_lda_calc_2 -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_xlda_hole_t_c_lr.F b/src/xc/xc_xlda_hole_t_c_lr.F index 32f1d625dd..5ce690e781 100644 --- a/src/xc/xc_xlda_hole_t_c_lr.F +++ b/src/xc/xc_xlda_hole_t_c_lr.F @@ -25,7 +25,6 @@ MODULE xc_xlda_hole_t_c_lr USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_xpbe_hole_t_c_lr.F b/src/xc/xc_xpbe_hole_t_c_lr.F index c24ff33aad..cd7e10161f 100644 --- a/src/xc/xc_xpbe_hole_t_c_lr.F +++ b/src/xc/xc_xpbe_hole_t_c_lr.F @@ -27,7 +27,6 @@ MODULE xc_xpbe_hole_t_c_lr USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc/xc_xwpbe.F b/src/xc/xc_xwpbe.F index ea78ae3d66..f980e0e3cc 100644 --- a/src/xc/xc_xwpbe.F +++ b/src/xc/xc_xwpbe.F @@ -27,7 +27,6 @@ MODULE xc_xwpbe USE xc_rho_cflags_types, ONLY: xc_rho_cflags_type USE xc_rho_set_types, ONLY: xc_rho_set_get,& xc_rho_set_type -#include "../common/cp_common_uses.f90" #include "../base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc_adiabatic_methods.F b/src/xc_adiabatic_methods.F index 632f2368b6..b1b165ffcf 100644 --- a/src/xc_adiabatic_methods.F +++ b/src/xc_adiabatic_methods.F @@ -19,7 +19,6 @@ MODULE xc_adiabatic_methods qs_environment_type USE qs_mo_types, ONLY: get_mo_set,& mo_set_p_type -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc_adiabatic_utils.F b/src/xc_adiabatic_utils.F index 18ec7df8c0..d0187452de 100644 --- a/src/xc_adiabatic_utils.F +++ b/src/xc_adiabatic_utils.F @@ -35,7 +35,6 @@ MODULE xc_adiabatic_utils USE qs_vxc, ONLY: qs_vxc_create USE qs_vxc_atom, ONLY: calculate_vxc_atom USE xc_adiabatic_methods, ONLY: rescale_MCY3_pade -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc_pot_saop.F b/src/xc_pot_saop.F index b1f0046262..f05ae11be5 100644 --- a/src/xc_pot_saop.F +++ b/src/xc_pot_saop.F @@ -98,7 +98,6 @@ MODULE xc_pot_saop xc_rho_set_update USE xc_xbecke88, ONLY: xb88_lda_info,& xb88_lsd_info -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/xc_write_output.F b/src/xc_write_output.F index 03d52ca555..db06363c0c 100644 --- a/src/xc_write_output.F +++ b/src/xc_write_output.F @@ -17,7 +17,6 @@ MODULE xc_write_output USE kinds, ONLY: default_string_length USE xc_derivatives, ONLY: xc_functional_get_info USE xc_libxc, ONLY: libxc_version_info -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE diff --git a/src/xray_diffraction.F b/src/xray_diffraction.F index c490618899..a85622f408 100644 --- a/src/xray_diffraction.F +++ b/src/xray_diffraction.F @@ -63,7 +63,6 @@ MODULE xray_diffraction USE qs_rho_types, ONLY: qs_rho_get,& qs_rho_type USE util, ONLY: sort -#include "./common/cp_common_uses.f90" #include "./base/base_uses.f90" IMPLICIT NONE