From d6f56e521c71292b2ec4f14148e1220527ef42ba Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@cnrs.fr> Date: Thu, 19 Sep 2024 10:40:35 +0200 Subject: [PATCH] Philippe 19/09/2024: remove tabulation characters (not conformant to Fortran standard) --- src/LIB/SURCOUCHE/src/modd_confz.f90 | 4 +- src/LIB/SURCOUCHE/src/mode_distriblb.f90 | 6 +- src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 | 4 +- src/LIB/SURCOUCHE/src/mode_lb_ll.f90 | 6 +- src/LIB/SURCOUCHE/src/mode_nest_ll.f90 | 6 +- src/LIB/SURCOUCHE/src/mode_splitting_ll.f90 | 28 +- src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 | 40 +- src/LIB/SURCOUCHE/src/mode_toolsz_ll.f90 | 18 +- src/LIB/SURCOUCHE/src/modn_confz.f90 | 4 +- src/LIB/SURCOUCHE/src/update_nhalo1d.f90 | 6 +- src/MNH/BASIC.f90 | 184 +-- src/MNH/abdulrazzak.f90 | 10 +- src/MNH/adv_boundaries.f90 | 4 +- src/MNH/adv_forcingn.f90 | 8 +- src/MNH/advec_3rd_order_aux.f90 | 4 +- src/MNH/advection_metsv.f90 | 16 +- src/MNH/advection_uvw.f90 | 16 +- src/MNH/advection_uvw_cen.f90 | 12 +- src/MNH/advecuvw_2nd.f90 | 8 +- src/MNH/advecuvw_rk.f90 | 6 +- src/MNH/advecuvw_weno_k.f90 | 6 +- src/MNH/aer_clim_surf.f90 | 6 +- src/MNH/aerozon.f90 | 12 +- src/MNH/ares.fx90 | 14 +- src/MNH/barnes_filter.f90 | 8 +- src/MNH/beambroad.f90 | 8 +- src/MNH/boundaries.f90 | 4 +- src/MNH/budget_flags.f90 | 4 +- src/MNH/cart_compress.f90 | 10 +- src/MNH/ch_aqueous_check.f90 | 8 +- src/MNH/ch_aqueous_sedim1mom.f90 | 6 +- src/MNH/ch_aqueous_sedim2mom.f90 | 6 +- src/MNH/ch_aqueous_tmicc2r2.f90 | 12 +- src/MNH/ch_aqueous_tmicice.f90 | 8 +- src/MNH/ch_aqueous_tmickess.f90 | 10 +- src/MNH/ch_aqueous_tmickhko.f90 | 10 +- src/MNH/ch_boundaries.f90 | 6 +- src/MNH/ch_convect_linox.f90 | 4 +- src/MNH/ch_convect_scavenging.f90 | 4 +- src/MNH/ch_diagnostics.f90 | 4 +- src/MNH/ch_emission_flux0d.f90 | 8 +- src/MNH/ch_f77.fx90 | 1405 ++++++++---------- src/MNH/ch_field_valuen.f90 | 6 +- src/MNH/ch_init_budgetn.f90 | 4 +- src/MNH/ch_init_diagnostics.f90 | 4 +- src/MNH/ch_init_meteo.f90 | 6 +- src/MNH/ch_init_prodlosstotn.f90 | 4 +- src/MNH/ch_linssa.f90 | 4 +- src/MNH/ch_model0d.f90 | 4 +- src/MNH/ch_qssa.f90 | 4 +- src/MNH/ch_surface0d.f90 | 6 +- src/MNH/ch_svode.f90 | 12 +- src/MNH/ch_update_meteo.f90 | 6 +- src/MNH/check_zhat.f90 | 4 +- src/MNH/check_zs.f90 | 4 +- src/MNH/close_file_mnh.f90 | 4 +- src/MNH/coef_ver_interp_lin.f90 | 8 +- src/MNH/compare_with_pgd_domain.f90 | 4 +- src/MNH/compute_exner_from_ground.f90 | 6 +- src/MNH/compute_press_from_oceanbot.f90 | 6 +- src/MNH/compute_r00.f90 | 2 +- src/MNH/compute_spectre.f90 | 30 +- src/MNH/condsamp.f90 | 8 +- src/MNH/conjgrad.f90 | 4 +- src/MNH/conresol.f90 | 4 +- src/MNH/conresolz.f90 | 4 +- src/MNH/contrav.f90 | 4 +- src/MNH/convection.f90 | 6 +- src/MNH/cphase_profile.f90 | 4 +- src/MNH/dealloc_para_ll.f90 | 4 +- src/MNH/deallocate_model1.f90 | 4 +- src/MNH/default_expre.f90 | 4 +- src/MNH/default_gr_field.f90 | 4 +- src/MNH/default_sleve.f90 | 4 +- src/MNH/define_maskn.f90 | 4 +- src/MNH/detect_field_mnh.f90 | 4 +- src/MNH/dotprod.f90 | 4 +- src/MNH/drag_bld.f90 | 4 +- src/MNH/drag_veg.f90 | 4 +- src/MNH/dyn_sources.f90 | 18 +- src/MNH/eddyUV_flux_one_wayn.f90 | 4 +- src/MNH/eddyUV_fluxn.f90 | 4 +- src/MNH/eddy_flux_one_wayn.f90 | 4 +- src/MNH/eddy_fluxn.f90 | 4 +- src/MNH/elec_tridz.f90 | 4 +- src/MNH/end_cart_compress.f90 | 6 +- src/MNH/end_mask_compress.f90 | 6 +- src/MNH/endstep_budget.f90 | 20 +- src/MNH/eol_adnr.f90 | 4 +- src/MNH/eol_alm.f90 | 4 +- src/MNH/eol_debugger.f90 | 4 +- src/MNH/eol_error.f90 | 4 +- src/MNH/eol_kine_alm.f90 | 4 +- src/MNH/eol_main.f90 | 12 +- src/MNH/eol_maths.f90 | 4 +- src/MNH/eol_printer.f90 | 4 +- src/MNH/eol_reader.f90 | 4 +- src/MNH/eol_smear.f90 | 4 +- src/MNH/extend_grid_parameter_mnh.f90 | 10 +- src/MNH/extract_vortex.f90 | 4 +- src/MNH/fft55.f90 | 4 +- src/MNH/fill_sonfieldn.f90 | 4 +- src/MNH/fill_zsmtn.f90 | 4 +- src/MNH/flat_inv.f90 | 4 +- src/MNH/flat_invz.f90 | 4 +- src/MNH/flux.f90 | 14 +- src/MNH/forc_wind.f90 | 4 +- src/MNH/forcing.f90 | 14 +- src/MNH/fun.f90 | 26 +- src/MNH/gamma_inc_low.f90 | 4 +- src/MNH/gdiv.f90 | 4 +- src/MNH/get_interp_halo_mnh.f90 | 4 +- src/MNH/get_nb_procio_read_mnh.f90 | 6 +- src/MNH/get_nb_procio_write_mnh.f90 | 6 +- src/MNH/get_sizex_lb.f90 | 4 +- src/MNH/get_sizey_lb.f90 | 4 +- src/MNH/gradient_m.f90 | 8 +- src/MNH/gravity.f90 | 6 +- src/MNH/gravity_impl.f90 | 4 +- src/MNH/ground_paramn.f90 | 22 +- src/MNH/height_press.f90 | 8 +- src/MNH/holland_vt.f90 | 12 +- src/MNH/ibm_0Dint.f90 | 4 +- src/MNH/ibm_1Dint.f90 | 4 +- src/MNH/ibm_3Dint.f90 | 4 +- src/MNH/ibm_valuemat1.f90 | 4 +- src/MNH/ibm_valuemat2.f90 | 4 +- src/MNH/ini_budget.f90 | 2 +- src/MNH/ini_cloud.f90 | 14 +- src/MNH/ini_cpl.f90 | 2 +- src/MNH/ini_cst.f90 | 28 +- src/MNH/ini_deep_convection.f90 | 8 +- src/MNH/ini_drag.f90 | 4 +- src/MNH/ini_dynamics.f90 | 4 +- src/MNH/ini_eol_adnr.f90 | 4 +- src/MNH/ini_eol_adr.f90 | 10 +- src/MNH/ini_eol_alm.f90 | 14 +- src/MNH/ini_field_elec.f90 | 12 +- src/MNH/ini_flash_geom_elec.f90 | 22 +- src/MNH/ini_lb.f90 | 4 +- src/MNH/ini_lg.f90 | 4 +- src/MNH/ini_ls.f90 | 4 +- src/MNH/ini_mean_field.f90 | 4 +- src/MNH/ini_prog_var.f90 | 4 +- src/MNH/ini_radar.f90 | 4 +- src/MNH/ini_radiations.f90 | 14 +- src/MNH/ini_radiations_agg.f90 | 2 +- src/MNH/ini_radiations_ecmwf.f90 | 10 +- src/MNH/ini_segn.f90 | 2 +- src/MNH/init_ground_paramn.f90 | 4 +- src/MNH/init_horgrid_lln.f90 | 4 +- src/MNH/initial_guess.f90 | 8 +- src/MNH/interp3d.f90 | 4 +- src/MNH/ion_attach_elec.f90 | 48 +- src/MNH/ion_bound4drift.f90 | 4 +- src/MNH/ion_boundaries.f90 | 4 +- src/MNH/lap_m.f90 | 4 +- src/MNH/les_pdf_ll.f90 | 6 +- src/MNH/lidar.f90 | 4 +- src/MNH/mask_compress.f90 | 16 +- src/MNH/mass_leak.f90 | 4 +- src/MNH/metrics.f90 | 8 +- src/MNH/mnh2lpdm.f90 | 44 +- src/MNH/mnh2lpdm_ech.f90 | 52 +- src/MNH/mnh2lpdm_ini.f90 | 56 +- src/MNH/mnh_oasis_define.F90 | 4 +- src/MNH/mnh_oasis_grid.F90 | 4 +- src/MNH/mnh_oasis_recv.F90 | 4 +- src/MNH/mnh_oasis_send.F90 | 6 +- src/MNH/mnhclose_aux_io_surf.f90 | 4 +- src/MNH/mnhclose_namelist.f90 | 4 +- src/MNH/mnhclose_write_cover_tex.f90 | 4 +- src/MNH/mnhend_io_surfn.f90 | 2 +- src/MNH/mnhget_luout.f90 | 4 +- src/MNH/mnhget_size_fulln.f90 | 4 +- src/MNH/mnhget_surf_paramn.f90 | 4 +- src/MNH/mnhinit_io_surfn.f90 | 2 +- src/MNH/mnhopen_namelist.f90 | 4 +- src/MNH/mnhopen_write_cover_tex.f90 | 4 +- src/MNH/mnhput_zsn.f90 | 4 +- src/MNH/mnhread_zs_dummyn.f90 | 6 +- src/MNH/mnhwrite_zs_dummyn.f90 | 4 +- src/MNH/modd_advfrcn.f90 | 4 +- src/MNH/modd_advn.f90 | 4 +- src/MNH/modd_allprofilern.f90 | 4 +- src/MNH/modd_allstationn.f90 | 4 +- src/MNH/modd_aunifacparam.f90 | 6 +- src/MNH/modd_bakout.f90 | 2 +- src/MNH/modd_bikhardtn.f90 | 4 +- src/MNH/modd_binsolu.f90 | 4 +- src/MNH/modd_blowsnow.f90 | 6 +- src/MNH/modd_budget.f90 | 4 +- src/MNH/modd_bunifacparam.f90 | 6 +- src/MNH/modd_ch_aeron.f90 | 4 +- src/MNH/modd_ch_budget_n.f90 | 4 +- src/MNH/modd_ch_meteo.f90 | 26 +- src/MNH/modd_ch_prodlosstotn.f90 | 4 +- src/MNH/modd_ch_solvern.f90 | 28 +- src/MNH/modd_cloud_mfn.f90 | 4 +- src/MNH/modd_cloupar.f90 | 4 +- src/MNH/modd_condsamp.f90 | 8 +- src/MNH/modd_confn.f90 | 4 +- src/MNH/modd_cst.f90 | 18 +- src/MNH/modd_curvcorn.f90 | 4 +- src/MNH/modd_def_eddyUV_fluxn.f90 | 4 +- src/MNH/modd_def_eddy_fluxn.f90 | 4 +- src/MNH/modd_def_gr_field.f90 | 4 +- src/MNH/modd_diag_blank.f90 | 4 +- src/MNH/modd_diag_flag.f90 | 4 +- src/MNH/modd_dimn.f90 | 4 +- src/MNH/modd_dummy_gr_fieldn.f90 | 4 +- src/MNH/modd_dummy_pgdfields.f90 | 4 +- src/MNH/modd_dyn.f90 | 2 +- src/MNH/modd_dynn.f90 | 4 +- src/MNH/modd_dynzd.f90 | 8 +- src/MNH/modd_dynzdn.f90 | 8 +- src/MNH/modd_elec_flash.f90 | 4 +- src/MNH/modd_emis_pgdfields.f90 | 4 +- src/MNH/modd_eol_kine_adr.f90 | 6 +- src/MNH/modd_eol_kine_alm.f90 | 6 +- src/MNH/modd_fieldn.f90 | 4 +- src/MNH/modd_frc.f90 | 16 +- src/MNH/modd_frcn.f90 | 4 +- src/MNH/modd_getn.f90 | 4 +- src/MNH/modd_gr_fieldn.f90 | 4 +- src/MNH/modd_grid.f90 | 4 +- src/MNH/modd_gridn.f90 | 4 +- src/MNH/modd_ground_par.f90 | 4 +- src/MNH/modd_hurr_conf.f90 | 4 +- src/MNH/modd_ibm_lsf.f90 | 4 +- src/MNH/modd_ibm_paramn.f90 | 4 +- src/MNH/modd_ice_c1r3_descr.f90 | 4 +- src/MNH/modd_ice_c1r3_param.f90 | 92 +- src/MNH/modd_io_nam.f90 | 4 +- src/MNH/modd_io_surf_mnh.f90 | 4 +- src/MNH/modd_lbcn.f90 | 4 +- src/MNH/modd_lesn.f90 | 4 +- src/MNH/modd_lg.f90 | 4 +- src/MNH/modd_lma_simulator.f90 | 4 +- src/MNH/modd_lunitn.f90 | 2 +- src/MNH/modd_mean_fieldn.f90 | 4 +- src/MNH/modd_metricsn.f90 | 4 +- src/MNH/modd_mnh2lpdm.f90 | 26 +- src/MNH/modd_nest_pgdn.f90 | 4 +- src/MNH/modd_nesting.f90 | 4 +- src/MNH/modd_nudgingn.f90 | 4 +- src/MNH/modd_outn.f90 | 2 +- src/MNH/modd_pack_gr_fieldn.f90 | 4 +- src/MNH/modd_parameters.f90 | 2 +- src/MNH/modd_paramn.f90 | 4 +- src/MNH/modd_paspol.f90 | 8 +- src/MNH/modd_paspoln.f90 | 8 +- src/MNH/modd_past_fieldn.f90 | 4 +- src/MNH/modd_pgddim.f90 | 4 +- src/MNH/modd_pgdfields.f90 | 4 +- src/MNH/modd_pgdgrid.f90 | 4 +- src/MNH/modd_pgdsilwork.f90 | 4 +- src/MNH/modd_pgdssowork.f90 | 4 +- src/MNH/modd_pgdz0dwork.f90 | 4 +- src/MNH/modd_profilern.f90 | 4 +- src/MNH/modd_radar.f90 | 4 +- src/MNH/modd_radiationsn.f90 | 6 +- src/MNH/modd_recycl_paramn.f90 | 4 +- src/MNH/modd_ref.f90 | 4 +- src/MNH/modd_refn.f90 | 4 +- src/MNH/modd_relfrcn.f90 | 4 +- src/MNH/modd_secpgd_fieldn.f90 | 4 +- src/MNH/modd_spawn.f90 | 4 +- src/MNH/modd_splineswork.f90 | 4 +- src/MNH/modd_stand_atm.f90 | 14 +- src/MNH/modd_stationn.f90 | 4 +- src/MNH/modd_sub_elecn.f90 | 4 +- src/MNH/modd_sub_paspoln.f90 | 4 +- src/MNH/modd_time.f90 | 2 +- src/MNH/modd_timen.f90 | 4 +- src/MNH/modd_type_date.f90 | 4 +- src/MNH/modd_type_statprof.f90 | 4 +- src/MNH/modd_unifacparam.f90 | 4 +- src/MNH/modd_vegn.f90 | 4 +- src/MNH/modd_ver_interp_lin.f90 | 4 +- src/MNH/mode_RBK90_Integrator.f90 | 6 +- src/MNH/mode_RBK90_linearalgebra.f90 | 58 +- src/MNH/mode_amain.f90 | 86 +- src/MNH/mode_arf.f90 | 6 +- src/MNH/mode_blowsnow_sedim_lkt.f90 | 8 +- src/MNH/mode_gridcart.f90 | 6 +- src/MNH/mode_readtmat.f90 | 22 +- src/MNH/mode_time.f90 | 6 +- src/MNH/mode_typea.f90 | 14 +- src/MNH/mode_typeb.f90 | 20 +- src/MNH/mode_zsrpun.f90 | 16 +- src/MNH/modn_advn.f90 | 4 +- src/MNH/modn_backup.f90 | 2 +- src/MNH/modn_blankn.f90 | 4 +- src/MNH/modn_budget.f90 | 4 +- src/MNH/modn_ch_model0d.f90 | 26 +- src/MNH/modn_condsamp.f90 | 8 +- src/MNH/modn_conf.f90 | 4 +- src/MNH/modn_confn.f90 | 4 +- src/MNH/modn_diag_blank.f90 | 4 +- src/MNH/modn_dragn.f90 | 2 +- src/MNH/modn_dyn.f90 | 4 +- src/MNH/modn_dynn.f90 | 4 +- src/MNH/modn_elec.f90 | 6 +- src/MNH/modn_frc.f90 | 4 +- src/MNH/modn_ibm_paramn.f90 | 4 +- src/MNH/modn_lbcn.f90 | 4 +- src/MNH/modn_les.f90 | 4 +- src/MNH/modn_lunitn.f90 | 2 +- src/MNH/modn_mean.f90 | 4 +- src/MNH/modn_nesting.f90 | 4 +- src/MNH/modn_nudgingn.f90 | 4 +- src/MNH/modn_output.f90 | 2 +- src/MNH/modn_paramn.f90 | 4 +- src/MNH/modn_paspol.f90 | 8 +- src/MNH/modn_recycl_paramn.f90 | 4 +- src/MNH/modn_viscosity.f90 | 4 +- src/MNH/nabla4.f90 | 10 +- src/MNH/nudging.f90 | 6 +- src/MNH/open_file_mnh.f90 | 4 +- src/MNH/open_nestpgd_files.f90 | 4 +- src/MNH/p_abs.f90 | 10 +- src/MNH/pack_2d_1d.f90 | 12 +- src/MNH/paspol.f90 | 52 +- src/MNH/pinter.f90 | 119 +- src/MNH/polar_calc.f90 | 12 +- src/MNH/polar_mean.f90 | 14 +- src/MNH/prep_ideal_case.f90 | 28 +- src/MNH/prep_nest_pgd.f90 | 4 +- src/MNH/prep_real_case.f90 | 4 +- src/MNH/press_height.f90 | 8 +- src/MNH/pressure_in_prep.f90 | 4 +- src/MNH/qlap.f90 | 4 +- src/MNH/rad_bound.f90 | 4 +- src/MNH/radar_c2r2.f90 | 12 +- src/MNH/radar_scattering.f90 | 12 +- src/MNH/radar_simulator.f90 | 4 +- src/MNH/radiations.f90 | 10 +- src/MNH/radiations_agg.f90 | 4 +- src/MNH/read_all_data_mesonh_case.f90 | 4 +- src/MNH/read_desfmn.f90 | 2 +- src/MNH/read_dummy_gr_fieldn.f90 | 4 +- src/MNH/read_exsegn.f90 | 2 +- src/MNH/read_field.f90 | 2 +- src/MNH/read_grid_time_mesonh_case.f90 | 4 +- src/MNH/read_prc_fmfile.f90 | 4 +- src/MNH/read_precip_field.f90 | 4 +- src/MNH/read_ver_grid.f90 | 4 +- src/MNH/rel_forcingn.f90 | 8 +- src/MNH/relax2fw_ion.f90 | 10 +- src/MNH/relaxation.f90 | 12 +- src/MNH/relaxdef.f90 | 4 +- src/MNH/removal_vortex.f90 | 6 +- src/MNH/retrieve1_nest_infon.f90 | 4 +- src/MNH/retrieve2_nest_infon.f90 | 18 +- src/MNH/richardson.f90 | 4 +- src/MNH/series_cloud_elec.f90 | 6 +- src/MNH/set_advfrc.f90 | 14 +- src/MNH/set_bogus_vortex.f90 | 22 +- src/MNH/set_cstn.f90 | 24 +- src/MNH/set_mask.f90 | 8 +- src/MNH/set_mass.f90 | 4 +- src/MNH/set_msk.f90 | 8 +- src/MNH/set_perturb.f90 | 14 +- src/MNH/set_ref.f90 | 6 +- src/MNH/set_refz.f90 | 4 +- src/MNH/set_relfrc.f90 | 14 +- src/MNH/set_rsou.f90 | 16 +- src/MNH/set_subdomain.f90 | 4 +- src/MNH/shuman.f90 | 26 +- src/MNH/slow_terms.f90 | 12 +- src/MNH/spawn_model2.f90 | 16 +- src/MNH/split_grid_parameter_mnh.f90 | 4 +- src/MNH/subl_blowsnow.f90 | 4 +- src/MNH/sum_on_all_procs_mnh.f90 | 4 +- src/MNH/sum_on_all_procs_mnh_hal.f90 | 4 +- src/MNH/sunposn.f90 | 4 +- src/MNH/surf_rad_modif.f90 | 4 +- src/MNH/surf_solar_geom.f90 | 4 +- src/MNH/surf_solar_shadows.f90 | 4 +- src/MNH/surf_solar_slopes.f90 | 4 +- src/MNH/surf_solar_sum.f90 | 4 +- src/MNH/switch_sbg_lesn.f90 | 9 +- src/MNH/therm_wind_bal.f90 | 4 +- src/MNH/thetavpu_thetavpm.f90 | 8 +- src/MNH/to_elec_fieldn.f90 | 10 +- src/MNH/total_dmass.f90 | 6 +- src/MNH/tridz.f90 | 4 +- src/MNH/unpack_1d_2d.f90 | 12 +- src/MNH/update_metrics.f90 | 4 +- src/MNH/update_welford.f90 | 4 +- src/MNH/upstream_z.f90 | 4 +- src/MNH/ver_interp_lin.f90 | 8 +- src/MNH/ver_shift.f90 | 4 +- src/MNH/vert_coord.f90 | 8 +- src/MNH/viscosity.f90 | 10 +- src/MNH/vqzcolx.f90 | 6 +- src/MNH/water_sum.f90 | 4 +- src/MNH/windcalc.f90 | 6 +- src/MNH/write_balloonn.f90 | 4 +- src/MNH/write_desfmn.f90 | 2 +- src/MNH/write_dummy_gr_fieldn.f90 | 6 +- src/MNH/write_hgrid.f90 | 8 +- src/MNH/write_hgridn.f90 | 4 +- src/MNH/write_lbn.f90 | 4 +- src/MNH/write_lfifm1_for_diag.f90 | 4 +- src/MNH/write_lfifm1_for_diag_supp.f90 | 4 +- src/MNH/write_lfin.f90 | 6 +- src/MNH/xytolatlon.f90 | 12 +- src/MNH/zdiffusetup.f90 | 8 +- src/MNH/zs_boundary.f90 | 4 +- src/MNH/zsect.f90 | 4 +- src/MNH/zsmt_pgd.f90 | 4 +- src/MNH/zsmt_pic.f90 | 4 +- 414 files changed, 2334 insertions(+), 2501 deletions(-) diff --git a/src/LIB/SURCOUCHE/src/modd_confz.f90 b/src/LIB/SURCOUCHE/src/modd_confz.f90 index 9712fe2a7..25b33b527 100644 --- a/src/LIB/SURCOUCHE/src/modd_confz.f90 +++ b/src/LIB/SURCOUCHE/src/modd_confz.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! --------- !! AUTHOR !! ------ -!! J. Escobar L.A. +!! J. Escobar L.A. !! !! MODIFICATIONS !! ------------- diff --git a/src/LIB/SURCOUCHE/src/mode_distriblb.f90 b/src/LIB/SURCOUCHE/src/mode_distriblb.f90 index 5a5c40fff..e0d261c4f 100644 --- a/src/LIB/SURCOUCHE/src/mode_distriblb.f90 +++ b/src/LIB/SURCOUCHE/src/mode_distriblb.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1998-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1998-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -92,7 +92,7 @@ END SUBROUTINE GET_DISTRIB_LB !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -303,7 +303,7 @@ END SUBROUTINE GET_DISTRIBX_LB !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 index 3302f650e..f5171d90d 100644 --- a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1998-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1998-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -2060,7 +2060,7 @@ INTEGER :: NB_REQ,NFIRST_REQ_RECV ! !* 2.1 if there is still something to send ! - IF (ASSOCIATED(TZMAILSEND)) THEN + IF (ASSOCIATED(TZMAILSEND)) THEN TZZONESEND => TZMAILSEND%TELT IF (TZZONESEND%NUMBER /= IP) THEN ! JUAN diff --git a/src/LIB/SURCOUCHE/src/mode_lb_ll.f90 b/src/LIB/SURCOUCHE/src/mode_lb_ll.f90 index eff5ff164..b41cda8ed 100644 --- a/src/LIB/SURCOUCHE/src/mode_lb_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_lb_ll.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1999-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1999-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -893,7 +893,7 @@ ! TYPE(ZONE_ll), ALLOCATABLE, DIMENSION(:) :: TZCOARSE ! Coarse grid splitting TYPE(ZONE_ll), ALLOCATABLE, DIMENSION(:) :: TZFINE, &! Fine grid splitting - TZFINEPB ! tzfine + boundary halo + TZFINEPB ! tzfine + boundary halo ! TYPE(ZONE_ll), ALLOCATABLE, DIMENSION(:) :: TZINTER ! Intermediate zone array ! @@ -903,7 +903,7 @@ ! TYPE(ZONE_ll), ALLOCATABLE, DIMENSION(:) :: TZLB ! LB points of the ! coarse grid to be - ! send to the child + ! send to the child TYPE(ZONE_ll) :: TZCHILDLB ! TYPE(LCRSPD_ll), POINTER :: TZLCRSPD, TZLTMPCRSPD, & ! temporary lists diff --git a/src/LIB/SURCOUCHE/src/mode_nest_ll.f90 b/src/LIB/SURCOUCHE/src/mode_nest_ll.f90 index e6ac68c6e..9055b0a65 100644 --- a/src/LIB/SURCOUCHE/src/mode_nest_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_nest_ll.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -1467,8 +1467,8 @@ CALL ADD_ZONE( TZP2C_DATA%TFEEDBACK_COORD, TZFEEDBACK) ! ! 3.2.4 Modification of TZP2C_DATA%TRECV_2WAY_LS%TCRSPD -! (translation with (-IXMIN+1,-IYMIN+1) vector) -! in order to haves indices between 1 and IXMAX or IYMAX +! (translation with (-IXMIN+1,-IYMIN+1) vector) +! in order to haves indices between 1 and IXMAX or IYMAX ! TZPTR => TZP2C_DATA%TRECV_2WAY_LS%TCRSPD DO WHILE(ASSOCIATED(TZPTR)) diff --git a/src/LIB/SURCOUCHE/src/mode_splitting_ll.f90 b/src/LIB/SURCOUCHE/src/mode_splitting_ll.f90 index 7f95f58a3..432a63832 100644 --- a/src/LIB/SURCOUCHE/src/mode_splitting_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_splitting_ll.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -54,7 +54,7 @@ MODULE MODE_SPLITTING_ll TYPE PRIME_DECOMPOS ! INTEGER :: NUMBER ! prime number - INTEGER :: POWER ! power of the prime number + INTEGER :: POWER ! power of the prime number ! END TYPE PRIME_DECOMPOS ! @@ -118,7 +118,7 @@ CONTAINS ! !------------------------------------------------------------------------------- ! - !* 1. ARRAY INITIALIZATION + !* 1. ARRAY INITIALIZATION ! TAB(1)%NUMBER = 2 TAB(2)%NUMBER = 3 @@ -211,7 +211,7 @@ CONTAINS ! !------------------------------------------------------------------------------- ! - !* 1. fILL-IN OF TAB + !* 1. fILL-IN OF TAB ! INTERM = N PREM = .TRUE. @@ -363,7 +363,7 @@ CONTAINS ! !------------------------------------------------------------------------------- ! - !* 1. FIND THE GREATER DIVISER OF NB_PROC + !* 1. FIND THE GREATER DIVISER OF NB_PROC ! I= INT(SQRT(REAL(NB_PROC))) DO WHILE (MOD(NB_PROC,I).NE.0) @@ -372,7 +372,7 @@ CONTAINS ! !------------------------------------------------------------------------------- ! - !* 2. AFFECT THE GREATER DIMENSION WITH THE GREATER DIVISER + !* 2. AFFECT THE GREATER DIMENSION WITH THE GREATER DIVISER ! IF (X_DIM.GE.Y_DIM) THEN IF (I.GE.(NB_PROC/I)) THEN @@ -394,7 +394,7 @@ CONTAINS ! !------------------------------------------------------------------------------- ! - !* 3. IS NB_PROC A PRIME NUMBER? + !* 3. IS NB_PROC A PRIME NUMBER? ! IF ((X_DOMAINS.EQ.1).OR.(Y_DOMAINS.EQ.1)) THEN PREM = .TRUE. @@ -411,7 +411,7 @@ CONTAINS ! ################################################################### ! !!**** *CARTESIAN* - routine which splits a domain if NB_PROC - ! is not a prime number + ! is not a prime number ! !! Purpose !! ------- @@ -463,7 +463,7 @@ CONTAINS ! !------------------------------------------------------------------------------- ! - !* 1. COMPUTE THE AVERAGE DIMENSION + !* 1. COMPUTE THE AVERAGE DIMENSION ! IDOM = 0 @@ -551,14 +551,14 @@ CONTAINS ! !------------------------------------------------------------------------------- ! - !* 1. PRIME NUMBER DECOMPOSITION OF NB_PROC + !* 1. PRIME NUMBER DECOMPOSITION OF NB_PROC ! CALL INIT_TAB(TAB) CALL DECOMPOSE(TAB,NB_PROC,PREM) ! !------------------------------------------------------------------------------- ! - !* 2. FILL THE FIELDS OF TPROC + !* 2. FILL THE FIELDS OF TPROC ! IF ((PREM).AND.(NB_PROC.GT.2)) THEN ! @@ -588,7 +588,7 @@ CONTAINS ! !------------------------------------------------------------------------------- ! - !* 3. SHIFT FROM PHYSICAL TO EXTENDED DOMAIN + !* 3. SHIFT FROM PHYSICAL TO EXTENDED DOMAIN ! TPROC(:)%NXOR = TPROC(:)%NXOR + JPHEXT TPROC(:)%NYOR = TPROC(:)%NYOR + JPHEXT @@ -662,7 +662,7 @@ CONTAINS ! !------------------------------------------------------------------------------- ! - !* 1. FIND THE SPLITTING + !* 1. FIND THE SPLITTING ! PREM = .FALSE. IF (PRESENT(KX_DOMAINS) ) THEN @@ -674,7 +674,7 @@ CONTAINS ! !------------------------------------------------------------------------------- ! - !* 2. FILL THE FIELDS OF TPROC + !* 2. FILL THE FIELDS OF TPROC ! IF(HSPLITTING.EQ."BSPLITTING") THEN !Philippe: we do not want to do that anymore diff --git a/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 b/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 index fc5c40069..259e488b6 100644 --- a/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2011-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2011-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -556,7 +556,7 @@ CONTAINS INTEGER :: P1P2(2), P1P2COORD(2) , IROW , ICOL, NROW, NCOL LOGICAL :: Lperiodic(2), remain_dims(2) , Lreorder INTEGER :: JI - INTEGER :: IXSIZE_ll ! global sizes of son domain in father grid + INTEGER :: IXSIZE_ll ! global sizes of son domain in father grid INTEGER :: IYSIZE_ll !JUANZ !JUAN @@ -831,26 +831,26 @@ CONTAINS CONTAINS SUBROUTINE COARSE_TO_FINE(TZ) - IMPLICIT NONE - - TYPE(ZONE_ll), DIMENSION(:) :: TZ ! grid splitting to transform from coarse (father) resolution/grid - ! to fien ( son ) resolution/grid + IMPLICIT NONE + + TYPE(ZONE_ll), DIMENSION(:) :: TZ ! grid splitting to transform from coarse (father) resolution/grid + ! to fien ( son ) resolution/grid - INTEGER :: J + INTEGER :: J - DO J = 1, NPROC - ! - TZ(J)%NUMBER = TZ(J)%NUMBER - TZ(J)%NXOR = (TZ(J)%NXOR - JPHEXT -1 ) * NDXRATIO_ALL(1) + JPHEXT +1 - TZ(J)%NYOR = (TZ(J)%NYOR - JPHEXT -1 ) * NDYRATIO_ALL(1) + JPHEXT +1 - TZ(J)%NXEND = (TZ(J)%NXEND - JPHEXT ) * NDXRATIO_ALL(1) + JPHEXT - TZ(J)%NYEND = (TZ(J)%NYEND - JPHEXT ) * NDYRATIO_ALL(1) + JPHEXT - !JUAN Z_SPLITTING - TZ(J)%NZOR = TZ(J)%NZOR - TZ(J)%NZEND = TZ(J)%NZEND - !JUAN Z_SPLITTING - ! - ENDDO + DO J = 1, NPROC + ! + TZ(J)%NUMBER = TZ(J)%NUMBER + TZ(J)%NXOR = (TZ(J)%NXOR - JPHEXT -1 ) * NDXRATIO_ALL(1) + JPHEXT +1 + TZ(J)%NYOR = (TZ(J)%NYOR - JPHEXT -1 ) * NDYRATIO_ALL(1) + JPHEXT +1 + TZ(J)%NXEND = (TZ(J)%NXEND - JPHEXT ) * NDXRATIO_ALL(1) + JPHEXT + TZ(J)%NYEND = (TZ(J)%NYEND - JPHEXT ) * NDYRATIO_ALL(1) + JPHEXT + !JUAN Z_SPLITTING + TZ(J)%NZOR = TZ(J)%NZOR + TZ(J)%NZEND = TZ(J)%NZEND + !JUAN Z_SPLITTING + ! + ENDDO END SUBROUTINE COARSE_TO_FINE diff --git a/src/LIB/SURCOUCHE/src/mode_toolsz_ll.f90 b/src/LIB/SURCOUCHE/src/mode_toolsz_ll.f90 index ac917b492..c0ad5900b 100644 --- a/src/LIB/SURCOUCHE/src/mode_toolsz_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_toolsz_ll.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1998-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1998-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -61,7 +61,7 @@ !################################################################### ! !!**** *CARTESIAN* - routine which splits a domain if NB_PROC - ! is not a prime number + ! is not a prime number ! !! Purpose !! ------- @@ -117,12 +117,12 @@ ! !------------------------------------------------------------------------------- ! - !* 1. COMPUTE THE AVERAGE DIMENSION + !* 1. COMPUTE THE AVERAGE DIMENSION ! ! !------------------------------------------------------------------------------- ! - !* 2. FILL THE FIELDS OF TPROC + !* 2. FILL THE FIELDS OF TPROC ! IF ( KORDER .EQ. 321 ) THEN ! ZYX MAPPING ZORDER = 1 ; YORDER = Z_DOMAINS ; XORDER = Z_DOMAINS * Y_DOMAINS @@ -263,7 +263,7 @@ ! !------------------------------------------------------------------------------- ! - !* 1. FIND THE SPLITTING in XY & Z + !* 1. FIND THE SPLITTING in XY & Z ! ! CALL DEF_SPLITTINGZ(X_DOMAINS,Y_DOMAINS,Z_DOMAINS,X_DIM,Y_DIM,Z_DIM,NB_PROC,KZ_PROC,PREM) IF (PRESENT(KX_DOMAINS) ) THEN @@ -280,7 +280,7 @@ ! !------------------------------------------------------------------------------- ! - !* 2. FILL THE FIELDS OF TPROC + !* 2. FILL THE FIELDS OF TPROC ! IF(HSPLITTING.EQ."P2P1SPLITT") THEN IF ((PREM).AND.(NB_PROC_XY.GT.2)) THEN @@ -897,9 +897,9 @@ ITIC = - ITIC JII= 1+ MOD(KPROC+ITIC*(JI/2)+IP-1,KPROC) IF(TZINTER(JII)%NUMBER.NE.0) THEN - NSEND = NSEND + 1 - ISEND(NSEND)=JII - ENDIF + NSEND = NSEND + 1 + ISEND(NSEND)=JII + ENDIF ENDDO IF (KDIR .EQ. SEND_DIR) THEN JB = NSEND ; JE = 1 ; JINC = -1 diff --git a/src/LIB/SURCOUCHE/src/modn_confz.f90 b/src/LIB/SURCOUCHE/src/modn_confz.f90 index 393815444..72bab943a 100644 --- a/src/LIB/SURCOUCHE/src/modn_confz.f90 +++ b/src/LIB/SURCOUCHE/src/modn_confz.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! J. Escobar L.A. +!! J. Escobar L.A. !! !! MODIFICATIONS !! ------------- diff --git a/src/LIB/SURCOUCHE/src/update_nhalo1d.f90 b/src/LIB/SURCOUCHE/src/update_nhalo1d.f90 index 08781bb4b..95cdbb343 100644 --- a/src/LIB/SURCOUCHE/src/update_nhalo1d.f90 +++ b/src/LIB/SURCOUCHE/src/update_nhalo1d.f90 @@ -30,7 +30,7 @@ !! !! AUTHOR !! ------ -!! M.Moge *LA - CNRS* +!! M.Moge *LA - CNRS* !! !! MODIFICATIONS !! ------------- @@ -106,7 +106,7 @@ INTEGER :: J INTEGER :: INBMSG INTEGER :: ICARD INTEGER :: ICARDDIF -INTEGER :: IISIZE, IJSIZE, IKSIZE ! local sizes of the field +INTEGER :: IISIZE, IJSIZE, IKSIZE ! local sizes of the field INTEGER :: IXOR_ll, IYOR_ll, IZOR_ll, IXEND_ll, IYEND_ll, IZEND_ll ! origin and end of local physical subdomain REAL, DIMENSION(:,:,:), ALLOCATABLE :: PFIELD3D ! field to be updated INTEGER , DIMENSION(NPROC) :: IXORARRAY_ALL, IYORARRAY_ALL, IXENDARRAY_ALL, IYENDARRAY_ALL ! array containing origin and end of each subdomain in local coordinates @@ -124,7 +124,7 @@ INTEGER , DIMENSION(NPROC) :: IRECVCOUNTS !nteger array containing the number of ! RETURN !ENDIF !! -!! we assume that the sizes are correct +!! we assume that the sizes are correct !! ALLOCATE(TZSPLITTING_PHYS(NPROC),TZSPLITTING_EXT(NPROC)) !------------------------------------------------------------------------------ diff --git a/src/MNH/BASIC.f90 b/src/MNH/BASIC.f90 index 0ae237052..871e73ff3 100644 --- a/src/MNH/BASIC.f90 +++ b/src/MNH/BASIC.f90 @@ -316,98 +316,98 @@ ! ! the prognostic chemical species are the following ... ! -! 1. O3 PCONC(:,1) -! 2. H2O2 PCONC(:,2) -! 3. NO PCONC(:,3) -! 4. NO2 PCONC(:,4) -! 5. NO3 PCONC(:,5) -! 6. N2O5 PCONC(:,6) -! 7. HONO PCONC(:,7) -! 8. HNO3 PCONC(:,8) -! 9. HNO4 PCONC(:,9) -! 10. NH3 PCONC(:,10) -! 11. DMS PCONC(:,11) -! 12. SO2 PCONC(:,12) -! 13. SULF PCONC(:,13) -! 14. CO PCONC(:,14) -! 15. OH PCONC(:,15) -! 16. HO2 PCONC(:,16) -! 17. CH4 PCONC(:,17) -! 18. ETH PCONC(:,18) -! 19. ALKA PCONC(:,19) -! 20. ALKE PCONC(:,20) -! 21. BIO PCONC(:,21) -! 22. ARO PCONC(:,22) -! 23. HCHO PCONC(:,23) -! 24. ALD PCONC(:,24) -! 25. KET PCONC(:,25) -! 26. CARBO PCONC(:,26) -! 27. ONIT PCONC(:,27) -! 28. PAN PCONC(:,28) -! 29. OP1 PCONC(:,29) -! 30. OP2 PCONC(:,30) -! 31. ORA1 PCONC(:,31) -! 32. ORA2 PCONC(:,32) -! 33. MO2 PCONC(:,33) -! 34. ALKAP PCONC(:,34) -! 35. ALKEP PCONC(:,35) -! 36. BIOP PCONC(:,36) -! 37. PHO PCONC(:,37) -! 38. ADD PCONC(:,38) -! 39. AROP PCONC(:,39) -! 40. CARBOP PCONC(:,40) -! 41. OLN PCONC(:,41) -! 42. XO2 PCONC(:,42) -! 43. WC_O3 PCONC(:,43) -! 44. WC_H2O2 PCONC(:,44) -! 45. WC_NO PCONC(:,45) -! 46. WC_NO2 PCONC(:,46) -! 47. WC_NO3 PCONC(:,47) -! 48. WC_N2O5 PCONC(:,48) -! 49. WC_HONO PCONC(:,49) -! 50. WC_HNO3 PCONC(:,50) -! 51. WC_HNO4 PCONC(:,51) -! 52. WC_NH3 PCONC(:,52) -! 53. WC_OH PCONC(:,53) -! 54. WC_HO2 PCONC(:,54) -! 55. WC_CO2 PCONC(:,55) -! 56. WC_SO2 PCONC(:,56) -! 57. WC_SULF PCONC(:,57) -! 58. WC_HCHO PCONC(:,58) -! 59. WC_ORA1 PCONC(:,59) -! 60. WC_ORA2 PCONC(:,60) -! 61. WC_MO2 PCONC(:,61) -! 62. WC_OP1 PCONC(:,62) -! 63. WC_ASO3 PCONC(:,63) -! 64. WC_ASO4 PCONC(:,64) -! 65. WC_ASO5 PCONC(:,65) -! 66. WC_AHSO5 PCONC(:,66) -! 67. WC_AHMS PCONC(:,67) -! 68. WR_O3 PCONC(:,68) -! 69. WR_H2O2 PCONC(:,69) -! 70. WR_NO PCONC(:,70) -! 71. WR_NO2 PCONC(:,71) -! 72. WR_NO3 PCONC(:,72) -! 73. WR_N2O5 PCONC(:,73) -! 74. WR_HONO PCONC(:,74) -! 75. WR_HNO3 PCONC(:,75) -! 76. WR_HNO4 PCONC(:,76) -! 77. WR_NH3 PCONC(:,77) -! 78. WR_OH PCONC(:,78) -! 79. WR_HO2 PCONC(:,79) -! 80. WR_CO2 PCONC(:,80) -! 81. WR_SO2 PCONC(:,81) -! 82. WR_SULF PCONC(:,82) -! 83. WR_HCHO PCONC(:,83) -! 84. WR_ORA1 PCONC(:,84) -! 85. WR_ORA2 PCONC(:,85) -! 86. WR_MO2 PCONC(:,86) -! 87. WR_OP1 PCONC(:,87) -! 88. WR_ASO3 PCONC(:,88) -! 89. WR_ASO4 PCONC(:,89) -! 90. WR_ASO5 PCONC(:,90) -! 91. WR_AHSO5 PCONC(:,91) -! 92. WR_AHMS PCONC(:,92) +! 1. O3 PCONC(:,1) +! 2. H2O2 PCONC(:,2) +! 3. NO PCONC(:,3) +! 4. NO2 PCONC(:,4) +! 5. NO3 PCONC(:,5) +! 6. N2O5 PCONC(:,6) +! 7. HONO PCONC(:,7) +! 8. HNO3 PCONC(:,8) +! 9. HNO4 PCONC(:,9) +! 10. NH3 PCONC(:,10) +! 11. DMS PCONC(:,11) +! 12. SO2 PCONC(:,12) +! 13. SULF PCONC(:,13) +! 14. CO PCONC(:,14) +! 15. OH PCONC(:,15) +! 16. HO2 PCONC(:,16) +! 17. CH4 PCONC(:,17) +! 18. ETH PCONC(:,18) +! 19. ALKA PCONC(:,19) +! 20. ALKE PCONC(:,20) +! 21. BIO PCONC(:,21) +! 22. ARO PCONC(:,22) +! 23. HCHO PCONC(:,23) +! 24. ALD PCONC(:,24) +! 25. KET PCONC(:,25) +! 26. CARBO PCONC(:,26) +! 27. ONIT PCONC(:,27) +! 28. PAN PCONC(:,28) +! 29. OP1 PCONC(:,29) +! 30. OP2 PCONC(:,30) +! 31. ORA1 PCONC(:,31) +! 32. ORA2 PCONC(:,32) +! 33. MO2 PCONC(:,33) +! 34. ALKAP PCONC(:,34) +! 35. ALKEP PCONC(:,35) +! 36. BIOP PCONC(:,36) +! 37. PHO PCONC(:,37) +! 38. ADD PCONC(:,38) +! 39. AROP PCONC(:,39) +! 40. CARBOP PCONC(:,40) +! 41. OLN PCONC(:,41) +! 42. XO2 PCONC(:,42) +! 43. WC_O3 PCONC(:,43) +! 44. WC_H2O2 PCONC(:,44) +! 45. WC_NO PCONC(:,45) +! 46. WC_NO2 PCONC(:,46) +! 47. WC_NO3 PCONC(:,47) +! 48. WC_N2O5 PCONC(:,48) +! 49. WC_HONO PCONC(:,49) +! 50. WC_HNO3 PCONC(:,50) +! 51. WC_HNO4 PCONC(:,51) +! 52. WC_NH3 PCONC(:,52) +! 53. WC_OH PCONC(:,53) +! 54. WC_HO2 PCONC(:,54) +! 55. WC_CO2 PCONC(:,55) +! 56. WC_SO2 PCONC(:,56) +! 57. WC_SULF PCONC(:,57) +! 58. WC_HCHO PCONC(:,58) +! 59. WC_ORA1 PCONC(:,59) +! 60. WC_ORA2 PCONC(:,60) +! 61. WC_MO2 PCONC(:,61) +! 62. WC_OP1 PCONC(:,62) +! 63. WC_ASO3 PCONC(:,63) +! 64. WC_ASO4 PCONC(:,64) +! 65. WC_ASO5 PCONC(:,65) +! 66. WC_AHSO5 PCONC(:,66) +! 67. WC_AHMS PCONC(:,67) +! 68. WR_O3 PCONC(:,68) +! 69. WR_H2O2 PCONC(:,69) +! 70. WR_NO PCONC(:,70) +! 71. WR_NO2 PCONC(:,71) +! 72. WR_NO3 PCONC(:,72) +! 73. WR_N2O5 PCONC(:,73) +! 74. WR_HONO PCONC(:,74) +! 75. WR_HNO3 PCONC(:,75) +! 76. WR_HNO4 PCONC(:,76) +! 77. WR_NH3 PCONC(:,77) +! 78. WR_OH PCONC(:,78) +! 79. WR_HO2 PCONC(:,79) +! 80. WR_CO2 PCONC(:,80) +! 81. WR_SO2 PCONC(:,81) +! 82. WR_SULF PCONC(:,82) +! 83. WR_HCHO PCONC(:,83) +! 84. WR_ORA1 PCONC(:,84) +! 85. WR_ORA2 PCONC(:,85) +! 86. WR_MO2 PCONC(:,86) +! 87. WR_OP1 PCONC(:,87) +! 88. WR_ASO3 PCONC(:,88) +! 89. WR_ASO4 PCONC(:,89) +! 90. WR_ASO5 PCONC(:,90) +! 91. WR_AHSO5 PCONC(:,91) +! 92. WR_AHMS PCONC(:,92) ! !======================================================================== ! diff --git a/src/MNH/abdulrazzak.f90 b/src/MNH/abdulrazzak.f90 index 795a2b4d9..ce376b7ad 100644 --- a/src/MNH/abdulrazzak.f90 +++ b/src/MNH/abdulrazzak.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -178,7 +178,7 @@ REAL :: ALAT1,ALAT2 ! vaporisation latent heat calculation REAL :: PI ! pi value REAL :: XMW, XMA ! water and air molecular weight REAL :: CP ! calorific capacity at constant pressure -REAL :: TZ0 ! temperature 0°C in Kelvin +REAL :: TZ0 ! temperature 0 Celsius in Kelvin REAL :: RR ! universal gas constant REAL :: RD ! gas constant of dry air REAL :: RV ! gas constant of water vapor @@ -188,7 +188,7 @@ REAL :: RHOW ! volumetric mass of water ! dynamics variables REAL, DIMENSION(SIZE(PN0,1)) :: TEMP ! temperature (K) REAL, DIMENSION(SIZE(PN0,1)) :: P ! pressure (hPa) -REAL, DIMENSION(SIZE(PN0,1)) :: w ! vertical velocity (m/s) +REAL, DIMENSION(SIZE(PN0,1)) :: w ! vertical velocity (m/s) REAL, DIMENSION(SIZE(PN0,1)) :: PSIRAD ! Latent condensation heat @@ -469,9 +469,9 @@ ENDDO PNCN(:,:) = MAX(XNNUCS(:,:), 0.) PMCN(:,:) = MAX(xmapac(:,:), 0.) -IF(PRESENT(PT0)) PT0(:)= ZTO(:) !! en g/s² Variable for diaprog synchronic +IF(PRESENT(PT0)) PT0(:)= ZTO(:) !! en g/s� Variable for diaprog synchronic -!!Calcul de la fraction activée par mode +!!Calcul de la fraction activ�e par mode IF(PRESENT(PFRACT_ACT1)) PFRACT_ACT1(:) = (PNCN(:,1) / PN0(:,1))*100 !! en % Variable for diaprog synchronic IF(PRESENT(PFRACT_ACT2)) PFRACT_ACT2(:) = (PNCN(:,2) / PN0(:,2))*100 !! en % Variable for diaprog synchronic diff --git a/src/MNH/adv_boundaries.f90 b/src/MNH/adv_boundaries.f90 index 2dd15d81d..5ad63acfa 100644 --- a/src/MNH/adv_boundaries.f90 +++ b/src/MNH/adv_boundaries.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -33,7 +33,7 @@ END MODULE MODI_ADV_BOUNDARIES !! AUTHOR !! ------ !! V.Masson -!! Correction : +!! Correction : !! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 !! C.Lac : 10/16 : top BC for W !------------------------------------------------------------------------------- diff --git a/src/MNH/adv_forcingn.f90 b/src/MNH/adv_forcingn.f90 index 7b7605f1f..4f47a066c 100644 --- a/src/MNH/adv_forcingn.f90 +++ b/src/MNH/adv_forcingn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2010-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2010-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -79,7 +79,7 @@ END MODULE MODI_ADV_FORCING_n !! !! AUTHOR !! ------ -!! M. Tomasini (CNRM) from forcing.f90 +!! M. Tomasini (CNRM) from forcing.f90 !! and P.Peyrille (CNRM) !! !! MODIFICATIONS @@ -179,7 +179,7 @@ IF (GSFIRSTCALL) THEN END IF ! !* 2. INTEGRATION OF TH and RV ADVECTING FORCINGS TENDANCY IN THE SOURCES -! --------------------------------------------------------------------- +! --------------------------------------------------------------------- ! ! 2.1 Temporal interpolation of each term ! ------------------------------------------ @@ -222,7 +222,7 @@ END IF ! ! !* 3. BUDGET CALLS -! ------------ +! ------------ if ( lbudget_th ) call Budget_store_end( tbudgets(NBUDGET_TH), '2DADV', prths(:, :, :) ) if ( lbudget_rv ) call Budget_store_end( tbudgets(NBUDGET_RV), '2DADV', prrs (:, :, :, 1) ) diff --git a/src/MNH/advec_3rd_order_aux.f90 b/src/MNH/advec_3rd_order_aux.f90 index 078fca67f..cc3adc25f 100644 --- a/src/MNH/advec_3rd_order_aux.f90 +++ b/src/MNH/advec_3rd_order_aux.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -8,7 +8,7 @@ !! AUTHOR !! ------ !! -!! Correction : +!! Correction : !! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 !------------------------------------------------------------------------------- ! diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90 index f6d9d08e7..f49248363 100644 --- a/src/MNH/advection_metsv.f90 +++ b/src/MNH/advection_metsv.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -107,8 +107,8 @@ END MODULE MODI_ADVECTION_METSV !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* -!! J.-P. Lafore * Meteo France * +!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Lafore * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -288,7 +288,7 @@ TYPE(TFIELDMETADATA) :: TZFIELD !------------------------------------------------------------------------------- ! !* 0. INITIALIZATION -! -------------- +! -------------- GTKE=(SIZE(PTKET)/=0) @@ -327,7 +327,7 @@ ENDIF !------------------------------------------------------------------------------- ! !* 2. COMPUTES THE CONTRAVARIANT COMPONENTS (FOR PPM ONLY) -! -------------------------------------- +! -------------------------------------- ! !* 2.1 computes contravariant components ! @@ -498,7 +498,7 @@ ZRWCPPM = ZRWCPPM*ZTSTEP_PPM ! ! !* 3. COMPUTES THE TENDENCIES SINCE THE BEGINNING OF THE TIME STEP -! ------------------------------------------------------------ +! ------------------------------------------------------------ ! !* This represent the effects of all OTHER processes ! Clouds related processes from previous time-step are taken into account in PRTHS_CLD @@ -552,7 +552,7 @@ NULLIFY(TZFIELDS0_ll) !------------------------------------------------------------------------------- ! !* 4. CALLS THE PPM ADVECTION INSIDE A TIME SPLITTING -! -------------------------------------- +! -------------------------------------- ! CALL PPM_RHODJ(HLBCX,HLBCY, ZRUCPPM, ZRVCPPM, ZRWCPPM, & ZTSTEP_PPM, PRHODJ, ZRHOX1, ZRHOX2, ZRHOY1, ZRHOY2, & @@ -697,7 +697,7 @@ END IF !------------------------------------------------------------------------------- ! !* 5. BUDGETS -! ------- +! ------- ! if ( lbudget_th ) call Budget_store_end( tbudgets(NBUDGET_TH ), 'ADV', prths (:, :, :) ) if ( lbudget_tke ) call Budget_store_end( tbudgets(NBUDGET_TKE), 'ADV', prtkes(:, :, :) ) diff --git a/src/MNH/advection_uvw.f90 b/src/MNH/advection_uvw.f90 index 8b05aa480..eb54d88ef 100644 --- a/src/MNH/advection_uvw.f90 +++ b/src/MNH/advection_uvw.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -74,8 +74,8 @@ END MODULE MODI_ADVECTION_UVW !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* -!! J.-P. Lafore * Meteo France * +!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Lafore * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -188,7 +188,7 @@ TYPE(LIST_ll), POINTER :: TZFIELDS0_ll ! list of fields to exchange !------------------------------------------------------------------------------- ! !* 0. INITIALIZATION -! -------------- +! -------------- ! IKE = SIZE(PWT,3) - JPVEXT ! @@ -203,7 +203,7 @@ if ( lbudget_w ) call Budget_store_init( tbudgets(NBUDGET_W), 'ADV', prws(:, :, !------------------------------------------------------------------------------- ! !* 1. COMPUTES THE CONTRAVARIANT COMPONENTS -! ------------------------------------- +! ------------------------------------- ! ZRUT = PUT(:,:,:) * ZMXM_RHODJ ZRVT = PVT(:,:,:) * ZMYM_RHODJ @@ -232,7 +232,7 @@ NULLIFY(TZFIELDS_ll) ! ! !* 2. COMPUTES THE TENDENCIES SINCE THE BEGINNING OF THE TIME STEP -! ------------------------------------------------------------ +! ------------------------------------------------------------ ! ZRUS_OTHER = PRUS - ZRUT / PTSTEP + PRUS_PRES ZRVS_OTHER = PRVS - ZRVT / PTSTEP + PRVS_PRES @@ -275,7 +275,7 @@ ZW = PWT ! ! !* 3. TIME SPLITTING -! -------------- +! -------------- ! DO JSPL=1,ISPLIT ! @@ -319,7 +319,7 @@ END DO ! ! !* 4. BUDGETS -! ------- +! ------- ! if ( lbudget_u ) call Budget_store_end( tbudgets(NBUDGET_U), 'ADV', prus(:, :, :) ) if ( lbudget_v ) call Budget_store_end( tbudgets(NBUDGET_V), 'ADV', prvs(:, :, :) ) diff --git a/src/MNH/advection_uvw_cen.f90 b/src/MNH/advection_uvw_cen.f90 index ac9c7f56d..e635715a2 100644 --- a/src/MNH/advection_uvw_cen.f90 +++ b/src/MNH/advection_uvw_cen.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2013-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2013-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -82,7 +82,7 @@ END MODULE MODI_ADVECTION_UVW_CEN !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -184,7 +184,7 @@ ZMYM_RHODJ = MYM(PRHODJ) ZMZM_RHODJ = MZM(PRHODJ) ! !* 1. COMPUTES THE CONTRAVARIANT COMPONENTS -! ------------------------------------- +! ------------------------------------- ! ZRUT = PUT(:,:,:) * ZMXM_RHODJ ZRVT = PVT(:,:,:) * ZMYM_RHODJ @@ -209,7 +209,7 @@ NULLIFY(TZFIELDS_ll) !------------------------------------------------------------------------------- ! !* 2. TERM FROM PREVIOUS TIME-STEP (from initial_guess) -! ---------------------------- +! ---------------------------- ! ZRUS(:,:,:) = PUM(:,:,:) * ZMXM_RHODJ/(2.*PTSTEP) ZRVS(:,:,:) = PVM(:,:,:) * ZMYM_RHODJ/(2.*PTSTEP) @@ -218,7 +218,7 @@ ZRWS(:,:,:) = PWM(:,:,:) * ZMZM_RHODJ/(2.*PTSTEP) !------------------------------------------------------------------------------- ! !* 3. CALLS THE ADVECTION ROUTINES FOR THE MOMENTUM -! --------------------------------------------- +! --------------------------------------------- ! ! choose between 2nd and 4th order momentum advection. IF (HUVW_ADV_SCHEME=='CEN2ND' ) THEN @@ -238,7 +238,7 @@ ZWS = ZRWS(:,:,:)/ZMZM_RHODJ*2.*PTSTEP !------------------------------------------------------------------------------- ! !* 5. Extracts the variation between current and future time step -! ----------------------------------------------------------- +! ----------------------------------------------------------- ! PRUS(:,:,:) = PRUS(:,:,:) + ( ZUS(:,:,:) - PUM(:,:,:) - 0.5* PDUM) * ZMXM_RHODJ/(PTSTEP) PRVS(:,:,:) = PRVS(:,:,:) + ( ZVS(:,:,:) - PVM(:,:,:) - 0.5* PDVM) * ZMYM_RHODJ/(PTSTEP) diff --git a/src/MNH/advecuvw_2nd.f90 b/src/MNH/advecuvw_2nd.f90 index a8313c2f5..c962fe9cb 100644 --- a/src/MNH/advecuvw_2nd.f90 +++ b/src/MNH/advecuvw_2nd.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -75,8 +75,8 @@ END MODULE MODI_ADVECUVW_2ND !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* -!! J.-P. Lafore * Meteo France * +!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Lafore * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -115,7 +115,7 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRUS, PRVS, PRWS ! Sources of Momentu !------------------------------------------------------------------------------- ! !* 1. COMPUTES THE ADVECTIVE TENDANCIES -! --------------------------------- +! --------------------------------- ! PRUS(:,:,:) = PRUS(:,:,:) & -DXM( MXF(PRUCT(:,:,:))*MXF(PUT(:,:,:)) ) diff --git a/src/MNH/advecuvw_rk.f90 b/src/MNH/advecuvw_rk.f90 index c9f6bda99..ba99ecf23 100644 --- a/src/MNH/advecuvw_rk.f90 +++ b/src/MNH/advecuvw_rk.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -81,8 +81,8 @@ END MODULE MODI_ADVECUVW_RK !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* -!! J.-P. Lafore * Meteo France * +!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Lafore * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/advecuvw_weno_k.f90 b/src/MNH/advecuvw_weno_k.f90 index 704b470ea..2c5f58009 100644 --- a/src/MNH/advecuvw_weno_k.f90 +++ b/src/MNH/advecuvw_weno_k.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2013-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2013-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -47,8 +47,8 @@ END MODULE MODI_ADVECUVW_WENO_K !! MODIFICATIONS !! ------------- !! J.Escobar 21/03/2013: for HALOK comment all NHALO=1 tests -!! T.Lunet 02/10/2014: add get_halo for WENO 5 -!! suppress comment of NHALO=1 tests +!! T.Lunet 02/10/2014: add get_halo for WENO 5 +!! suppress comment of NHALO=1 tests !! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 !! !------------------------------------------------------------------------------- diff --git a/src/MNH/aer_clim_surf.f90 b/src/MNH/aer_clim_surf.f90 index fc6af75af..d2b7d9754 100644 --- a/src/MNH/aer_clim_surf.f90 +++ b/src/MNH/aer_clim_surf.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -45,7 +45,7 @@ END MODULE MODI_AER_CLIM_SURF !! !! AUTHOR !! ------ -!! V. Masson : extract the Aerosol initialization by surface types from ini_radiation_ecmwf.f90 routine +!! V. Masson : extract the Aerosol initialization by surface types from ini_radiation_ecmwf.f90 routine !! !! MODIFICATIONS !! ------------- @@ -108,7 +108,7 @@ CALL GET_INDICE_ll (IIB,IJB,IIE,IJE) !------------------------------------------------------------------------------- ! !* 7. INITIALIZES THE ECMWF RADIATION PACKAGE -! ------------------------------------------------ +! ------------------------------------------------ ! ! AEROSOLS from SURFACE FRACTIONS ! diff --git a/src/MNH/aerozon.f90 b/src/MNH/aerozon.f90 index 899da024a..0678c9265 100644 --- a/src/MNH/aerozon.f90 +++ b/src/MNH/aerozon.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -133,7 +133,7 @@ END MODULE MODI_AEROZON !! !! AUTHOR !! ------ -!! P. Peyrille +!! P. Peyrille !! !! MODIFICATIONS !! ------------- @@ -294,7 +294,7 @@ END IF !------------------------------------------------------------------------------- ! !* 2. COMPUTES THE SOLAR DECLINATION ANGLE -! ------------------------------------ +! ------------------------------------ ! ZDECSOL = 0.006918-0.399912*COS(ZAD) +0.070257*SIN(ZAD) & -0.006758*COS(2.*ZAD)+0.000907*SIN(2.*ZAD) & @@ -305,7 +305,7 @@ PCOSDEL = COS(ZDECSOL) !------------------------------------------------------------------------------- ! !* 3. COMPUTES THE SIDERAL HOUR CORRECTION -! ------------------------------------ +! ------------------------------------ ! ZA1 = (1.00554*ZDATE- 6.28306)*(XPI/180.0) ZA2 = (1.93946*ZDATE+23.35089)*(XPI/180.0) @@ -314,7 +314,7 @@ PTSIDER = (7.67825*SIN(ZA1)+10.09176*SIN(ZA2)) / 60.0 !------------------------------------------------------------------------------- ! !* 4. COMPUTES THE DAILY SOLAR CONSTANT CORRECTION -! -------------------------------------------- +! -------------------------------------------- ! PCORSOL = 1.00011+0.034221*COS(ZAD) +0.001280*SIN(ZAD) & +0.000719*COS(2.*ZAD)+0.000077*SIN(2.*ZAD) @@ -322,7 +322,7 @@ PCORSOL = 1.00011+0.034221*COS(ZAD) +0.001280*SIN(ZAD) & !------------------------------------------------------------------------------- ! !* 8. INITIALIZE RADIATIVELY ACTIVE COMPOUNDS (3D FIELDS) -! ------------------------------------------------------ +! ------------------------------------------------------ ! !* 8.1 set up for grid dependant quantitites (from initial state) ! diff --git a/src/MNH/ares.fx90 b/src/MNH/ares.fx90 index 9e7159915..771bb289e 100644 --- a/src/MNH/ares.fx90 +++ b/src/MNH/ares.fx90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1987-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1987-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -1081,9 +1081,9 @@ C234567 real(kind=MNHREAL64) yy1,yy2,yy3 real(kind=MNHREAL64) costh, sinth data sqrt3/1.732050808/, one3rd/0.333333333/ - a2sq=a2*a2 - qq=(a2sq-3.*a1)/9. - rr=( a2*(2.*a2sq - 9.*a1) + 27.*a0 )/54. + a2sq=a2*a2 + qq=(a2sq-3.*a1)/9. + rr=( a2*(2.*a2sq - 9.*a1) + 27.*a0 )/54. * CASE 1 THREE REAL ROOTS or CASE 2 ONLY ONE REAL ROOT dum1=qq*qq*qq rrsq=rr*rr @@ -1097,7 +1097,7 @@ C write(10,*) ' cubic phi small, phi = ',phi crutes(2) = 0.0 crutes(3) = 0.0 nr = 0 - stop + stop end if theta=acos(rr/phi)/3.0 costh = cos(theta) @@ -1133,8 +1133,8 @@ C NOW HERE WE HAVE ONLY ONE REAL ROOT crutes(3)=0. nr=1 end if - return - end ! cubic + return + end ! cubic c ////////////////////////// diff --git a/src/MNH/barnes_filter.f90 b/src/MNH/barnes_filter.f90 index 2b5a08d57..eb2cdb95c 100644 --- a/src/MNH/barnes_filter.f90 +++ b/src/MNH/barnes_filter.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -66,7 +66,7 @@ END MODULE MODI_BARNES_FILTER !! !! AUTHOR !! ------ -!! O. Nuissier * L.A. * +!! O. Nuissier * L.A. * !! R. Rogers * NOAA/AOML/HRD * !! !! MODIFICATIONS @@ -104,7 +104,7 @@ INTEGER :: JI,JJ,JK,JI2,JJ2 ! Loop indexes ! !------------------------------------------------------------------------------- ! -!* 1. SET CONSTANTS +!* 1. SET CONSTANTS ! ------------- ! IIX=SIZE(PDATIN,1) @@ -129,7 +129,7 @@ PGRDATA(:,:,:) = 0. DO JJ = 1, IIY DO JI = 1, IIX ! -!* 2.1 Define max and min values to limit the number of the grid points +!* 2.1 Define max and min values to limit the number of the grid points ! to be considered ! IMAXI = MIN(JI+KX,IIX) diff --git a/src/MNH/beambroad.f90 b/src/MNH/beambroad.f90 index 88acba47b..cdad5d7df 100644 --- a/src/MNH/beambroad.f90 +++ b/src/MNH/beambroad.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -55,7 +55,7 @@ END MODULE MODI_BEAMBROAD !! !! AUTHOR !! ------ -!! O. Caumont * Météo-France * +!! O. Caumont * M�t�o-France * !! !! MODIFICATIONS !! ------------- @@ -88,7 +88,7 @@ REAL :: ZVTEMP ! !* 1. INITIALIZATION -! -------------- +! -------------- INBRAD=SIZE(PDISCR,1) INPTS_H=SIZE(PDISCR,5) INPTS_V=SIZE(PDISCR,6) @@ -96,7 +96,7 @@ PSINGPT(:,:,:,:)=0. ! !* 2. CALCULATIONS -! -------------- +! -------------- DO JI=1,INBRAD IEL=NBELEV(JI) DO JEL=1,IEL diff --git a/src/MNH/boundaries.f90 b/src/MNH/boundaries.f90 index 91597d8be..b03999f9e 100644 --- a/src/MNH/boundaries.f90 +++ b/src/MNH/boundaries.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -117,7 +117,7 @@ END MODULE MODI_BOUNDARIES !! !! AUTHOR !! ------ -!! J.-P. Lafore J. Stein * Meteo France * +!! J.-P. Lafore J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/budget_flags.f90 b/src/MNH/budget_flags.f90 index ba8cdde35..1e6b280b5 100644 --- a/src/MNH/budget_flags.f90 +++ b/src/MNH/budget_flags.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -57,7 +57,7 @@ SUBROUTINE BUDGET_FLAGS(OUSERV, OUSERC, OUSERR, & !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/cart_compress.f90 b/src/MNH/cart_compress.f90 index d1e922e9b..f793ff492 100644 --- a/src/MNH/cart_compress.f90 +++ b/src/MNH/cart_compress.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -76,7 +76,7 @@ END MODULE MODI_CART_COMPRESS !! !! AUTHOR !! ------ -!! J. Nicolau * Meteo France * +!! J. Nicolau * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -116,8 +116,8 @@ INTEGER :: JJ,JK ! loop indexes ! !------------------------------------------------------------------------------- ! -!* 1. SOURCE TRANSFERT IN A LOCAL ARRAY -! --------------------------------- +!* 1. SOURCE TRANSFERT IN A LOCAL ARRAY +! --------------------------------- !JUAN IF (SIZE (PCOMPRESS) .EQ. 0 ) RETURN !JUAN @@ -128,7 +128,7 @@ ZVARS(1:NBUSIH-NBUSIL+1,1:NBUSJH-NBUSJL+1,1:NBUKH-NBUKL+1) = & !------------------------------------------------------------------------------- ! !* 2. COMPRESSIONS IN I,J AND K DIRECTIONS -! ------------------------------------ +! ------------------------------------ ! ! IF (LBU_ICP.AND.LBU_JCP.AND.LBU_KCP) THEN diff --git a/src/MNH/ch_aqueous_check.f90 b/src/MNH/ch_aqueous_check.f90 index e422cecfa..800f2527e 100644 --- a/src/MNH/ch_aqueous_check.f90 +++ b/src/MNH/ch_aqueous_check.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2007-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2007-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -151,7 +151,7 @@ ENDIF !------------------------------------------------------------------------------- ! !* 2. COMPUTE THE CHECK (RS) SOURCE -! ----------------------------- +! ----------------------------- ! !* 2.1 threshold for the aqueous phase species ! @@ -234,7 +234,7 @@ END IF END IF ! !* 4. FILTER OUT THE AQUEOUS SPECIES WHEN MICROPHYSICS<ZRTMIN_AQ -! -------------------------------------------------------- +! -------------------------------------------------------- ! DO JRR = 2, KRRL+1 GWATER(:,:,:) = .FALSE. @@ -262,7 +262,7 @@ END DO ! ! !* 5. FILTER OUT THE ICE PHASE SPECIES WHEN MICROPHYSICS<ZRTMIN_AQ -! ------------------------------------------------------------ +! ------------------------------------------------------------ ! IF (OUSECHIC) THEN DO JRR = KRRL+1, KRR diff --git a/src/MNH/ch_aqueous_sedim1mom.f90 b/src/MNH/ch_aqueous_sedim1mom.f90 index 2ec98324e..fb9f67112 100644 --- a/src/MNH/ch_aqueous_sedim1mom.f90 +++ b/src/MNH/ch_aqueous_sedim1mom.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2007-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2007-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -185,7 +185,7 @@ INTEGER :: JL ! and PACK intrinsics !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS -! ----------------------- +! ----------------------- ! CALL GET_INDICE_ll (IIB,IJB,IIE,IJE) IKB=1+JPVEXT @@ -206,7 +206,7 @@ ENDIF !------------------------------------------------------------------------------- ! !* 3. COMPUTE THE SEDIMENTATION (RS) SOURCE -! ------------------------------------- +! ------------------------------------- ! !* 3.1 Initialize some constants ! diff --git a/src/MNH/ch_aqueous_sedim2mom.f90 b/src/MNH/ch_aqueous_sedim2mom.f90 index 603228ecd..4a782baa4 100644 --- a/src/MNH/ch_aqueous_sedim2mom.f90 +++ b/src/MNH/ch_aqueous_sedim2mom.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2008-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2008-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -160,7 +160,7 @@ INTEGER :: JL ! and PACK intrinsics !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS -! ----------------------- +! ----------------------- ! CALL GET_INDICE_ll (IIB,IJB,IIE,IJE) IKB=1+JPVEXT @@ -178,7 +178,7 @@ PINPRR(:,:) = 0. ! initialize instantaneous precip. !------------------------------------------------------------------------------- ! !* 3. COMPUTE THE SEDIMENTATION (RS) SOURCE -! ------------------------------------- +! ------------------------------------- ! !* 3.1 time splitting loop initialization ! diff --git a/src/MNH/ch_aqueous_tmicc2r2.f90 b/src/MNH/ch_aqueous_tmicc2r2.f90 index 5009b6524..627cbb84e 100644 --- a/src/MNH/ch_aqueous_tmicc2r2.f90 +++ b/src/MNH/ch_aqueous_tmicc2r2.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2008-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2008-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -176,7 +176,7 @@ INTEGER :: JL ! and PACK intrinsics !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS -! ----------------------- +! ----------------------- ! CALL GET_INDICE_ll (IIB,IJB,IIE,IJE) IKB=1+JPVEXT @@ -201,7 +201,7 @@ ENDDO !!------------------------------------------------------------------------------- ! !* 3. COMPUTE THE SLOPE PARAMETERS ZLBDC,ZLBDR -! ---------------------------------------- +! ---------------------------------------- ! ZWLBDC3(:,:,:) = 1.E30 ZWLBDC(:,:,:) = 1.E10 @@ -220,7 +220,7 @@ END WHERE !------------------------------------------------------------------------------- ! !* 4. OPTIMIZATION: looking for locations where lwc lwr > min value -! ------------------------------------------------------------- +! ------------------------------------------------------------- ! GMICRO(:,:,:) = .FALSE. GMICRO(IIB:IIE,IJB:IJE,IKB:IKE) = & @@ -277,7 +277,7 @@ IF( IMICRO >= 1 ) THEN !------------------------------------------------------------------------------- ! !* 5. COMPUTES THE SLOW WARM PROCESS SOURCES -! -------------------------------------- +! -------------------------------------- !! !* 5.1 Autoconversion of cloud droplets using a Berry-Reinhardt parameterization ! @@ -355,7 +355,7 @@ IF( IMICRO >= 1 ) THEN !------------------------------------------------------------------------------- ! !* 6. UNPACK RESULTS AND DEALLOCATE ARRAYS -! ------------------------------------ +! ------------------------------------ ! DO JLC= 1, SIZE(PCRSVS,4) ZCW(:,:,:) = ZZCRSVS(:,:,:,JLC) diff --git a/src/MNH/ch_aqueous_tmicice.f90 b/src/MNH/ch_aqueous_tmicice.f90 index 51255f6fd..bd06a978e 100644 --- a/src/MNH/ch_aqueous_tmicice.f90 +++ b/src/MNH/ch_aqueous_tmicice.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2008-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2008-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -278,7 +278,7 @@ ZT(:,:,:) = PTHT(:,:,:) * ( PPABST(:,:,:) / XP00 ) ** (XRD/XCPD) !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS -! ----------------------- +! ----------------------- ! CALL GET_INDICE_ll (IIB,IJB,IIE,IJE) IKB=1+JPVEXT @@ -319,7 +319,7 @@ ENDIF !------------------------------------------------------------------------------- ! !* 3. OPTIMIZATION: looking for locations where m.r. hydro. > min value -! ----------------------------------------------------------------- +! ----------------------------------------------------------------- ! GMICRO(:,:,:) = .FALSE. GMICRO(IIB:IIE,IJB:IJE,IKB:IKE) = & @@ -408,7 +408,7 @@ IF( IMICRO >= 1 ) THEN !------------------------------------------------------------------------------- ! !* 4. COMPUTES THE SLOW WARM PROCESS SOURCES -! -------------------------------------- +! -------------------------------------- ! !* 4.1 compute the slope parameter Lbda_r ! diff --git a/src/MNH/ch_aqueous_tmickess.f90 b/src/MNH/ch_aqueous_tmickess.f90 index 5c57138b8..335346032 100644 --- a/src/MNH/ch_aqueous_tmickess.f90 +++ b/src/MNH/ch_aqueous_tmickess.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2008-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2008-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -152,7 +152,7 @@ INTEGER :: JL ! and PACK intrinsics !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS -! ----------------------- +! ----------------------- ! CALL GET_INDICE_ll (IIB,IJB,IIE,IJE) IKB=1+JPVEXT @@ -176,7 +176,7 @@ ENDDO !------------------------------------------------------------------------------- ! !* 3. OPTIMIZATION: looking for locations where lwc lwr > min value -! ------------------------------------------------------------- +! ------------------------------------------------------------- ! GMICRO(:,:,:) = .FALSE. GMICRO(IIB:IIE,IJB:IJE,IKB:IKE) = & @@ -215,7 +215,7 @@ IF( IMICRO >= 1 ) THEN !------------------------------------------------------------------------------- ! !* 4. COMPUTES THE SLOW WARM PROCESS SOURCES -! -------------------------------------- +! -------------------------------------- ! !* 4.1 compute the autoconversion of r_c for r_r production: RCAUTR ! @@ -259,7 +259,7 @@ IF( IMICRO >= 1 ) THEN !------------------------------------------------------------------------------- ! !* 5. UNPACK RESULTS AND DEALLOCATE ARRAYS -! ------------------------------------ +! ------------------------------------ ! DO JLC= 1, SIZE(PCRSVS,4) ZCW(:,:,:) = ZZCRSVS(:,:,:,JLC) diff --git a/src/MNH/ch_aqueous_tmickhko.f90 b/src/MNH/ch_aqueous_tmickhko.f90 index 938565d21..e41d7b12f 100644 --- a/src/MNH/ch_aqueous_tmickhko.f90 +++ b/src/MNH/ch_aqueous_tmickhko.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2008-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2008-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -163,7 +163,7 @@ INTEGER :: JL ! and PACK intrinsics !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS -! ----------------------- +! ----------------------- ! CALL GET_INDICE_ll (IIB,IJB,IIE,IJE) IKB=1+JPVEXT @@ -189,7 +189,7 @@ ENDDO !------------------------------------------------------------------------------- ! !* 3. OPTIMIZATION: looking for locations where lwc lwr > min value -! ------------------------------------------------------------- +! ------------------------------------------------------------- ! GMICRO(:,:,:) = .FALSE. GMICRO(IIB:IIE,IJB:IJE,IKB:IKE) = & @@ -238,7 +238,7 @@ IF( IMICRO >= 1 ) THEN !------------------------------------------------------------------------------- ! !* 4. COMPUTES THE SLOW WARM PROCESS SOURCES -! -------------------------------------- +! -------------------------------------- !! !* 4.1 Autoconversion of cloud droplets ! @@ -291,7 +291,7 @@ IF( IMICRO >= 1 ) THEN !------------------------------------------------------------------------------- ! !* 4. UNPACK RESULTS AND DEALLOCATE ARRAYS -! ------------------------------------ +! ------------------------------------ ! DO JLC= 1, SIZE(PCRSVS,4) ZCW(:,:,:) = ZZCRSVS(:,:,:,JLC) diff --git a/src/MNH/ch_boundaries.f90 b/src/MNH/ch_boundaries.f90 index 33fdb27af..4fb8106dc 100644 --- a/src/MNH/ch_boundaries.f90 +++ b/src/MNH/ch_boundaries.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -63,7 +63,7 @@ SUBROUTINE CH_BOUNDARIES (HLBCX,HLBCY, & !! !! AUTHOR !! ------ -!! P. Tulet * LA * +!! P. Tulet * LA * !! !! MODIFICATIONS !! ------------- @@ -71,7 +71,7 @@ SUBROUTINE CH_BOUNDARIES (HLBCX,HLBCY, & !! 06/06/00 (C. Mari) embedded into mesonh routines !! 15/02/01 (P. Tulet) update for MOCAGE lateral boundary conditions !! 10/02/17 (M. Leriche) prevent negative values -!! +!! !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS diff --git a/src/MNH/ch_convect_linox.f90 b/src/MNH/ch_convect_linox.f90 index aae2b7345..edaee5445 100644 --- a/src/MNH/ch_convect_linox.f90 +++ b/src/MNH/ch_convect_linox.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2003-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -370,7 +370,7 @@ DO JK = MAXVAL( KLFS(:) ), IKB + 1, -1 END IF END DO END DO -! +! !* 4. Final closure (environmental) computations ! ------------------------------------------ ! diff --git a/src/MNH/ch_convect_scavenging.f90 b/src/MNH/ch_convect_scavenging.f90 index e643c202c..531787a5d 100644 --- a/src/MNH/ch_convect_scavenging.f90 +++ b/src/MNH/ch_convect_scavenging.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -564,7 +564,7 @@ DO JK = MAXVAL( KLFS(:) ), IKB + 1, -1 END DO END DO ! -! +! !* 4. Final closure (environmental) computations ! ------------------------------------------ ! diff --git a/src/MNH/ch_diagnostics.f90 b/src/MNH/ch_diagnostics.f90 index 822e202d1..c7b34a384 100644 --- a/src/MNH/ch_diagnostics.f90 +++ b/src/MNH/ch_diagnostics.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -118,7 +118,7 @@ WRITE(NDIAGIO,CDIAGFORMAT) XTSIMUL, & (ZPROD(1,JI), JI = 1, NEQ), & (ZLOSS(1,JI), JI = 1, NEQ), & (ZTERMS(1,IINDEX(1,JI),IINDEX(2,JI)), & - JI = 1, NNONZEROTERMS) + JI = 1, NNONZEROTERMS) ! DEALLOCATE(ZPROD, ZLOSS) DEALLOCATE(ZTERMS) diff --git a/src/MNH/ch_emission_flux0d.f90 b/src/MNH/ch_emission_flux0d.f90 index 74b84f6d4..5c8b5e1d6 100644 --- a/src/MNH/ch_emission_flux0d.f90 +++ b/src/MNH/ch_emission_flux0d.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1999-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1999-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -180,7 +180,7 @@ IF (LSFIRSTCALL) THEN ! print names of input variables IF (KVERB >= 5) THEN WRITE(KLUOUT,*) 'CH_EMISSION_FLUX0D: the following ', ICHEMIS, & - ' emission fluxes will be read' + ' emission fluxes will be read' DO JI = 1, ICHEMIS WRITE(KLUOUT,*) YNAMEIN(JI) END DO @@ -271,10 +271,10 @@ ELSE END DO ! ZALPHA = (PTIME - ZSFTIME(ISACT)) & - / (ZSFTIME(ISACT+1) - ZSFTIME(ISACT)) + / (ZSFTIME(ISACT+1) - ZSFTIME(ISACT)) ! PFLUX(:) = ZALPHA * ZSFLUX(:,ISACT+1) & - + (1.-ZALPHA) * ZSFLUX(:,ISACT) + + (1.-ZALPHA) * ZSFLUX(:,ISACT) ! END IF ! diff --git a/src/MNH/ch_f77.fx90 b/src/MNH/ch_f77.fx90 index 3200d1757..a8ad37ad0 100644 --- a/src/MNH/ch_f77.fx90 +++ b/src/MNH/ch_f77.fx90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1989-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1989-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -5384,7 +5384,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -5756,7 +5755,6 @@ c wlabel = 'isaksen.grid' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -5923,7 +5921,7 @@ c wlabel = 'isaksen.grid' z(i) = z(93) + 5.*REAL(i-93) ENDDO GOTO 10 - + *-----grid option 5: user defined 5 CONTINUE @@ -6003,7 +6001,7 @@ c 24 CONTINUE * check grid for assorted improprieties: -c 99 CONTINUE +c 99 CONTINUE CALL gridck(kz,nz,z,ok,kout) IF (.NOT. ok) THEN @@ -6074,7 +6072,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -6159,7 +6156,7 @@ c PARAMETER(pzero = +10./largest) c PARAMETER(nzero = -10./largest) c c * machine precision -c +c c REAL precis c PARAMETER(precis = 1.e-7) c @@ -6311,7 +6308,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -6464,7 +6460,6 @@ c c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -6717,7 +6712,6 @@ c c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -6874,7 +6868,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -6901,14 +6894,14 @@ c INCLUDE 'params' $ 7.4371992E-24, 7.3642966E-24/ c------------------------------------------ -*sm Initialize cross sections to values -*sm at large optical depth +*sm Initialize cross sections to values +*sm at large optical depth c------------------------------------------ DO k = 1, nz DO i = 1, 17 o2xsk(k,i) = xslod(i) - ENDDO + ENDDO ENDDO c------------------------------------------ @@ -6917,7 +6910,7 @@ c------------------------------------------ IF (firstcall) THEN CALL INIT_XS - firstcall = .FALSE. + firstcall = .FALSE. ENDIF c------------------------------------------ @@ -7031,115 +7024,115 @@ C drm 2/97 initial coding C C------------------------------------------------------------- - IMPLICIT NONE + IMPLICIT NONE - REAL NO2, T, X - REAL XS(17) - REAL A(17), B(17) - INTEGER I + REAL NO2, T, X + REAL XS(17) + REAL A(17), B(17) + INTEGER I - CALL CALC_PARAMS( X, A, B ) + CALL CALC_PARAMS( X, A, B ) - DO I = 1,17 - XS(I) = EXP( A(I)*( T - 220.) + B(I) ) - ENDDO + DO I = 1,17 + XS(I) = EXP( A(I)*( T - 220.) + B(I) ) + ENDDO RETURN - END + END *=============================================================================* - SUBROUTINE CALC_PARAMS( X, A, B ) + SUBROUTINE CALC_PARAMS( X, A, B ) C------------------------------------------------------------- C C calculates coefficients (A,B), used in calculating the -C effective cross section, for 17 wavelength intervals +C effective cross section, for 17 wavelength intervals C as a function of log O2 column density (X) C Wavelength intervals are defined in WMO1985 C C------------------------------------------------------------- - IMPLICIT NONE + IMPLICIT NONE - REAL X - REAL A(17), B(17) + REAL X + REAL A(17), B(17) - REAL CHEBEV + REAL CHEBEV REAL(kind(0.0d0)) :: AC(20,17) REAL(kind(0.0d0)) :: BC(20,17) ! Chebyshev polynomial coeffs REAL WAVE_NUM(17) - COMMON /XS_COEFFS/ AC, BC, WAVE_NUM + COMMON /XS_COEFFS/ AC, BC, WAVE_NUM - INTEGER I + INTEGER I C call Chebyshev Evaluation routine to calc A and B from -C set of 20 coeficients for each wavelength +C set of 20 coeficients for each wavelength - DO I=1,17 - A(I) = CHEBEV(38.0 , 56.0, AC(1,I), 20, X) - B(I) = CHEBEV(38.0 , 56.0, BC(1,I), 20, X) - ENDDO + DO I=1,17 + A(I) = CHEBEV(38.0 , 56.0, AC(1,I), 20, X) + B(I) = CHEBEV(38.0 , 56.0, BC(1,I), 20, X) + ENDDO - RETURN + RETURN - END + END *=============================================================================* - SUBROUTINE INIT_XS + SUBROUTINE INIT_XS C------------------------------------------------------------- C loads COMMON block XS_COEFFS containing the Chebyshev -C polynomial coeffs necessary to calculate O2 effective +C polynomial coeffs necessary to calculate O2 effective C cross-sections C C------------------------------------------------------------- - REAL(kind(0.0d0)) :: AC(20,17) - REAL(kind(0.0d0)) :: BC(20,17) ! Chebyshev polynomial coeffs - REAL WAVE_NUM(17) - COMMON /XS_COEFFS/ AC, BC, WAVE_NUM - + REAL(kind(0.0d0)) :: AC(20,17) + REAL(kind(0.0d0)) :: BC(20,17) ! Chebyshev polynomial coeffs + REAL WAVE_NUM(17) + COMMON /XS_COEFFS/ AC, BC, WAVE_NUM + C locals - INTEGER IN_LUN ! file unit number - INTEGER IOST ! i/o status - INTEGER I, J + INTEGER IN_LUN ! file unit number + INTEGER IOST ! i/o status + INTEGER I, J - IN_LUN = -1 + IN_LUN = -1 - OPEN (NEWUNIT=IN_LUN, FILE= + OPEN (NEWUNIT=IN_LUN, FILE= $ 'DATAE1/O2/effxstex.txt',FORM='FORMATTED') -C READ( IN_LUN, 901 ) - READ( IN_LUN, '( / )' ) - DO I = 1,20 -C READ( IN_LUN, 903 ) ( AC(I,J), J=1,17 ) - READ( IN_LUN, '( 17(E23.14,1x) )' ) ( AC(I,J), J=1,17 ) - ENDDO -C READ( IN_LUN, 901 ) - READ( IN_LUN, '( / )' ) - DO I = 1,20 -C READ( IN_LUN, 903 ) ( BC(I,J), J=1,17 ) - READ( IN_LUN, '( 17(E23.14,1x) )' ) ( BC(I,J), J=1,17 ) - ENDDO +C READ( IN_LUN, 901 ) + READ( IN_LUN, '( / )' ) + DO I = 1,20 +C READ( IN_LUN, 903 ) ( AC(I,J), J=1,17 ) + READ( IN_LUN, '( 17(E23.14,1x) )' ) ( AC(I,J), J=1,17 ) + ENDDO +C READ( IN_LUN, 901 ) + READ( IN_LUN, '( / )' ) + DO I = 1,20 +C READ( IN_LUN, 903 ) ( BC(I,J), J=1,17 ) + READ( IN_LUN, '( 17(E23.14,1x) )' ) ( BC(I,J), J=1,17 ) + ENDDO C 901 FORMAT( / ) C 903 FORMAT( 17(E23.14,1x)) - 998 CLOSE (IN_LUN) - - DO I=1,17 - WAVE_NUM(18-I) = 48250. + (500.*I) - ENDDO + 998 CLOSE (IN_LUN) + + DO I=1,17 + WAVE_NUM(18-I) = 48250. + (500.*I) + ENDDO END *=============================================================================* - FUNCTION chebev(a,b,c,m,x) + FUNCTION chebev(a,b,c,m,x) C------------------------------------------------------------- C @@ -7148,19 +7141,19 @@ C See Numerical recipes p193 C C------------------------------------------------------------- - INTEGER M + INTEGER M REAL CHEBEV,A,B,X - REAL(kind(0.0d0)) :: C(M) + REAL(kind(0.0d0)) :: C(M) INTEGER J REAL D,DD,SV,Y,Y2 IF ((X-A)*(X-B).GT.0.) THEN -c WRITE(6,*) 'X NOT IN RANGE IN CHEBEV', X - CHEBEV = 0.0 - RETURN +c WRITE(6,*) 'X NOT IN RANGE IN CHEBEV', X + CHEBEV = 0.0 + RETURN ENDIF - D=0. + D=0. DD=0. Y=(2.*X-A-B)/(B-A) Y2=2.*Y @@ -7171,7 +7164,7 @@ c WRITE(6,*) 'X NOT IN RANGE IN CHEBEV', X END DO CHEBEV=Y*D-DD+0.5*C(1) - RETURN + RETURN END *=============================================================================* @@ -7251,7 +7244,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -8001,7 +7993,6 @@ c c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -8128,7 +8119,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -8243,7 +8233,7 @@ c ENDIF c c mday = 0 c DO 12, month = 1, imonth-1 -c mday = mday + imn(month) +c mday = mday + imn(month) c 12 CONTINUE c jday = mday + iday c @@ -8832,7 +8822,6 @@ c c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -9487,7 +9476,6 @@ c c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -9630,7 +9618,6 @@ c c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -9800,7 +9787,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -10052,7 +10038,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -10257,7 +10242,6 @@ c c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -10421,7 +10405,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -10585,7 +10568,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -10779,7 +10761,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -10951,7 +10932,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -11100,7 +11080,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -11198,7 +11177,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -11325,7 +11303,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -11455,7 +11432,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -11567,7 +11543,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -11690,7 +11665,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -11846,7 +11820,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -12026,7 +11999,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -12133,8 +12105,8 @@ c INCLUDE 'params' dtabs = dtso2(i,iw) + dto2(i,iw) + dto3 (i,iw) + > dtno2(i,iw) + dacld + daaer + dasnw - dtabs = amax1(dtabs,1./largest) - dtsct = amax1(dtsct,1./largest) + dtabs = amax1(dtabs,1./largest) + dtsct = amax1(dtsct,1./largest) * invert z-coordinate: @@ -12349,7 +12321,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -12847,7 +12818,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) REAL bet, gam @@ -13248,7 +13218,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -13352,7 +13321,7 @@ c .. data USRANG /.FALSE./ data ONLYFL /.TRUE./ data PRNT /.FALSE.,.FALSE.,.FALSE.,.FALSE.,.FALSE., - $ .FALSE.,.FALSE./ + $ .FALSE.,.FALSE./ data ACCUR /0.0001/ data HEADER /' '/ data NPHI /0/ @@ -15697,7 +15666,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -17881,7 +17849,7 @@ c percent error from the correct value; return 'FALSE'. END C - SUBROUTINE SGBCO( ABD, LDA, N, ML, MU, IPVT, RCOND, Z ) + SUBROUTINE SGBCO( ABD, LDA, N, ML, MU, IPVT, RCOND, Z ) C FACTORS A REAL BAND MATRIX BY GAUSSIAN ELIMINATION C AND ESTIMATES THE CONDITION OF THE MATRIX. @@ -17994,27 +17962,27 @@ C FROM FORTRAN: ABS, AMAX1, MAX0, MIN0, SIGN EXTERNAL SGBFA, SAXPY, SDOT, SASUM, SSCAL - INTEGER LDA, N, ML, MU, IPVT(*) - REAL ABD(LDA,*), Z(*) - REAL RCOND + INTEGER LDA, N, ML, MU, IPVT(*) + REAL ABD(LDA,*), Z(*) + REAL RCOND - REAL SDOT, EK, T, WK, WKM - REAL ANORM, S, SASUM, SM, YNORM - INTEGER IS, INFO, J, JU, K, KB, KP1, L, LA, LM, LZ, M, MM + REAL SDOT, EK, T, WK, WKM + REAL ANORM, S, SASUM, SM, YNORM + INTEGER IS, INFO, J, JU, K, KB, KP1, L, LA, LM, LZ, M, MM C ** COMPUTE 1-NORM OF A - ANORM = 0.0E0 - L = ML + 1 - IS = L + MU - DO 10 J = 1, N - ANORM = AMAX1(ANORM, SASUM(L,ABD(IS,J), 1)) - IF (IS .GT. ML + 1) IS = IS - 1 - IF (J .LE. MU) L = L + 1 - IF (J .GE. N - ML) L = L - 1 + ANORM = 0.0E0 + L = ML + 1 + IS = L + MU + DO 10 J = 1, N + ANORM = AMAX1(ANORM, SASUM(L,ABD(IS,J), 1)) + IF (IS .GT. ML + 1) IS = IS - 1 + IF (J .LE. MU) L = L + 1 + IF (J .GE. N - ML) L = L - 1 10 CONTINUE C ** FACTOR - CALL SGBFA(ABD, LDA, N, ML, MU, IPVT, INFO) + CALL SGBFA(ABD, LDA, N, ML, MU, IPVT, INFO) C RCOND = 1/(NORM(A)*(ESTIMATE OF NORM(INVERSE(A)))) . C ESTIMATE = NORM(Z)/NORM(Y) WHERE A*Z = Y AND TRANS(A)*Y = E . @@ -18024,120 +17992,120 @@ C TRANS(U)*W = E . THE VECTORS ARE FREQUENTLY RESCALED TO AVOID C OVERFLOW. C ** SOLVE TRANS(U)*W = E - EK = 1.0E0 - DO 20 J = 1, N - Z(J) = 0.0E0 + EK = 1.0E0 + DO 20 J = 1, N + Z(J) = 0.0E0 20 CONTINUE - M = ML + MU + 1 - JU = 0 - DO 100 K = 1, N - IF (Z(K) .NE. 0.0E0) EK = SIGN(EK, -Z(K)) - IF (ABS(EK-Z(K)) .GT. ABS(ABD(M,K))) THEN - S = ABS(ABD(M,K))/ABS(EK-Z(K)) - CALL SSCAL(N, S, Z, 1) - EK = S*EK - ENDIF - WK = EK - Z(K) - WKM = -EK - Z(K) - S = ABS(WK) - SM = ABS(WKM) - IF (ABD(M,K) .NE. 0.0E0) THEN - WK = WK /ABD(M,K) - WKM = WKM/ABD(M,K) - ELSE - WK = 1.0E0 - WKM = 1.0E0 - ENDIF - KP1 = K + 1 - JU = MIN0(MAX0(JU, MU+IPVT(K)), N) - MM = M - IF (KP1 .LE. JU) THEN - DO 60 J = KP1, JU - MM = MM - 1 - SM = SM + ABS(Z(J)+WKM*ABD(MM,J)) - Z(J) = Z(J) + WK*ABD(MM,J) - S = S + ABS(Z(J)) + M = ML + MU + 1 + JU = 0 + DO 100 K = 1, N + IF (Z(K) .NE. 0.0E0) EK = SIGN(EK, -Z(K)) + IF (ABS(EK-Z(K)) .GT. ABS(ABD(M,K))) THEN + S = ABS(ABD(M,K))/ABS(EK-Z(K)) + CALL SSCAL(N, S, Z, 1) + EK = S*EK + ENDIF + WK = EK - Z(K) + WKM = -EK - Z(K) + S = ABS(WK) + SM = ABS(WKM) + IF (ABD(M,K) .NE. 0.0E0) THEN + WK = WK /ABD(M,K) + WKM = WKM/ABD(M,K) + ELSE + WK = 1.0E0 + WKM = 1.0E0 + ENDIF + KP1 = K + 1 + JU = MIN0(MAX0(JU, MU+IPVT(K)), N) + MM = M + IF (KP1 .LE. JU) THEN + DO 60 J = KP1, JU + MM = MM - 1 + SM = SM + ABS(Z(J)+WKM*ABD(MM,J)) + Z(J) = Z(J) + WK*ABD(MM,J) + S = S + ABS(Z(J)) 60 CONTINUE - IF (S .LT. SM) THEN - T = WKM - WK - WK = WKM - MM = M - DO 70 J = KP1, JU - MM = MM - 1 - Z(J) = Z(J) + T*ABD(MM,J) + IF (S .LT. SM) THEN + T = WKM - WK + WK = WKM + MM = M + DO 70 J = KP1, JU + MM = MM - 1 + Z(J) = Z(J) + T*ABD(MM,J) 70 CONTINUE - ENDIF - ENDIF - Z(K) = WK + ENDIF + ENDIF + Z(K) = WK 100 CONTINUE - S = 1.0E0 / SASUM(N, Z, 1) - CALL SSCAL(N, S, Z, 1) + S = 1.0E0 / SASUM(N, Z, 1) + CALL SSCAL(N, S, Z, 1) C ** SOLVE TRANS(L)*Y = W - DO 120 KB = 1, N - K = N + 1 - KB - LM = MIN0(ML, N-K) - IF (K .LT. N) Z(K) = Z(K) + SDOT(LM, ABD(M+1,K), 1, Z(K+1), 1) - IF (ABS(Z(K)) .GT. 1.0E0) THEN - S = 1.0E0 / ABS(Z(K)) - CALL SSCAL(N, S, Z, 1) - ENDIF - L = IPVT(K) - T = Z(L) - Z(L) = Z(K) - Z(K) = T + DO 120 KB = 1, N + K = N + 1 - KB + LM = MIN0(ML, N-K) + IF (K .LT. N) Z(K) = Z(K) + SDOT(LM, ABD(M+1,K), 1, Z(K+1), 1) + IF (ABS(Z(K)) .GT. 1.0E0) THEN + S = 1.0E0 / ABS(Z(K)) + CALL SSCAL(N, S, Z, 1) + ENDIF + L = IPVT(K) + T = Z(L) + Z(L) = Z(K) + Z(K) = T 120 CONTINUE - S = 1.0E0 / SASUM(N, Z, 1) - CALL SSCAL(N, S, Z, 1) + S = 1.0E0 / SASUM(N, Z, 1) + CALL SSCAL(N, S, Z, 1) - YNORM = 1.0E0 + YNORM = 1.0E0 C ** SOLVE L*V = Y - DO 140 K = 1, N - L = IPVT(K) - T = Z(L) - Z(L) = Z(K) - Z(K) = T - LM = MIN0(ML, N-K) - IF (K .LT. N) CALL SAXPY(LM, T, ABD(M+1,K), 1, Z(K+1), 1) - IF (ABS(Z(K)) .GT. 1.0E0) THEN - S = 1.0E0 / ABS(Z(K)) - CALL SSCAL(N, S, Z, 1) - YNORM = S*YNORM - ENDIF + DO 140 K = 1, N + L = IPVT(K) + T = Z(L) + Z(L) = Z(K) + Z(K) = T + LM = MIN0(ML, N-K) + IF (K .LT. N) CALL SAXPY(LM, T, ABD(M+1,K), 1, Z(K+1), 1) + IF (ABS(Z(K)) .GT. 1.0E0) THEN + S = 1.0E0 / ABS(Z(K)) + CALL SSCAL(N, S, Z, 1) + YNORM = S*YNORM + ENDIF 140 CONTINUE - S = 1.0E0/SASUM(N, Z, 1) - CALL SSCAL(N, S, Z, 1) - YNORM = S*YNORM + S = 1.0E0/SASUM(N, Z, 1) + CALL SSCAL(N, S, Z, 1) + YNORM = S*YNORM C ** SOLVE U*Z = W - DO 160 KB = 1, N - K = N + 1 - KB - IF (ABS(Z(K)) .GT. ABS(ABD(M,K))) THEN - S = ABS(ABD(M,K)) / ABS(Z(K)) - CALL SSCAL(N, S, Z, 1) - YNORM = S*YNORM - ENDIF - IF (ABD(M,K) .NE. 0.0E0) Z(K) = Z(K)/ABD(M,K) - IF (ABD(M,K) .EQ. 0.0E0) Z(K) = 1.0E0 - LM = MIN0(K, M) - 1 - LA = M - LM - LZ = K - LM - T = -Z(K) - CALL SAXPY(LM, T, ABD(LA,K), 1, Z(LZ), 1) + DO 160 KB = 1, N + K = N + 1 - KB + IF (ABS(Z(K)) .GT. ABS(ABD(M,K))) THEN + S = ABS(ABD(M,K)) / ABS(Z(K)) + CALL SSCAL(N, S, Z, 1) + YNORM = S*YNORM + ENDIF + IF (ABD(M,K) .NE. 0.0E0) Z(K) = Z(K)/ABD(M,K) + IF (ABD(M,K) .EQ. 0.0E0) Z(K) = 1.0E0 + LM = MIN0(K, M) - 1 + LA = M - LM + LZ = K - LM + T = -Z(K) + CALL SAXPY(LM, T, ABD(LA,K), 1, Z(LZ), 1) 160 CONTINUE C ** MAKE ZNORM = 1.0 - S = 1.0E0 / SASUM(N, Z, 1) - CALL SSCAL(N, S, Z, 1) - YNORM = S*YNORM + S = 1.0E0 / SASUM(N, Z, 1) + CALL SSCAL(N, S, Z, 1) + YNORM = S*YNORM - IF (ANORM .NE. 0.0E0) RCOND = YNORM/ANORM - IF (ANORM .EQ. 0.0E0) RCOND = 0.0E0 - RETURN - END - SUBROUTINE SGBFA( ABD, LDA, N, ML, MU, IPVT, INFO ) + IF (ANORM .NE. 0.0E0) RCOND = YNORM/ANORM + IF (ANORM .EQ. 0.0E0) RCOND = 0.0E0 + RETURN + END + SUBROUTINE SGBFA( ABD, LDA, N, ML, MU, IPVT, INFO ) C FACTORS A REAL BAND MATRIX BY ELIMINATION. @@ -18168,82 +18136,82 @@ C FROM FORTRAN: MAX0, MIN0 EXTERNAL SAXPY, SSCAL, ISAMAX - INTEGER LDA, N, ML, MU, IPVT(*), INFO - REAL ABD(LDA,*) + INTEGER LDA, N, ML, MU, IPVT(*), INFO + REAL ABD(LDA,*) - REAL T - INTEGER I,ISAMAX,I0,J,JU,JZ,J0,J1,K,KP1,L,LM,M,MM,NM1 + REAL T + INTEGER I,ISAMAX,I0,J,JU,JZ,J0,J1,K,KP1,L,LM,M,MM,NM1 - M = ML + MU + 1 - INFO = 0 + M = ML + MU + 1 + INFO = 0 C ** ZERO INITIAL FILL-IN COLUMNS - J0 = MU + 2 - J1 = MIN0(N, M) - 1 - DO 20 JZ = J0, J1 - I0 = M + 1 - JZ - DO 10 I = I0, ML - ABD(I,JZ) = 0.0E0 + J0 = MU + 2 + J1 = MIN0(N, M) - 1 + DO 20 JZ = J0, J1 + I0 = M + 1 - JZ + DO 10 I = I0, ML + ABD(I,JZ) = 0.0E0 10 CONTINUE 20 CONTINUE - JZ = J1 - JU = 0 + JZ = J1 + JU = 0 C ** GAUSSIAN ELIMINATION WITH PARTIAL PIVOTING - NM1 = N - 1 - DO 120 K = 1, NM1 - KP1 = K + 1 + NM1 = N - 1 + DO 120 K = 1, NM1 + KP1 = K + 1 C ** ZERO NEXT FILL-IN COLUMN - JZ = JZ + 1 - IF (JZ .LE. N) THEN - DO 40 I = 1, ML - ABD(I,JZ) = 0.0E0 + JZ = JZ + 1 + IF (JZ .LE. N) THEN + DO 40 I = 1, ML + ABD(I,JZ) = 0.0E0 40 CONTINUE - ENDIF + ENDIF C ** FIND L = PIVOT INDEX - LM = MIN0(ML, N-K) - L = ISAMAX(LM+1, ABD(M,K), 1) + M - 1 - IPVT(K) = L + K - M + LM = MIN0(ML, N-K) + L = ISAMAX(LM+1, ABD(M,K), 1) + M - 1 + IPVT(K) = L + K - M - IF (ABD(L,K) .EQ. 0.0E0) THEN + IF (ABD(L,K) .EQ. 0.0E0) THEN C ** ZERO PIVOT IMPLIES THIS COLUMN C ** ALREADY TRIANGULARIZED - INFO = K - ELSE + INFO = K + ELSE C ** INTERCHANGE IF NECESSARY - IF (L .NE. M) THEN - T = ABD(L,K) - ABD(L,K) = ABD(M,K) - ABD(M,K) = T - ENDIF + IF (L .NE. M) THEN + T = ABD(L,K) + ABD(L,K) = ABD(M,K) + ABD(M,K) = T + ENDIF C ** COMPUTE MULTIPLIERS - T = -1.0E0 / ABD(M,K) - CALL SSCAL(LM, T, ABD(M+1,K), 1) + T = -1.0E0 / ABD(M,K) + CALL SSCAL(LM, T, ABD(M+1,K), 1) C ** ROW ELIMINATION WITH COLUMN INDEXING - JU = MIN0(MAX0(JU, MU+IPVT(K)), N) - MM = M - DO 80 J = KP1, JU - L = L - 1 - MM = MM - 1 - T = ABD(L,J) - IF (L .NE. MM) THEN - ABD(L,J) = ABD(MM,J) - ABD(MM,J) = T - ENDIF - CALL SAXPY(LM, T, ABD(M+1,K), 1, ABD(MM+1,J), 1) + JU = MIN0(MAX0(JU, MU+IPVT(K)), N) + MM = M + DO 80 J = KP1, JU + L = L - 1 + MM = MM - 1 + T = ABD(L,J) + IF (L .NE. MM) THEN + ABD(L,J) = ABD(MM,J) + ABD(MM,J) = T + ENDIF + CALL SAXPY(LM, T, ABD(M+1,K), 1, ABD(MM+1,J), 1) 80 CONTINUE - ENDIF + ENDIF 120 CONTINUE - IPVT(N) = N - IF (ABD(M,N) .EQ. 0.0E0) INFO = N - RETURN - END - SUBROUTINE SGBSL( ABD, LDA, N, ML, MU, IPVT, B, JOB ) + IPVT(N) = N + IF (ABD(M,N) .EQ. 0.0E0) INFO = N + RETURN + END + SUBROUTINE SGBSL( ABD, LDA, N, ML, MU, IPVT, B, JOB ) C SOLVES THE REAL BAND SYSTEM C A * X = B OR TRANSPOSE(A) * X = B @@ -18306,71 +18274,71 @@ C FROM FORTRAN: MIN0 EXTERNAL SAXPY, SDOT - INTEGER LDA, N, ML, MU, IPVT(*), JOB - REAL ABD(LDA,*), B(*) + INTEGER LDA, N, ML, MU, IPVT(*), JOB + REAL ABD(LDA,*), B(*) - REAL SDOT,T - INTEGER K,KB,L,LA,LB,LM,M,NM1 + REAL SDOT,T + INTEGER K,KB,L,LA,LB,LM,M,NM1 - M = MU + ML + 1 - NM1 = N - 1 - IF (JOB .EQ. 0) THEN + M = MU + ML + 1 + NM1 = N - 1 + IF (JOB .EQ. 0) THEN C ** JOB = 0 , SOLVE A * X = B C ** FIRST SOLVE L*Y = B - IF (ML .NE. 0) THEN - DO 20 K = 1, NM1 - LM = MIN0(ML, N-K) - L = IPVT(K) - T = B(L) - IF (L .NE. K) THEN - B(L) = B(K) - B(K) = T - ENDIF - CALL SAXPY( LM, T, ABD(M+1,K), 1, B(K+1), 1 ) + IF (ML .NE. 0) THEN + DO 20 K = 1, NM1 + LM = MIN0(ML, N-K) + L = IPVT(K) + T = B(L) + IF (L .NE. K) THEN + B(L) = B(K) + B(K) = T + ENDIF + CALL SAXPY( LM, T, ABD(M+1,K), 1, B(K+1), 1 ) 20 CONTINUE - ENDIF + ENDIF C ** NOW SOLVE U*X = Y - DO 40 KB = 1, N - K = N + 1 - KB - B(K) = B(K) / ABD(M,K) - LM = MIN0(K, M) - 1 - LA = M - LM - LB = K - LM - T = -B(K) - CALL SAXPY(LM, T, ABD(LA,K), 1, B(LB), 1) + DO 40 KB = 1, N + K = N + 1 - KB + B(K) = B(K) / ABD(M,K) + LM = MIN0(K, M) - 1 + LA = M - LM + LB = K - LM + T = -B(K) + CALL SAXPY(LM, T, ABD(LA,K), 1, B(LB), 1) 40 CONTINUE - ELSE + ELSE C ** JOB = NONZERO, SOLVE TRANS(A) * X = B C ** FIRST SOLVE TRANS(U)*Y = B - DO 60 K = 1, N - LM = MIN0(K, M) - 1 - LA = M - LM - LB = K - LM - T = SDOT(LM, ABD(LA,K), 1, B(LB), 1) - B(K) = (B(K) - T)/ABD(M,K) + DO 60 K = 1, N + LM = MIN0(K, M) - 1 + LA = M - LM + LB = K - LM + T = SDOT(LM, ABD(LA,K), 1, B(LB), 1) + B(K) = (B(K) - T)/ABD(M,K) 60 CONTINUE C ** NOW SOLVE TRANS(L)*X = Y - IF (ML .NE. 0) THEN - DO 80 KB = 1, NM1 - K = N - KB - LM = MIN0(ML, N-K) - B(K) = B(K) + SDOT(LM, ABD(M+1,K), 1, B(K+1), 1) - L = IPVT(K) - IF (L .NE. K) THEN - T = B(L) - B(L) = B(K) - B(K) = T - ENDIF + IF (ML .NE. 0) THEN + DO 80 KB = 1, NM1 + K = N - KB + LM = MIN0(ML, N-K) + B(K) = B(K) + SDOT(LM, ABD(M+1,K), 1, B(K+1), 1) + L = IPVT(K) + IF (L .NE. K) THEN + T = B(L) + B(L) = B(K) + B(K) = T + ENDIF 80 CONTINUE - ENDIF + ENDIF - ENDIF + ENDIF - RETURN - END - SUBROUTINE SGECO( A, LDA, N,IPVT, RCOND, Z ) + RETURN + END + SUBROUTINE SGECO( A, LDA, N,IPVT, RCOND, Z ) C FACTORS A REAL MATRIX BY GAUSSIAN ELIMINATION C AND ESTIMATES THE CONDITION OF THE MATRIX. @@ -18427,22 +18395,22 @@ C FROM FORTRAN: ABS, AMAX1, SIGN EXTERNAL SGEFA, SAXPY, SDOT, SSCAL, SASUM - INTEGER LDA, N, IPVT(*) - REAL A(LDA,*), Z(*) - REAL RCOND + INTEGER LDA, N, IPVT(*) + REAL A(LDA,*), Z(*) + REAL RCOND - REAL SDOT,EK,T,WK,WKM - REAL ANORM,S,SASUM,SM,YNORM - INTEGER INFO,J,K,KB,KP1,L + REAL SDOT,EK,T,WK,WKM + REAL ANORM,S,SASUM,SM,YNORM + INTEGER INFO,J,K,KB,KP1,L C ** COMPUTE 1-NORM OF A - ANORM = 0.0E0 - DO 10 J = 1, N - ANORM = AMAX1( ANORM, SASUM(N,A(1,J),1) ) + ANORM = 0.0E0 + DO 10 J = 1, N + ANORM = AMAX1( ANORM, SASUM(N,A(1,J),1) ) 10 CONTINUE C ** FACTOR - CALL SGEFA(A,LDA,N,IPVT,INFO) + CALL SGEFA(A,LDA,N,IPVT,INFO) C RCOND = 1/(NORM(A)*(ESTIMATE OF NORM(INVERSE(A)))) . C ESTIMATE = NORM(Z)/NORM(Y) WHERE A*Z = Y AND TRANS(A)*Y = E . @@ -18452,106 +18420,106 @@ C TRANS(U)*W = E . THE VECTORS ARE FREQUENTLY RESCALED TO AVOID C OVERFLOW. C ** SOLVE TRANS(U)*W = E - EK = 1.0E0 - DO 20 J = 1, N - Z(J) = 0.0E0 + EK = 1.0E0 + DO 20 J = 1, N + Z(J) = 0.0E0 20 CONTINUE - DO 100 K = 1, N - IF (Z(K) .NE. 0.0E0) EK = SIGN(EK, -Z(K)) - IF (ABS(EK-Z(K)) .GT. ABS(A(K,K))) THEN - S = ABS(A(K,K)) / ABS(EK-Z(K)) - CALL SSCAL(N, S, Z, 1) - EK = S*EK - ENDIF - WK = EK - Z(K) - WKM = -EK - Z(K) - S = ABS(WK) - SM = ABS(WKM) - IF (A(K,K) .NE. 0.0E0) THEN - WK = WK / A(K,K) - WKM = WKM / A(K,K) - ELSE - WK = 1.0E0 - WKM = 1.0E0 - ENDIF - KP1 = K + 1 - IF (KP1 .LE. N) THEN - DO 60 J = KP1, N - SM = SM + ABS(Z(J)+WKM*A(K,J)) - Z(J) = Z(J) + WK*A(K,J) - S = S + ABS(Z(J)) + DO 100 K = 1, N + IF (Z(K) .NE. 0.0E0) EK = SIGN(EK, -Z(K)) + IF (ABS(EK-Z(K)) .GT. ABS(A(K,K))) THEN + S = ABS(A(K,K)) / ABS(EK-Z(K)) + CALL SSCAL(N, S, Z, 1) + EK = S*EK + ENDIF + WK = EK - Z(K) + WKM = -EK - Z(K) + S = ABS(WK) + SM = ABS(WKM) + IF (A(K,K) .NE. 0.0E0) THEN + WK = WK / A(K,K) + WKM = WKM / A(K,K) + ELSE + WK = 1.0E0 + WKM = 1.0E0 + ENDIF + KP1 = K + 1 + IF (KP1 .LE. N) THEN + DO 60 J = KP1, N + SM = SM + ABS(Z(J)+WKM*A(K,J)) + Z(J) = Z(J) + WK*A(K,J) + S = S + ABS(Z(J)) 60 CONTINUE - IF (S .LT. SM) THEN - T = WKM - WK - WK = WKM - DO 70 J = KP1, N - Z(J) = Z(J) + T*A(K,J) + IF (S .LT. SM) THEN + T = WKM - WK + WK = WKM + DO 70 J = KP1, N + Z(J) = Z(J) + T*A(K,J) 70 CONTINUE - ENDIF - ENDIF - Z(K) = WK + ENDIF + ENDIF + Z(K) = WK 100 CONTINUE - S = 1.0E0 / SASUM(N, Z, 1) - CALL SSCAL(N, S, Z, 1) + S = 1.0E0 / SASUM(N, Z, 1) + CALL SSCAL(N, S, Z, 1) C ** SOLVE TRANS(L)*Y = W - DO 120 KB = 1, N - K = N + 1 - KB - IF (K .LT. N) Z(K) = Z(K) + SDOT(N-K, A(K+1,K), 1, Z(K+1), 1) - IF (ABS(Z(K)) .GT. 1.0E0) THEN - S = 1.0E0/ABS(Z(K)) - CALL SSCAL(N, S, Z, 1) - ENDIF - L = IPVT(K) - T = Z(L) - Z(L) = Z(K) - Z(K) = T + DO 120 KB = 1, N + K = N + 1 - KB + IF (K .LT. N) Z(K) = Z(K) + SDOT(N-K, A(K+1,K), 1, Z(K+1), 1) + IF (ABS(Z(K)) .GT. 1.0E0) THEN + S = 1.0E0/ABS(Z(K)) + CALL SSCAL(N, S, Z, 1) + ENDIF + L = IPVT(K) + T = Z(L) + Z(L) = Z(K) + Z(K) = T 120 CONTINUE - S = 1.0E0 / SASUM(N, Z, 1) - CALL SSCAL(N, S, Z, 1) + S = 1.0E0 / SASUM(N, Z, 1) + CALL SSCAL(N, S, Z, 1) C ** SOLVE L*V = Y - YNORM = 1.0E0 - DO 140 K = 1, N - L = IPVT(K) - T = Z(L) - Z(L) = Z(K) - Z(K) = T - IF (K .LT. N) CALL SAXPY(N-K, T, A(K+1,K), 1, Z(K+1), 1) - IF (ABS(Z(K)) .GT. 1.0E0) THEN - S = 1.0E0/ABS(Z(K)) - CALL SSCAL(N, S, Z, 1) - YNORM = S*YNORM - ENDIF + YNORM = 1.0E0 + DO 140 K = 1, N + L = IPVT(K) + T = Z(L) + Z(L) = Z(K) + Z(K) = T + IF (K .LT. N) CALL SAXPY(N-K, T, A(K+1,K), 1, Z(K+1), 1) + IF (ABS(Z(K)) .GT. 1.0E0) THEN + S = 1.0E0/ABS(Z(K)) + CALL SSCAL(N, S, Z, 1) + YNORM = S*YNORM + ENDIF 140 CONTINUE - S = 1.0E0 / SASUM(N, Z, 1) - CALL SSCAL(N, S, Z, 1) + S = 1.0E0 / SASUM(N, Z, 1) + CALL SSCAL(N, S, Z, 1) C ** SOLVE U*Z = V - YNORM = S*YNORM - DO 160 KB = 1, N - K = N + 1 - KB - IF (ABS(Z(K)) .GT. ABS(A(K,K))) THEN - S = ABS(A(K,K))/ABS(Z(K)) - CALL SSCAL(N, S, Z, 1) - YNORM = S*YNORM - ENDIF - IF (A(K,K) .NE. 0.0E0) Z(K) = Z(K)/A(K,K) - IF (A(K,K) .EQ. 0.0E0) Z(K) = 1.0E0 - T = -Z(K) - CALL SAXPY(K-1, T, A(1,K), 1, Z(1), 1) + YNORM = S*YNORM + DO 160 KB = 1, N + K = N + 1 - KB + IF (ABS(Z(K)) .GT. ABS(A(K,K))) THEN + S = ABS(A(K,K))/ABS(Z(K)) + CALL SSCAL(N, S, Z, 1) + YNORM = S*YNORM + ENDIF + IF (A(K,K) .NE. 0.0E0) Z(K) = Z(K)/A(K,K) + IF (A(K,K) .EQ. 0.0E0) Z(K) = 1.0E0 + T = -Z(K) + CALL SAXPY(K-1, T, A(1,K), 1, Z(1), 1) 160 CONTINUE C ** MAKE ZNORM = 1.0 - S = 1.0E0 / SASUM(N, Z, 1) - CALL SSCAL(N, S, Z, 1) - YNORM = S*YNORM + S = 1.0E0 / SASUM(N, Z, 1) + CALL SSCAL(N, S, Z, 1) + YNORM = S*YNORM - IF (ANORM .NE. 0.0E0) RCOND = YNORM/ANORM - IF (ANORM .EQ. 0.0E0) RCOND = 0.0E0 - RETURN - END - SUBROUTINE SGEFA( A, LDA, N, IPVT, INFO ) + IF (ANORM .NE. 0.0E0) RCOND = YNORM/ANORM + IF (ANORM .EQ. 0.0E0) RCOND = 0.0E0 + RETURN + END + SUBROUTINE SGEFA( A, LDA, N, IPVT, INFO ) C FACTORS A REAL MATRIX BY GAUSSIAN ELIMINATION. @@ -18580,56 +18548,56 @@ C ROUTINES CALLED: FROM BLAS: SAXPY, SSCAL, ISAMAX EXTERNAL SAXPY, SSCAL, ISAMAX - INTEGER LDA, N, IPVT(*), INFO - REAL A(LDA,*) + INTEGER LDA, N, IPVT(*), INFO + REAL A(LDA,*) - REAL T - INTEGER ISAMAX,J,K,KP1,L,NM1 + REAL T + INTEGER ISAMAX,J,K,KP1,L,NM1 C ** GAUSSIAN ELIMINATION WITH PARTIAL PIVOTING - INFO = 0 - NM1 = N - 1 - DO 60 K = 1, NM1 - KP1 = K + 1 + INFO = 0 + NM1 = N - 1 + DO 60 K = 1, NM1 + KP1 = K + 1 C ** FIND L = PIVOT INDEX - L = ISAMAX( N-K+1, A(K,K), 1) + K-1 - IPVT(K) = L + L = ISAMAX( N-K+1, A(K,K), 1) + K-1 + IPVT(K) = L - IF (A(L,K) .EQ. 0.0E0) THEN + IF (A(L,K) .EQ. 0.0E0) THEN C ** ZERO PIVOT IMPLIES THIS COLUMN C ** ALREADY TRIANGULARIZED - INFO = K - ELSE + INFO = K + ELSE C ** INTERCHANGE IF NECESSARY - IF (L .NE. K) THEN - T = A(L,K) - A(L,K) = A(K,K) - A(K,K) = T - ENDIF + IF (L .NE. K) THEN + T = A(L,K) + A(L,K) = A(K,K) + A(K,K) = T + ENDIF C ** COMPUTE MULTIPLIERS - T = -1.0E0 / A(K,K) - CALL SSCAL( N-K, T, A(K+1,K), 1 ) + T = -1.0E0 / A(K,K) + CALL SSCAL( N-K, T, A(K+1,K), 1 ) C ** ROW ELIMINATION WITH COLUMN INDEXING - DO 30 J = KP1, N - T = A(L,J) - IF (L .NE. K) THEN - A(L,J) = A(K,J) - A(K,J) = T - ENDIF - CALL SAXPY( N-K, T, A(K+1,K), 1, A(K+1,J), 1 ) + DO 30 J = KP1, N + T = A(L,J) + IF (L .NE. K) THEN + A(L,J) = A(K,J) + A(K,J) = T + ENDIF + CALL SAXPY( N-K, T, A(K+1,K), 1, A(K+1,J), 1 ) 30 CONTINUE - ENDIF + ENDIF 60 CONTINUE - IPVT(N) = N - IF (A(N,N) .EQ. 0.0E0) INFO = N - RETURN - END - SUBROUTINE SGESL( A, LDA, N,IPVT, B, JOB ) + IPVT(N) = N + IF (A(N,N) .EQ. 0.0E0) INFO = N + RETURN + END + SUBROUTINE SGESL( A, LDA, N,IPVT, B, JOB ) C SOLVES THE REAL SYSTEM C A * X = B OR TRANS(A) * X = B @@ -18686,61 +18654,61 @@ C ROUTINES CALLED: FROM BLAS: SAXPY, SDOT EXTERNAL SAXPY, SDOT - INTEGER LDA, N, IPVT(*), JOB - REAL A(LDA,*), B(*) + INTEGER LDA, N, IPVT(*), JOB + REAL A(LDA,*), B(*) - REAL SDOT,T - INTEGER K,KB,L,NM1 + REAL SDOT,T + INTEGER K,KB,L,NM1 - NM1 = N - 1 - IF (JOB .EQ. 0) THEN + NM1 = N - 1 + IF (JOB .EQ. 0) THEN C ** JOB = 0 , SOLVE A * X = B C ** FIRST SOLVE L*Y = B - DO 20 K = 1, NM1 - L = IPVT(K) - T = B(L) - IF (L .NE. K) THEN - B(L) = B(K) - B(K) = T - ENDIF - CALL SAXPY( N-K, T, A(K+1,K), 1, B(K+1), 1 ) + DO 20 K = 1, NM1 + L = IPVT(K) + T = B(L) + IF (L .NE. K) THEN + B(L) = B(K) + B(K) = T + ENDIF + CALL SAXPY( N-K, T, A(K+1,K), 1, B(K+1), 1 ) 20 CONTINUE C ** NOW SOLVE U*X = Y - DO 40 KB = 1, N - K = N + 1 - KB - B(K) = B(K) / A(K,K) - T = -B(K) - CALL SAXPY( K-1, T, A(1,K), 1, B(1), 1 ) + DO 40 KB = 1, N + K = N + 1 - KB + B(K) = B(K) / A(K,K) + T = -B(K) + CALL SAXPY( K-1, T, A(1,K), 1, B(1), 1 ) 40 CONTINUE - ELSE + ELSE C ** JOB = NONZERO, SOLVE TRANS(A) * X = B C ** FIRST SOLVE TRANS(U)*Y = B - DO 60 K = 1, N - T = SDOT( K-1, A(1,K), 1, B(1), 1 ) - B(K) = (B(K) - T) / A(K,K) + DO 60 K = 1, N + T = SDOT( K-1, A(1,K), 1, B(1), 1 ) + B(K) = (B(K) - T) / A(K,K) 60 CONTINUE C ** NOW SOLVE TRANS(L)*X = Y - DO 80 KB = 1, NM1 - K = N - KB - B(K) = B(K) + SDOT( N-K, A(K+1,K), 1, B(K+1), 1 ) - L = IPVT(K) - IF (L .NE. K) THEN - T = B(L) - B(L) = B(K) - B(K) = T - ENDIF + DO 80 KB = 1, NM1 + K = N - KB + B(K) = B(K) + SDOT( N-K, A(K+1,K), 1, B(K+1), 1 ) + L = IPVT(K) + IF (L .NE. K) THEN + T = B(L) + B(L) = B(K) + B(K) = T + ENDIF 80 CONTINUE - ENDIF + ENDIF - RETURN - END + RETURN + END -c REAL FUNCTION SASUM( N, SX, INCX ) +c REAL FUNCTION SASUM( N, SX, INCX ) C ############################## - FUNCTION SASUM(N,SX,INCX) + FUNCTION SASUM(N,SX,INCX) C ############################## C --INPUT-- N NUMBER OF ELEMENTS IN VECTOR TO BE SUMMED @@ -18751,39 +18719,39 @@ C --OUTPUT-- SASUM SUM FROM 0 TO N-1 OF ABS(SX(1+I*INCX)) IMPLICIT NONE REAL SASUM - REAL SX(*) + REAL SX(*) INTEGER N, INCX INTEGER I, M - SASUM = 0.0 - IF( N.LE.0 ) RETURN - IF( INCX.NE.1 ) THEN + SASUM = 0.0 + IF( N.LE.0 ) RETURN + IF( INCX.NE.1 ) THEN C ** NON-UNIT INCREMENTS - DO 10 I = 1, 1+(N-1)*INCX, INCX - SASUM = SASUM + ABS(SX(I)) + DO 10 I = 1, 1+(N-1)*INCX, INCX + SASUM = SASUM + ABS(SX(I)) 10 CONTINUE - ELSE + ELSE C ** UNIT INCREMENTS - M = MOD(N,6) - IF( M.NE.0 ) THEN + M = MOD(N,6) + IF( M.NE.0 ) THEN C ** CLEAN-UP LOOP SO REMAINING VECTOR C ** LENGTH IS A MULTIPLE OF 6. - DO 30 I = 1, M - SASUM = SASUM + ABS(SX(I)) + DO 30 I = 1, M + SASUM = SASUM + ABS(SX(I)) 30 CONTINUE - ENDIF + ENDIF C ** UNROLL LOOP FOR SPEED - DO 50 I = M+1, N, 6 - SASUM = SASUM + ABS(SX(I)) + ABS(SX(I+1)) + ABS(SX(I+2)) + DO 50 I = M+1, N, 6 + SASUM = SASUM + ABS(SX(I)) + ABS(SX(I+1)) + ABS(SX(I+2)) $ + ABS(SX(I+3)) + ABS(SX(I+4)) + ABS(SX(I+5)) 50 CONTINUE - ENDIF + ENDIF - RETURN - END + RETURN + END - SUBROUTINE SAXPY( N, SA, SX, INCX, SY, INCY ) + SUBROUTINE SAXPY( N, SA, SX, INCX, SY, INCY ) C Y = A*X + Y (X, Y = VECTORS, A = SCALAR) @@ -18802,56 +18770,56 @@ C WHERE LX = 1 IF INCX .GE. 0, C = (-INCX)*N IF INCX .LT. 0 C AND LY IS DEFINED IN A SIMILAR WAY USING INCY. - REAL SX(*), SY(*), SA + REAL SX(*), SY(*), SA - IF( N.LE.0 .OR. SA.EQ.0.0 ) RETURN + IF( N.LE.0 .OR. SA.EQ.0.0 ) RETURN - IF ( INCX.EQ.INCY .AND. INCX.GT.1 ) THEN + IF ( INCX.EQ.INCY .AND. INCX.GT.1 ) THEN - DO 10 I = 1, 1+(N-1)*INCX, INCX - SY(I) = SY(I) + SA * SX(I) + DO 10 I = 1, 1+(N-1)*INCX, INCX + SY(I) = SY(I) + SA * SX(I) 10 CONTINUE - ELSE IF ( INCX.EQ.INCY .AND. INCX.EQ.1 ) THEN + ELSE IF ( INCX.EQ.INCY .AND. INCX.EQ.1 ) THEN C ** EQUAL, UNIT INCREMENTS - M = MOD(N,4) - IF( M .NE. 0 ) THEN + M = MOD(N,4) + IF( M .NE. 0 ) THEN C ** CLEAN-UP LOOP SO REMAINING VECTOR LENGTH C ** IS A MULTIPLE OF 4. - DO 20 I = 1, M - SY(I) = SY(I) + SA * SX(I) + DO 20 I = 1, M + SY(I) = SY(I) + SA * SX(I) 20 CONTINUE - ENDIF + ENDIF C ** UNROLL LOOP FOR SPEED - DO 30 I = M+1, N, 4 - SY(I) = SY(I) + SA * SX(I) - SY(I+1) = SY(I+1) + SA * SX(I+1) - SY(I+2) = SY(I+2) + SA * SX(I+2) - SY(I+3) = SY(I+3) + SA * SX(I+3) + DO 30 I = M+1, N, 4 + SY(I) = SY(I) + SA * SX(I) + SY(I+1) = SY(I+1) + SA * SX(I+1) + SY(I+2) = SY(I+2) + SA * SX(I+2) + SY(I+3) = SY(I+3) + SA * SX(I+3) 30 CONTINUE - ELSE + ELSE C ** NONEQUAL OR NONPOSITIVE INCREMENTS. - IX = 1 - IY = 1 - IF( INCX.LT.0 ) IX = 1 + (N-1)*(-INCX) - IF( INCY.LT.0 ) IY = 1 + (N-1)*(-INCY) - DO 40 I = 1, N - SY(IY) = SY(IY) + SA*SX(IX) - IX = IX + INCX - IY = IY + INCY + IX = 1 + IY = 1 + IF( INCX.LT.0 ) IX = 1 + (N-1)*(-INCX) + IF( INCY.LT.0 ) IY = 1 + (N-1)*(-INCY) + DO 40 I = 1, N + SY(IY) = SY(IY) + SA*SX(IX) + IX = IX + INCX + IY = IY + INCY 40 CONTINUE - ENDIF + ENDIF - RETURN - END + RETURN + END -c REAL FUNCTION SDOT( N, SX, INCX, SY, INCY ) +c REAL FUNCTION SDOT( N, SX, INCX, SY, INCY ) C ############################## - FUNCTION SDOT( N, SX, INCX, SY, INCY ) + FUNCTION SDOT( N, SX, INCX, SY, INCY ) C ############################## C S.P. DOT PRODUCT OF VECTORS 'X' AND 'Y' @@ -18871,55 +18839,55 @@ C AND LY IS DEFINED IN A SIMILAR WAY USING INCY. IMPLICIT NONE INTEGER N,INCX,INCY - REAL SX(*), SY(*) + REAL SX(*), SY(*) REAL SDOT INTEGER I,M, IX, IY - SDOT = 0.0 - IF( N.LE.0 ) RETURN + SDOT = 0.0 + IF( N.LE.0 ) RETURN - IF ( INCX.EQ.INCY .AND. INCX.GT.1 ) THEN + IF ( INCX.EQ.INCY .AND. INCX.GT.1 ) THEN - DO 10 I = 1, 1+(N-1)*INCX, INCX - SDOT = SDOT + SX(I) * SY(I) + DO 10 I = 1, 1+(N-1)*INCX, INCX + SDOT = SDOT + SX(I) * SY(I) 10 CONTINUE - ELSE IF ( INCX.EQ.INCY .AND. INCX.EQ.1 ) THEN + ELSE IF ( INCX.EQ.INCY .AND. INCX.EQ.1 ) THEN C ** EQUAL, UNIT INCREMENTS - M = MOD(N,5) - IF( M .NE. 0 ) THEN + M = MOD(N,5) + IF( M .NE. 0 ) THEN C ** CLEAN-UP LOOP SO REMAINING VECTOR LENGTH C ** IS A MULTIPLE OF 4. - DO 20 I = 1, M - SDOT = SDOT + SX(I) * SY(I) + DO 20 I = 1, M + SDOT = SDOT + SX(I) * SY(I) 20 CONTINUE - ENDIF + ENDIF C ** UNROLL LOOP FOR SPEED - DO 30 I = M+1, N, 5 - SDOT = SDOT + SX(I)*SY(I) + SX(I+1)*SY(I+1) + DO 30 I = M+1, N, 5 + SDOT = SDOT + SX(I)*SY(I) + SX(I+1)*SY(I+1) $ + SX(I+2)*SY(I+2) + SX(I+3)*SY(I+3) $ + SX(I+4)*SY(I+4) 30 CONTINUE - ELSE + ELSE C ** NONEQUAL OR NONPOSITIVE INCREMENTS. - IX = 1 - IY = 1 - IF( INCX.LT.0 ) IX = 1 + (N-1)*(-INCX) - IF( INCY.LT.0 ) IY = 1 + (N-1)*(-INCY) - DO 40 I = 1, N - SDOT = SDOT + SX(IX) * SY(IY) - IX = IX + INCX - IY = IY + INCY + IX = 1 + IY = 1 + IF( INCX.LT.0 ) IX = 1 + (N-1)*(-INCX) + IF( INCY.LT.0 ) IY = 1 + (N-1)*(-INCY) + DO 40 I = 1, N + SDOT = SDOT + SX(IX) * SY(IY) + IX = IX + INCX + IY = IY + INCY 40 CONTINUE - ENDIF + ENDIF - RETURN - END - SUBROUTINE SSCAL( N, SA, SX, INCX ) + RETURN + END + SUBROUTINE SSCAL( N, SA, SX, INCX ) C CALCULATE X = A*X (X = VECTOR, A = SCALAR) @@ -18931,41 +18899,41 @@ C INCX SPACING OF VECTOR ELEMENTS IN 'SX' C --OUTPUT-- SX REPLACE SX(1+I*INCX) WITH SA * SX(1+I*INCX) C FOR I = 0 TO N-1 - REAL SA, SX(*) + REAL SA, SX(*) - IF( N.LE.0 ) RETURN + IF( N.LE.0 ) RETURN - IF( INCX.NE.1 ) THEN + IF( INCX.NE.1 ) THEN - DO 10 I = 1, 1+(N-1)*INCX, INCX - SX(I) = SA * SX(I) + DO 10 I = 1, 1+(N-1)*INCX, INCX + SX(I) = SA * SX(I) 10 CONTINUE - ELSE + ELSE - M = MOD(N,5) - IF( M.NE.0 ) THEN + M = MOD(N,5) + IF( M.NE.0 ) THEN C ** CLEAN-UP LOOP SO REMAINING VECTOR LENGTH C ** IS A MULTIPLE OF 5. - DO 30 I = 1, M - SX(I) = SA * SX(I) + DO 30 I = 1, M + SX(I) = SA * SX(I) 30 CONTINUE - ENDIF + ENDIF C ** UNROLL LOOP FOR SPEED - DO 50 I = M+1, N, 5 - SX(I) = SA * SX(I) - SX(I+1) = SA * SX(I+1) - SX(I+2) = SA * SX(I+2) - SX(I+3) = SA * SX(I+3) - SX(I+4) = SA * SX(I+4) + DO 50 I = M+1, N, 5 + SX(I) = SA * SX(I) + SX(I+1) = SA * SX(I+1) + SX(I+2) = SA * SX(I+2) + SX(I+3) = SA * SX(I+3) + SX(I+4) = SA * SX(I+4) 50 CONTINUE - ENDIF + ENDIF - RETURN - END - SUBROUTINE SSWAP( N, SX, INCX, SY, INCY ) + RETURN + END + SUBROUTINE SSWAP( N, SX, INCX, SY, INCY ) C INTERCHANGE S.P VECTORS X AND Y @@ -18985,67 +18953,67 @@ C WHERE LX = 1 IF INCX .GE. 0, C = (-INCX)*N IF INCX .LT. 0 C AND LY IS DEFINED IN A SIMILAR WAY USING INCY. - REAL SX(*), SY(*), STEMP1, STEMP2, STEMP3 + REAL SX(*), SY(*), STEMP1, STEMP2, STEMP3 - IF( N.LE.0 ) RETURN + IF( N.LE.0 ) RETURN - IF ( INCX.EQ.INCY .AND. INCX.GT.1 ) THEN + IF ( INCX.EQ.INCY .AND. INCX.GT.1 ) THEN - DO 10 I = 1, 1+(N-1)*INCX, INCX - STEMP1 = SX(I) - SX(I) = SY(I) - SY(I) = STEMP1 + DO 10 I = 1, 1+(N-1)*INCX, INCX + STEMP1 = SX(I) + SX(I) = SY(I) + SY(I) = STEMP1 10 CONTINUE - ELSE IF ( INCX.EQ.INCY .AND. INCX.EQ.1 ) THEN + ELSE IF ( INCX.EQ.INCY .AND. INCX.EQ.1 ) THEN C ** EQUAL, UNIT INCREMENTS - M = MOD(N,3) - IF( M .NE. 0 ) THEN + M = MOD(N,3) + IF( M .NE. 0 ) THEN C ** CLEAN-UP LOOP SO REMAINING VECTOR LENGTH C ** IS A MULTIPLE OF 3. - DO 20 I = 1, M - STEMP1 = SX(I) - SX(I) = SY(I) - SY(I) = STEMP1 + DO 20 I = 1, M + STEMP1 = SX(I) + SX(I) = SY(I) + SY(I) = STEMP1 20 CONTINUE - ENDIF + ENDIF C ** UNROLL LOOP FOR SPEED - DO 30 I = M+1, N, 3 - STEMP1 = SX(I) - STEMP2 = SX(I+1) - STEMP3 = SX(I+2) - SX(I) = SY(I) - SX(I+1) = SY(I+1) - SX(I+2) = SY(I+2) - SY(I) = STEMP1 - SY(I+1) = STEMP2 - SY(I+2) = STEMP3 + DO 30 I = M+1, N, 3 + STEMP1 = SX(I) + STEMP2 = SX(I+1) + STEMP3 = SX(I+2) + SX(I) = SY(I) + SX(I+1) = SY(I+1) + SX(I+2) = SY(I+2) + SY(I) = STEMP1 + SY(I+1) = STEMP2 + SY(I+2) = STEMP3 30 CONTINUE - ELSE + ELSE C ** NONEQUAL OR NONPOSITIVE INCREMENTS. - IX = 1 - IY = 1 - IF( INCX.LT.0 ) IX = 1 + (N-1)*(-INCX) - IF( INCY.LT.0 ) IY = 1 + (N-1)*(-INCY) - DO 40 I = 1, N - STEMP1 = SX(IX) - SX(IX) = SY(IY) - SY(IY) = STEMP1 - IX = IX + INCX - IY = IY + INCY + IX = 1 + IY = 1 + IF( INCX.LT.0 ) IX = 1 + (N-1)*(-INCX) + IF( INCY.LT.0 ) IY = 1 + (N-1)*(-INCY) + DO 40 I = 1, N + STEMP1 = SX(IX) + SX(IX) = SY(IY) + SY(IY) = STEMP1 + IX = IX + INCX + IY = IY + INCY 40 CONTINUE - ENDIF + ENDIF - RETURN - END + RETURN + END -c INTEGER FUNCTION ISAMAX( N, SX, INCX ) +c INTEGER FUNCTION ISAMAX( N, SX, INCX ) C ############################## - FUNCTION ISAMAX( N, SX, INCX ) + FUNCTION ISAMAX( N, SX, INCX ) C ############################## C --INPUT-- N NUMBER OF ELEMENTS IN VECTOR OF INTEREST @@ -19056,29 +19024,29 @@ C --OUTPUT-- ISAMAX FIRST I, I = 1 TO N, TO MAXIMIZE C ABS(SX(1+(I-1)*INCX)) IMPLICIT NONE INTEGER ISAMAX, N, INCX - REAL SX(*), SMAX, XMAG + REAL SX(*), SMAX, XMAG INTEGER II, I - IF( N.LE.0 ) THEN - ISAMAX = 0 - ELSE IF( N.EQ.1 ) THEN - ISAMAX = 1 - ELSE - SMAX = 0.0 - II = 1 - DO 20 I = 1, 1+(N-1)*INCX, INCX - XMAG = ABS(SX(I)) - IF( SMAX.LT.XMAG ) THEN - SMAX = XMAG - ISAMAX = II - ENDIF - II = II + 1 + IF( N.LE.0 ) THEN + ISAMAX = 0 + ELSE IF( N.EQ.1 ) THEN + ISAMAX = 1 + ELSE + SMAX = 0.0 + II = 1 + DO 20 I = 1, 1+(N-1)*INCX, INCX + XMAG = ABS(SX(I)) + IF( SMAX.LT.XMAG ) THEN + SMAX = XMAG + ISAMAX = II + ENDIF + II = II + 1 20 CONTINUE - ENDIF + ENDIF - RETURN - END + RETURN + END C ############################## FUNCTION D1MACH(i) @@ -19777,7 +19745,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -20237,7 +20204,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -20479,7 +20445,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -20890,7 +20855,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -21098,7 +21062,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -21297,7 +21260,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -21507,7 +21469,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -21671,7 +21632,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -21909,7 +21869,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -22259,7 +22218,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -22881,7 +22839,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -23377,7 +23334,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -23636,7 +23592,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -23987,7 +23942,7 @@ c INCLUDE 'params' *= 2 nm resolution (table 2) for > 402 nm =* *= (2) average at 1 nm of Staffelbach et al., 1995, and =* *= Meller et al., 1991 =* -*= (3) Plum et al., 1983, as tabulated by KFA =* +*= (3) Plum et al., 1983, as tabulated by KFA =* *= (4) Meller et al., 1991 (0.033 nm res.), as tab. by KFA =* *= (5) Meller et al., 1991 (1.0 nm res.), as tab. by KFA =* *= (6) Staffelbach et al., 1995, as tabulated by KFA =* @@ -24070,7 +24025,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -24554,7 +24508,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -24977,7 +24930,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -25273,7 +25225,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -25695,7 +25646,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -25733,7 +25683,7 @@ c INCLUDE 'params' * local REAL yg(kw), yg2(kw) - real qyNO2, qyNO3 + real qyNO2, qyNO3 REAL sig INTEGER ierr @@ -25912,7 +25862,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -26076,7 +26025,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -26310,7 +26258,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -26475,7 +26422,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -26641,7 +26587,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -26835,7 +26780,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -27028,7 +26972,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -27195,7 +27138,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -27366,7 +27308,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -27537,7 +27478,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -27704,7 +27644,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -27922,7 +27861,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -28139,7 +28077,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -28307,7 +28244,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -28513,7 +28449,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) * input @@ -28719,7 +28654,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -28887,7 +28821,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -29102,7 +29035,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -29271,7 +29203,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -29440,7 +29371,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -29702,7 +29632,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -29878,7 +29807,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -30047,7 +29975,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -30216,7 +30143,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -30385,7 +30311,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -30427,7 +30352,6 @@ c INCLUDE 'params' ************************************************************** ************* CF2BrCF2Br (Halon-2402) photodissociation - j = j+1 jlabel(j) = 'CF2BrCF2Br (Halon-2402) -> Products' @@ -30452,7 +30376,7 @@ c INCLUDE 'params' CALL inter2(nw,wl,yg,n,x1,y1,ierr) - + IF (ierr .NE. 0) THEN WRITE(*,*) ierr, jlabel(j) call Print_msg( NVERB_FATAL, 'GEN', 'r43', '' ) @@ -30553,7 +30477,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -30716,7 +30639,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -30925,7 +30847,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -31098,7 +31019,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -31301,7 +31221,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -31517,7 +31436,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -31724,7 +31642,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -31929,7 +31846,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -31967,7 +31883,7 @@ c INCLUDE 'params' * local REAL yg(kw), yg2(kw) - real qy + real qy REAL sig INTEGER ierr @@ -32003,11 +31919,11 @@ c INCLUDE 'params' * quantum yields assumed to be 0.01 (upper limit) - qy = 0.01 + qy = 0.01 DO iw = 1, nw-1 DO i = 1, nz - sig = yg(iw) + sig = yg(iw) sq(j,i,iw) = qy * sig ENDDO ENDDO @@ -32106,7 +32022,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -32309,7 +32224,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -32495,7 +32409,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -32678,7 +32591,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -32826,7 +32738,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -32974,7 +32885,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -33122,7 +33032,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -33291,7 +33200,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -33489,7 +33397,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -33625,7 +33532,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -33773,7 +33679,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -33924,7 +33829,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -34154,7 +34058,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -34327,7 +34230,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -34365,7 +34267,7 @@ c INCLUDE 'params' * local REAL yg(kw), yg2(kw) - real qyNO2, qyNO3 + real qyNO2, qyNO3 REAL sig INTEGER ierr @@ -34417,7 +34319,7 @@ c INCLUDE 'params' * quantum yields from Harwood et al., at 308 nm qyNO2 = 0.61 - qyNO3 = 0.39 + qyNO3 = 0.39 DO iw = 1, nw-1 DO i = 1, nz @@ -34521,7 +34423,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -34559,7 +34460,7 @@ c INCLUDE 'params' * local REAL yg(kw), yg2(kw) - real qy + real qy REAL sig INTEGER ierr @@ -34695,7 +34596,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -34733,7 +34633,7 @@ c INCLUDE 'params' * local REAL yg(kw), yg2(kw) - real qy, qym1 + real qy, qym1 REAL sig INTEGER ierr @@ -34771,16 +34671,16 @@ c INCLUDE 'params' DO iw = 1, nw-1 DO i = 1, nz - if(airden(i) .gt. 2.6e19) then - qy = 0.004 - elseif(airden(i) .gt. 8.e17 .and. airden(i) .lt. 2.6e19) then - qym1 = 0.086 + 1.613e-17 * airden(i) - qy = 0.004 + 1./qym1 + if(airden(i) .gt. 2.6e19) then + qy = 0.004 + elseif(airden(i) .gt. 8.e17 .and. airden(i) .lt. 2.6e19) then + qym1 = 0.086 + 1.613e-17 * airden(i) + qy = 0.004 + 1./qym1 elseif(airden(i) .lt. 8.e17) then - qym1 = 0.086 + 1.613e-17 * 8.e17 - qy = 0.004 + 1./qym1 - endif - sig = yg(iw) + qym1 = 0.086 + 1.613e-17 * 8.e17 + qy = 0.004 + 1./qym1 + endif + sig = yg(iw) sq(j,i,iw) = qy * sig ENDDO ENDDO @@ -34875,7 +34775,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -34913,7 +34812,7 @@ c INCLUDE 'params' * local REAL yg(kw), yg2(kw) - real qy + real qy REAL sig INTEGER ierr @@ -34949,11 +34848,11 @@ c INCLUDE 'params' * quantum yields assumed unity - qy = 1. + qy = 1. DO iw = 1, nw-1 DO i = 1, nz - sig = yg(iw) + sig = yg(iw) sq(j,i,iw) = qy * sig ENDDO ENDDO @@ -35048,7 +34947,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -35216,7 +35114,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -35432,7 +35329,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -36813,7 +36709,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -36987,7 +36882,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -37160,7 +37054,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -37331,7 +37224,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -37507,7 +37399,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -37677,7 +37568,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -37938,7 +37828,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -38107,7 +37996,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -38276,7 +38164,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -38469,7 +38356,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -38662,7 +38548,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -38836,7 +38721,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -39010,7 +38894,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -39182,7 +39065,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -39352,7 +39234,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -39540,7 +39421,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -39707,7 +39587,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -39879,7 +39758,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -40054,7 +39932,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -40227,7 +40104,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -40407,7 +40283,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -40585,7 +40460,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -40724,11 +40598,10 @@ c INCLUDE 'params' *! overwrite for pbl: - IF(ipbl .GT. 0) THEN + IF(ipbl .GT. 0) THEN write (*,*) 'pbl aerosols, aod330 = ', aod330 * create wavelength-dependent optical depth and single scattering albedo: - DO iw = 1, nw-1 wc = (wl(iw)+wl(iw+1))/2. aodw(iw) = aod330*(wc/330.)**(-1.0) @@ -40736,7 +40609,7 @@ c INCLUDE 'params' ssaw(iw) = 0.6 ELSE ssaw(iw) = 0.9 - ENDIF + ENDIF ENDDO * divide aod among pbl layers, overwrite Elterman profile in pbl @@ -40744,7 +40617,7 @@ c INCLUDE 'params' DO i = 1, ipbl fract(i) = (z(i+1) - z(i))/zpbl ENDDO - + DO iw = 1, nw-1 DO i = 1, ipbl dtaer(i, iw) = aodw(iw) * fract(i) @@ -40829,7 +40702,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -40941,7 +40813,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -41166,7 +41037,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -41296,7 +41166,7 @@ c INCLUDE 'params' ************************************ * calculate optical depth for each layer. Output: dtno2(kz,kw) -98 continue +98 continue DO 20, l = 1, nw-1 DO 10, i = 1, nz-1 dtno2(i,l) = cz(i)*no2xs(i,l) @@ -41383,7 +41253,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -41530,7 +41399,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -41763,7 +41631,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -41910,7 +41777,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -42164,7 +42030,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -42350,7 +42215,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -42489,7 +42353,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -42942,7 +42805,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -43167,7 +43029,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -43386,7 +43247,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) @@ -43512,7 +43372,6 @@ c INCLUDE 'params' PARAMETER(nzero = -10./largest) * machine precision - REAL precis PARAMETER(precis = 1.e-7) diff --git a/src/MNH/ch_field_valuen.f90 b/src/MNH/ch_field_valuen.f90 index 0dcd5670a..141862e5b 100644 --- a/src/MNH/ch_field_valuen.f90 +++ b/src/MNH/ch_field_valuen.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -10,7 +10,7 @@ INTERFACE !! FUNCTION CH_FIELD_VALUE_n(PZ, HGRIDTYPE, HNAME, & - HUNIT, KLUOUT, KVERB) + HUNIT, KLUOUT, KVERB) IMPLICIT NONE REAL :: CH_FIELD_VALUE_n! the function name REAL, INTENT(IN) :: PZ ! x-y-z coo. to initialize @@ -28,7 +28,7 @@ END MODULE MODI_CH_FIELD_VALUE_n !! !! ########################################################## FUNCTION CH_FIELD_VALUE_n(PZ, HGRIDTYPE, HNAME, & - HUNIT, KLUOUT, KVERB) + HUNIT, KLUOUT, KVERB) !! ########################################################## !! !!*** *CH_FIELD_VALUE_n* diff --git a/src/MNH/ch_init_budgetn.f90 b/src/MNH/ch_init_budgetn.f90 index 5f6449041..99cb55a7e 100644 --- a/src/MNH/ch_init_budgetn.f90 +++ b/src/MNH/ch_init_budgetn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2016-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2016-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -44,7 +44,7 @@ END MODULE MODI_CH_INIT_BUDGET_n !! !! AUTHOR !! ------ -!! F. Brosse *Laboratoire d'Aerologie UPS-CNRS* +!! F. Brosse *Laboratoire d'Aerologie UPS-CNRS* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ch_init_diagnostics.f90 b/src/MNH/ch_init_diagnostics.f90 index a3c4783a8..b43d1b377 100644 --- a/src/MNH/ch_init_diagnostics.f90 +++ b/src/MNH/ch_init_diagnostics.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -91,7 +91,7 @@ WRITE(NDIAGIO,'(A)') CRUNID ! ! number of variables and their names WRITE(NDIAGIO,'(4I10)') 1+NEQ+NREAC+2*NEQ+NNONZEROTERMS, & - NEQ, NREAC, NNONZEROTERMS + NEQ, NREAC, NNONZEROTERMS ! ! diagnostics time WRITE(NDIAGIO, '(A)') "XTSIMUL" diff --git a/src/MNH/ch_init_meteo.f90 b/src/MNH/ch_init_meteo.f90 index 74bc0ec52..2e53506b9 100644 --- a/src/MNH/ch_init_meteo.f90 +++ b/src/MNH/ch_init_meteo.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -83,7 +83,7 @@ TYPE(METEOTRANSTYPE), INTENT(OUT) :: TPM ! the meteo variables character(len=10) :: ynum1, ynum2 ! Strings for error message INTEGER :: JI, JJ ! loop control INTEGER :: IMETEOVARS ! number of meteovars to be read from file and - ! checked against NMETEOVARS + ! checked against NMETEOVARS INTEGER :: ILUMETEO ! !------------------------------------------------------------------------------ @@ -116,7 +116,7 @@ END DO ! print names of meteo variables IF (NVERB >= 5) THEN PRINT *, 'CH_INIT_METEO: the following ', NMETEOVARS, & - ' meteo variables will be updated:' + ' meteo variables will be updated:' DO JI = 1, NMETEOVARS PRINT *, TPM%CMETEOVAR(JI) END DO diff --git a/src/MNH/ch_init_prodlosstotn.f90 b/src/MNH/ch_init_prodlosstotn.f90 index a5547a445..2e64144e7 100644 --- a/src/MNH/ch_init_prodlosstotn.f90 +++ b/src/MNH/ch_init_prodlosstotn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2016-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2016-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -44,7 +44,7 @@ END MODULE MODI_CH_INIT_PRODLOSSTOT_n !! !! AUTHOR !! ------ -!! F. Brosse *Laboratoire d'Aerologie UPS-CNRS* +!! F. Brosse *Laboratoire d'Aerologie UPS-CNRS* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ch_linssa.f90 b/src/MNH/ch_linssa.f90 index e530c4541..47a8f7525 100644 --- a/src/MNH/ch_linssa.f90 +++ b/src/MNH/ch_linssa.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -145,7 +145,7 @@ ENDDO ! !* 4. CALCULATE LU FACTORIZATION FOR MATRIX (P-dt/2 J^n)^-1 ! ---------------------------------------------------------- -! (result is put in ZWORK) +! (result is put in ZWORK) ! IFAIL = 1 CALL CH_GAUSS(ZWORK,ZINV,KEQ,IFAIL) diff --git a/src/MNH/ch_model0d.f90 b/src/MNH/ch_model0d.f90 index 26ff9fe18..327598fa2 100644 --- a/src/MNH/ch_model0d.f90 +++ b/src/MNH/ch_model0d.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -382,7 +382,7 @@ ZZENITH(:,:) = ACOS(ZCOSZEN) !------------------------------------------------------------------------------- ! !* 2. COMPUTES THE SOLAR DECLINATION ANGLE -! ------------------------------------ +! ------------------------------------ ! !* 2.1 set reaction and photolysis rates diff --git a/src/MNH/ch_qssa.f90 b/src/MNH/ch_qssa.f90 index d4f4824be..555559c52 100644 --- a/src/MNH/ch_qssa.f90 +++ b/src/MNH/ch_qssa.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -99,7 +99,7 @@ INTEGER, INTENT(IN) :: KQSSAITER ! REAL, DIMENSION(KVECNPT,KEQ) :: ZPROD, ZLOSS, ZCONC0, ZTMP LOGICAL, DIMENSION(KVECNPT,KEQ) :: GSHORT, GMED, GLONG - ! mask for short, medium and long lived species + ! mask for short, medium and long lived species INTEGER :: ICOUNT ! counter for iteration number ! !------------------------------------------------------------------------------ diff --git a/src/MNH/ch_surface0d.f90 b/src/MNH/ch_surface0d.f90 index 8247ae0b7..d3d19af47 100644 --- a/src/MNH/ch_surface0d.f90 +++ b/src/MNH/ch_surface0d.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1999-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1999-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -70,7 +70,7 @@ INTEGER, SAVE :: ILU = -1 ! unit number for IO INTEGER :: JI REAL, DIMENSION(KEQ) :: ZDEPO ! deposition velocity REAL, DIMENSION(KEQ) :: ZEMIS ! emission flux after multiplication - ! with emission factor + ! with emission factor REAL :: ZEMISFACTOR ! emission factor ! REAL :: ZHEIGHT ! the height of the box @@ -171,7 +171,7 @@ ZEMIS(:) = ZEMIS(1:KEQ) * ZEMISFACTOR ! ---------------- ! PCONC(:) = (PCONC(:) + PDTACT*ZEMIS(:)/(100.*ZHEIGHT)) & - / (1. + PDTACT*ZDEPO(:)/(100.*ZHEIGHT)) + / (1. + PDTACT*ZDEPO(:)/(100.*ZHEIGHT)) ! !* generate a makeplot-type output file ! diff --git a/src/MNH/ch_svode.f90 b/src/MNH/ch_svode.f90 index 07b5ca630..7973a9732 100644 --- a/src/MNH/ch_svode.f90 +++ b/src/MNH/ch_svode.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -25,9 +25,9 @@ REAL, INTENT(IN) :: PDTACT ! actual time-step INTEGER, INTENT(IN) :: KEQ ! dimension of the problem to solve INTEGER, INTENT(IN) :: KVECNPT REAL, INTENT(IN), DIMENSION(KVECNPT,KEQ) :: PCONC - ! concentration vector at PTSIMUL + ! concentration vector at PTSIMUL REAL, INTENT(OUT), DIMENSION(KVECNPT,KEQ) :: PNEWCONC - ! solution at PTSIMUL + PDTACT + ! solution at PTSIMUL + PDTACT INTEGER, INTENT(IN) :: KMI ! model index REAL, INTENT(IN) :: PRTOL, PATOL INTEGER, INTENT(IN) :: KPED @@ -88,9 +88,9 @@ REAL, INTENT(IN) :: PDTACT ! actual time-step INTEGER, INTENT(IN) :: KEQ ! dimension of the problem to solve INTEGER, INTENT(IN) :: KVECNPT REAL, INTENT(IN), DIMENSION(KVECNPT,KEQ) :: PCONC - ! concentration vector at PTSIMUL + ! concentration vector at PTSIMUL REAL, INTENT(OUT), DIMENSION(KVECNPT,KEQ) :: PNEWCONC - ! solution at PTSIMUL + PDTACT + ! solution at PTSIMUL + PDTACT INTEGER, INTENT(IN) :: KMI ! model index REAL, INTENT(IN) :: PRTOL, PATOL INTEGER, INTENT(IN) :: KPED @@ -153,7 +153,7 @@ DO JI = 1, KVECNPT ! call SVODE solver CALL SVODE (CH_SVODE_FCN, KEQ, ZCONC, ZTBEGIN, ZTEND, & - ITOL, ZRTOL, ZATOL, ITASK, & + ITOL, ZRTOL, ZATOL, ITASK, & ISTATE, IOPT, ZWORK, IRW, IWORK, IIW, CH_SVODE_JAC, IMF, & ZPAR, IPAR, KMI, JI) diff --git a/src/MNH/ch_update_meteo.f90 b/src/MNH/ch_update_meteo.f90 index c6550299a..935af5ef8 100644 --- a/src/MNH/ch_update_meteo.f90 +++ b/src/MNH/ch_update_meteo.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -87,10 +87,10 @@ ELSE IF (PTIME .GE. XMETEOTIME(NMETEORECACT+1)) NMETEORECACT = NMETEORECACT+1 ! ZALPHA = (PTIME - XMETEOTIME(NMETEORECACT)) & - / (XMETEOTIME(NMETEORECACT+1) - XMETEOTIME(NMETEORECACT)) + / (XMETEOTIME(NMETEORECACT+1) - XMETEOTIME(NMETEORECACT)) ! TPM%XMETEOVAR(1:NMETEOVARS) = ZALPHA * XMETEODATA(1:NMETEOVARS,NMETEORECACT+1) & - + (1.-ZALPHA) * XMETEODATA(1:NMETEOVARS,NMETEORECACT) + + (1.-ZALPHA) * XMETEODATA(1:NMETEOVARS,NMETEORECACT) ! END IF ! diff --git a/src/MNH/check_zhat.f90 b/src/MNH/check_zhat.f90 index 1f4487567..c69a52025 100644 --- a/src/MNH/check_zhat.f90 +++ b/src/MNH/check_zhat.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -60,7 +60,7 @@ END MODULE MODI_CHECK_ZHAT !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/check_zs.f90 b/src/MNH/check_zs.f90 index bab046512..59855f31d 100644 --- a/src/MNH/check_zs.f90 +++ b/src/MNH/check_zs.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -63,7 +63,7 @@ END MODULE MODI_CHECK_ZS !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/close_file_mnh.f90 b/src/MNH/close_file_mnh.f90 index 6d3d87e4b..f70d2cdad 100644 --- a/src/MNH/close_file_mnh.f90 +++ b/src/MNH/close_file_mnh.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -42,7 +42,7 @@ END MODULE MODI_CLOSE_FILE_MNH !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/coef_ver_interp_lin.f90 b/src/MNH/coef_ver_interp_lin.f90 index 1fe41f617..2905a2f0f 100644 --- a/src/MNH/coef_ver_interp_lin.f90 +++ b/src/MNH/coef_ver_interp_lin.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -132,7 +132,7 @@ END MODULE MODI_COEF_VER_INTERP_LIN3D !! !! AUTHOR !! ------ -!! +!! ! V.Masson Meteo-France !! !! MODIFICATIONS @@ -299,7 +299,7 @@ END SUBROUTINE COEF_VER_INTERP_LIN3D !! !! AUTHOR !! ------ -!! +!! ! V.Masson Meteo-France !! !! MODIFICATIONS @@ -398,7 +398,7 @@ END SUBROUTINE COEF_VER_INTERP_LIN2D !! !! AUTHOR !! ------ -!! +!! ! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/compare_with_pgd_domain.f90 b/src/MNH/compare_with_pgd_domain.f90 index 028dc1f80..4b323dacd 100644 --- a/src/MNH/compare_with_pgd_domain.f90 +++ b/src/MNH/compare_with_pgd_domain.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -67,7 +67,7 @@ END MODULE MODI_COMPARE_WITH_PGD_DOMAIN !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/compute_exner_from_ground.f90 b/src/MNH/compute_exner_from_ground.f90 index 60225dbf1..3cd915bc1 100644 --- a/src/MNH/compute_exner_from_ground.f90 +++ b/src/MNH/compute_exner_from_ground.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -97,7 +97,7 @@ END MODULE MODI_COMPUTE_EXNER_FROM_GROUND3 !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS @@ -211,7 +211,7 @@ END SUBROUTINE COMPUTE_EXNER_FROM_GROUND3D !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/compute_press_from_oceanbot.f90 b/src/MNH/compute_press_from_oceanbot.f90 index 56c8f6b6e..2f49e2224 100644 --- a/src/MNH/compute_press_from_oceanbot.f90 +++ b/src/MNH/compute_press_from_oceanbot.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2021-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2021-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -93,7 +93,7 @@ END MODULE MODI_COMPUTE_PRESS_FROM_OCEANBOT3D !! !! AUTHOR !! ------ -!! +!! !! JLR !! MODIFICATIONS !! ------------- @@ -175,7 +175,7 @@ END SUBROUTINE COMPUTE_PRESS_FROM_OCEANBOT3D !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/compute_r00.f90 b/src/MNH/compute_r00.f90 index 8e3794f4f..4952460f7 100644 --- a/src/MNH/compute_r00.f90 +++ b/src/MNH/compute_r00.f90 @@ -103,7 +103,7 @@ SUBROUTINE COMPUTE_R00(TPFILE) !! !! AUTHOR !! ------ -!! F. Gheusi and J. Stein * Meteo France * +!! F. Gheusi and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/compute_spectre.f90 b/src/MNH/compute_spectre.f90 index 91a45b31a..7d505941b 100644 --- a/src/MNH/compute_spectre.f90 +++ b/src/MNH/compute_spectre.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -46,7 +46,7 @@ END MODULE MODI_COMPUTE_SPECTRE ! ! AUTHOR ! ------ -! A. Mary, R. Legrand **ENM** +! A. Mary, R. Legrand **ENM** ! D. Ricard **CNRM** !! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O !! Philippe Wautelet: 10/01/2019: use NEWUNIT argument of OPEN @@ -269,7 +269,7 @@ ENDIF ! ZY = PY ! -! 4.3 2way structure -> xslice structure, + data shift +! 4.3 2way structure -> xslice structure, + data shift ! ZBAND_X=0. CALL REMAP_2WAY_X_ll(ZY,ZBAND_X,IINFO_ll) @@ -300,18 +300,18 @@ END IF ! !------------------------------------------------------------------------------- ! -!* 6. SPECTRA COMPUTATION +!* 6. SPECTRA COMPUTATION ! ------------------- -!* 6.1 initialisation of values +!* 6.1 initialisation of values ! -! computation of the minimum domain dimension +! computation of the minimum domain dimension IF (IIX<IJY) THEN IMIN=IIX-2 ELSE IMIN=IJY-2 END IF ! -! allocation errors +! allocation errors ALLOCATE(ZSP(IMIN-1,IKU)) ALLOCATE(ZANB(IMIN)) ALLOCATE(ZLGO(IMIN,2)) @@ -323,8 +323,8 @@ ZANB=0. ZLGO=0. ZAP=0. ! -!* 6.2 algorithm -! writing of the wavenumbers and wavelengths +!* 6.2 algorithm +! writing of the wavenumbers and wavelengths DO JNB=1,IMIN ZANB(JNB)=real(JNB)/real(IMIN) ZLGO(JNB,1)=JNB @@ -332,7 +332,7 @@ DO JNB=1,IMIN END DO ! ! -! computation of variances, gathering of variances by wavenumbers +! computation of variances, gathering of variances by wavenumbers DO JI=1,IIX-2 DO JJ=1,IJY-2 IF (JI/=1 .OR. JJ/=1) THEN @@ -370,10 +370,10 @@ END DO ! !------------------------------------------------------------------------------- ! -!* 7. STATISTICS +!* 7. STATISTICS ! ---------- IF(LSTAT) THEN - !* 7.1 Direct statistics + !* 7.1 Direct statistics DO JK=2,IKU-1 ZMOY_C=0. ZVAR_S=0. @@ -410,7 +410,7 @@ IF(LSTAT) THEN print*,"Variance du champ (calculée à partir du spectre) =",ZVAR_S2 print*,"Résidus =",ZVAR_S-ZVAR_S2 ENDDO - !* 7.1 Second statistics + !* 7.1 Second statistics !APPLY A COMPLEX TO REAL FFT IF (.NOT. L2D) THEN CALL FFT55( ZBAND_YT(1,1,IKB-1),ZWORKY,ZTRIGSY,IIFAXY,INC1Y,INC2Y, & @@ -454,7 +454,7 @@ ENDIF ! !------------------------------------------------------------------------------- ! -!* 7. WRITING IN RESULT FILE +!* 7. WRITING IN RESULT FILE ! ------------------- ! !* 7.1 Name of result file @@ -491,7 +491,7 @@ ENDIF ! !------------------------------------------------------------------------------- ! -!* 7. DEALLOCATION OF ARRAYS +!* 7. DEALLOCATION OF ARRAYS ! ------------------- ! DEALLOCATE(ZBAND_X) diff --git a/src/MNH/condsamp.f90 b/src/MNH/condsamp.f90 index 8142daedc..e4ec13fef 100644 --- a/src/MNH/condsamp.f90 +++ b/src/MNH/condsamp.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -107,7 +107,7 @@ INTEGER :: IIMAX_ll,IJMAX_ll !-------------------------------------------------------------------------------------- ! ! -!* 0. Initialisation +!* 0. Initialisation ! ! CALL GET_DIM_EXT_ll('B',IIU,IJU) @@ -127,8 +127,8 @@ END DO END IF ! ! -!* 1. INITIALIZATION OF CONDITIONAL SAMPLING TRACERS -! ---------------------------------------------- +!* 1. INITIALIZATION OF CONDITIONAL SAMPLING TRACERS +! ---------------------------------------------- ! on veut initialiser le 1er traceur a la surface tout le temps ! le 2E si cloud 100m en dessous de cloud base ! le 3eme si cloud 100m au dessus de cloud top diff --git a/src/MNH/conjgrad.f90 b/src/MNH/conjgrad.f90 index 63c3cad9e..4c89a814a 100644 --- a/src/MNH/conjgrad.f90 +++ b/src/MNH/conjgrad.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -124,7 +124,7 @@ END MODULE MODI_CONJGRAD !! !! AUTHOR !! ------ -!! P. HÅreil and J. Stein * Meteo France * +!! P. H�reil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/conresol.f90 b/src/MNH/conresol.f90 index 8b33d0dcc..481bc6405 100644 --- a/src/MNH/conresol.f90 +++ b/src/MNH/conresol.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1999-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1999-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -118,7 +118,7 @@ END MODULE MODI_CONRESOL !! !! AUTHOR !! ------ -!! J.-P. Pinty *Laboratoire d'Aerologie* +!! J.-P. Pinty *Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/conresolz.f90 b/src/MNH/conresolz.f90 index 358b78ea7..22a47c3d3 100644 --- a/src/MNH/conresolz.f90 +++ b/src/MNH/conresolz.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1999-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1999-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -128,7 +128,7 @@ END MODULE MODI_CONRESOLZ !! !! AUTHOR !! ------ -!! J.-P. Pinty *Laboratoire d'Aerologie* +!! J.-P. Pinty *Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/contrav.f90 b/src/MNH/contrav.f90 index 44e3b3333..1ee05c3b7 100644 --- a/src/MNH/contrav.f90 +++ b/src/MNH/contrav.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -87,7 +87,7 @@ END MODULE MODI_CONTRAV !! AUTHOR !! ------ !! J.L. Redelsperger * CNRM * -!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Pinty * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/convection.f90 b/src/MNH/convection.f90 index f80a0c089..4cc26bb01 100644 --- a/src/MNH/convection.f90 +++ b/src/MNH/convection.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1998-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1998-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -233,7 +233,7 @@ LOGICAL, INTENT(IN) :: OUSECHEM, OCH_CONV_SCAV LOGICAL, INTENT(IN) :: OCH_CONV_LINOX, ODUST, OSALT REAL, DIMENSION(:,:), OPTIONAL, INTENT(INOUT) :: PIC_RATE ! IC lightning frequency REAL, DIMENSION(:,:), OPTIONAL, INTENT(INOUT) :: PCG_RATE ! CG lightning frequency -! +! ! Diagnostic variables: REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PUMF ! updraft mass flux REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDMF ! downdraft mass flux @@ -245,7 +245,7 @@ INTEGER, DIMENSION(:,:),INTENT(INOUT) :: KCLTOP ! cloud top level INTEGER, DIMENSION(:,:),INTENT(INOUT) :: KCLBAS ! cloud base level ! they are given a value of ! 0 if no convection -! +! ! !* 0.2 Declarations of local variables : ! diff --git a/src/MNH/cphase_profile.f90 b/src/MNH/cphase_profile.f90 index f403e5447..ed00a4390 100644 --- a/src/MNH/cphase_profile.f90 +++ b/src/MNH/cphase_profile.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -41,7 +41,7 @@ END MODULE MODI_CPHASE_PROFILE !! !! AUTHOR !! ------ -!! V. Masson & C. Lac * Meteo France * +!! V. Masson & C. Lac * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/dealloc_para_ll.f90 b/src/MNH/dealloc_para_ll.f90 index e17c43949..690fca063 100644 --- a/src/MNH/dealloc_para_ll.f90 +++ b/src/MNH/dealloc_para_ll.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -34,7 +34,7 @@ !! !! AUTHOR !! ------ -!! +!! !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/deallocate_model1.f90 b/src/MNH/deallocate_model1.f90 index 8b8f57214..5a13392a2 100644 --- a/src/MNH/deallocate_model1.f90 +++ b/src/MNH/deallocate_model1.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1997-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1997-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -53,7 +53,7 @@ END MODULE MODI_DEALLOCATE_MODEL1 !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/default_expre.f90 b/src/MNH/default_expre.f90 index b3c6d1d1a..d938f4e40 100644 --- a/src/MNH/default_expre.f90 +++ b/src/MNH/default_expre.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -81,7 +81,7 @@ END MODULE MODI_DEFAULT_EXPRE !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/default_gr_field.f90 b/src/MNH/default_gr_field.f90 index 3203cd801..59b20d37b 100644 --- a/src/MNH/default_gr_field.f90 +++ b/src/MNH/default_gr_field.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -54,7 +54,7 @@ END MODULE MODI_DEFAULT_GR_FIELD !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/default_sleve.f90 b/src/MNH/default_sleve.f90 index 3760b6376..4382df61e 100644 --- a/src/MNH/default_sleve.f90 +++ b/src/MNH/default_sleve.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -53,7 +53,7 @@ END MODULE MODI_DEFAULT_SLEVE !! !! AUTHOR !! ------ -!! G. Zangler * LA * +!! G. Zangler * LA * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/define_maskn.f90 b/src/MNH/define_maskn.f90 index e7c927cb6..561a13ab9 100644 --- a/src/MNH/define_maskn.f90 +++ b/src/MNH/define_maskn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -44,7 +44,7 @@ END MODULE MODI_DEFINE_MASK_n !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/detect_field_mnh.f90 b/src/MNH/detect_field_mnh.f90 index 8d94c1c35..416257461 100644 --- a/src/MNH/detect_field_mnh.f90 +++ b/src/MNH/detect_field_mnh.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -56,7 +56,7 @@ SUBROUTINE DETECT_FIELD_MNH(HPROGRAM,KI,KJ,PFIELD,OITSHERE) !! !! AUTHOR !! ------ -!! S.Malardel * Meteo France * +!! S.Malardel * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/dotprod.f90 b/src/MNH/dotprod.f90 index ac6e40652..f3430b745 100644 --- a/src/MNH/dotprod.f90 +++ b/src/MNH/dotprod.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -69,7 +69,7 @@ END MODULE MODI_DOTPROD !! !! AUTHOR !! ------ -!! P. Hereil and J. Stein * Meteo France * +!! P. Hereil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/drag_bld.f90 b/src/MNH/drag_bld.f90 index a460dd5cc..72f864d49 100644 --- a/src/MNH/drag_bld.f90 +++ b/src/MNH/drag_bld.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2019-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2019-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -241,7 +241,7 @@ SUBROUTINE DRAG_BLD( PTSTEP, PUT, PVT, PTKET, PPABST, PTHT, PRT, & !------------------------------------------------------------------------------- ! !* 1. COMPUTES THE TRUE VELOCITY COMPONENTS - ! ------------------------------------- + ! ------------------------------------- ! ZUT_SCAL(:,:,:) = MXF(PUT(:,:,:)) ZVT_SCAL(:,:,:) = MYF(PVT(:,:,:)) diff --git a/src/MNH/drag_veg.f90 b/src/MNH/drag_veg.f90 index de7fba893..c3cc0246c 100644 --- a/src/MNH/drag_veg.f90 +++ b/src/MNH/drag_veg.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2009-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2009-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -186,7 +186,7 @@ WHERE ( ZLAI (:,:) > (XUNDEF-1.) ) ZLAI (:,:) = 0.0 ! ! !* 1. COMPUTES THE TRUE VELOCITY COMPONENTS -! ------------------------------------- +! ------------------------------------- ! ZUT_SCAL(:,:,:) = MXF(PUT(:,:,:)) ZVT_SCAL(:,:,:) = MYF(PVT(:,:,:)) diff --git a/src/MNH/dyn_sources.f90 b/src/MNH/dyn_sources.f90 index 482158cb3..acb3f5b26 100644 --- a/src/MNH/dyn_sources.f90 +++ b/src/MNH/dyn_sources.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -125,14 +125,14 @@ END MODULE MODI_DYN_SOURCES !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Pinty * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- !! Original 06/06/94 -!! Corrections 06/08/94 (J.-P. Lafore) -!! Corrections 17/10/94 (Stein) For LCORIO -!! Corrections 22/12/94 (Stein) add the pressure term in the theta evolution +!! Corrections 06/08/94 (J.-P. Lafore) +!! Corrections 17/10/94 (Stein) For LCORIO +!! Corrections 22/12/94 (Stein) add the pressure term in the theta evolution !! Corrections 30/12/94 (J.P. Lafore) bug corrections for the pressure term !! Corrections 16/03/95 (Stein) remove R from the historical variables and !! correction of the pressure term @@ -209,7 +209,7 @@ REAL, DIMENSION(SIZE(PUT,1),SIZE(PUT,2),SIZE(PUT,3)) :: & ! ! !* 1. COMPUTES THE TRUE VELOCITY COMPONENTS -! ------------------------------------- +! ------------------------------------- ! ZRUT(:,:,:) = PUT(:,:,:) * MXM(PRHODJ(:,:,:)) ZRVT(:,:,:) = PVT(:,:,:) * MYM(PRHODJ(:,:,:)) @@ -219,7 +219,7 @@ IKU = SIZE(PUT,3) !------------------------------------------------------------------------------- ! !* 2. COMPUTES THE CURVATURE TERMS -! ---------------------------- +! ---------------------------- ! ! Only when earth rotation is considered but not in 1D and CARTESIAN cases ! @@ -277,7 +277,7 @@ END IF !------------------------------------------------------------------------------- ! !* 3. COMPUTES THE CORIOLIS TERMS -! --------------------------- +! --------------------------- ! IF (LCORIO) THEN if ( lbudget_u ) call Budget_store_init( tbudgets(NBUDGET_U), 'COR', prus(:, :, :) ) @@ -311,7 +311,7 @@ END IF !------------------------------------------------------------------------------- ! !* 4. COMPUTES THE THETA SOURCE TERM DUE TO THE REFERENCE PRESSURE -! ------------------------------------------------------------ +! ------------------------------------------------------------ ! IF (LCARTESIAN .OR. LTHINSHELL) THEN ZD1=0. diff --git a/src/MNH/eddyUV_flux_one_wayn.f90 b/src/MNH/eddyUV_flux_one_wayn.f90 index 93c8fe46c..effaf098b 100644 --- a/src/MNH/eddyUV_flux_one_wayn.f90 +++ b/src/MNH/eddyUV_flux_one_wayn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2011-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2011-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -46,7 +46,7 @@ END MODULE MODI_EDDYUV_FLUX_ONE_WAY_n !! !! AUTHOR !! ------ -!! M.Tomasini * Meteo-France * +!! M.Tomasini * Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eddyUV_fluxn.f90 b/src/MNH/eddyUV_fluxn.f90 index f4879b603..2f72d26a1 100644 --- a/src/MNH/eddyUV_fluxn.f90 +++ b/src/MNH/eddyUV_fluxn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2004-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2004-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -60,7 +60,7 @@ END MODULE MODI_EDDYUV_FLUX_n !! !! AUTHOR !! ------ -!! P.Peyrille * Meteo-France * +!! P.Peyrille * Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eddy_flux_one_wayn.f90 b/src/MNH/eddy_flux_one_wayn.f90 index 40773ec8d..53911c583 100644 --- a/src/MNH/eddy_flux_one_wayn.f90 +++ b/src/MNH/eddy_flux_one_wayn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2011-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2011-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -46,7 +46,7 @@ END MODULE MODI_EDDY_FLUX_ONE_WAY_n !! !! AUTHOR !! ------ -!! M.Tomasini * Meteo-France * +!! M.Tomasini * Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eddy_fluxn.f90 b/src/MNH/eddy_fluxn.f90 index dc20500dc..cddfdd187 100644 --- a/src/MNH/eddy_fluxn.f90 +++ b/src/MNH/eddy_fluxn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2004-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2004-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -61,7 +61,7 @@ END MODULE MODI_EDDY_FLUX_n !! !! AUTHOR !! ------ -!! P.Peyrille * Meteo-France * +!! P.Peyrille * Meteo-France * !! !! EXTERNAL: MEAN_Z is used to perform vertical weighted average !! diff --git a/src/MNH/elec_tridz.f90 b/src/MNH/elec_tridz.f90 index 5c5ce6796..8140012fc 100644 --- a/src/MNH/elec_tridz.f90 +++ b/src/MNH/elec_tridz.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -161,7 +161,7 @@ END MODULE MODI_ELEC_TRIDZ !! !! AUTHOR !! ------ -!! P. HÃ…reil and J. Stein * Meteo France * +!! P. HÃ…reil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/end_cart_compress.f90 b/src/MNH/end_cart_compress.f90 index e5908e816..d53cc01c5 100644 --- a/src/MNH/end_cart_compress.f90 +++ b/src/MNH/end_cart_compress.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -89,7 +89,7 @@ END MODULE MODI_END_CART_COMPRESS !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -127,7 +127,7 @@ INTEGER :: IINFO_ll ! return status code of the interface routines !------------------------------------------------------------------------------- ! !* 1. COMPRESSIONS IN I,J AND K DIRECTIONS -! ------------------------------------ +! ------------------------------------ ! ! ! ! diff --git a/src/MNH/end_mask_compress.f90 b/src/MNH/end_mask_compress.f90 index cd867dccb..3942d521e 100644 --- a/src/MNH/end_mask_compress.f90 +++ b/src/MNH/end_mask_compress.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1999-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1999-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -63,7 +63,7 @@ END MODULE MODI_END_MASK_COMPRESS !! !! AUTHOR !! ------ -!! N. Asencio * Meteo France * +!! N. Asencio * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -98,7 +98,7 @@ INTEGER :: IINFO_ll ! return status code of the interface routines !------------------------------------------------------------------------------- ! !* 1. GLOBAL SUMS -! ------------------------------------ +! ------------------------------------ ! ! ! IF (LBU_KCP) THEN diff --git a/src/MNH/endstep_budget.f90 b/src/MNH/endstep_budget.f90 index 947c07704..deee67f17 100644 --- a/src/MNH/endstep_budget.f90 +++ b/src/MNH/endstep_budget.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -63,7 +63,7 @@ END MODULE MODI_ENDSTEP_BUDGET !! !! AUTHOR !! ------ -!! J. Nicolau * Meteo France * +!! J. Nicolau * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -110,17 +110,17 @@ IF ( KTCOUNT == 1 ) RETURN SELECT CASE(CBUTYPE) ! ! -!* 1. 'CART' CASE +!* 1. 'CART' CASE ! ----------- ! CASE('CART','SKIP') ! -!* 1.1 storage of the budget fields +!* 1.1 storage of the budget fields ! IF( MODULO(KTCOUNT,NBUSTEP*nbusubwrite) == 0 ) THEN call Write_budget( tpdiafile, tpdtcur, ptstep, ksv ) ! -!* 1.2 resetting the budget arrays to 0. +!* 1.2 resetting the budget arrays to 0. ! ! Rhodj arrays if ( tbudgets(NBUDGET_U)%lenabled ) tbudgets(NBUDGET_U)%trhodj%xdata(:, :, :) = 0. @@ -137,23 +137,23 @@ SELECT CASE(CBUTYPE) end if end do ! -!* 1.3 reset budget beginning flag to TRUE +!* 1.3 reset budget beginning flag to TRUE ! LBU_BEG=.TRUE. END IF ! ! -!* 2. 'MASK' CASE +!* 2. 'MASK' CASE ! ----------- ! CASE('MASK') IF( MODULO(KTCOUNT,NBUSTEP*nbusubwrite) == 0 ) THEN ! -!* 2.1 storage of the budget fields +!* 2.1 storage of the budget fields ! call Write_budget( tpdiafile, tpdtcur, ptstep, ksv ) ! -!* 2.2 reset the budget fields to 0. +!* 2.2 reset the budget fields to 0. ! ! Rhodj arrays if ( tbudgets(NBUDGET_U)%lenabled ) tbudgets(NBUDGET_U)%trhodj%xdata(:, :, :) = 0. @@ -174,7 +174,7 @@ SELECT CASE(CBUTYPE) ! END IF ! -!* 2.3 update of the budget temporal increment and reset the budget +!* 2.3 update of the budget temporal increment and reset the budget ! initialization ! IF( MODULO(KTCOUNT,NBUSTEP) == 0 ) THEN diff --git a/src/MNH/eol_adnr.f90 b/src/MNH/eol_adnr.f90 index b47d14fa3..ea952879f 100644 --- a/src/MNH/eol_adnr.f90 +++ b/src/MNH/eol_adnr.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2017-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2017-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -57,7 +57,7 @@ END MODULE MODI_EOL_ADNR !! !! AUTHOR !! ------ -!! PA. Joulin *CNRM & IFPEN* +!! PA. Joulin *CNRM & IFPEN* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eol_alm.f90 b/src/MNH/eol_alm.f90 index 648ae6575..a9dd3ec8c 100644 --- a/src/MNH/eol_alm.f90 +++ b/src/MNH/eol_alm.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2017-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2017-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -68,7 +68,7 @@ END MODULE MODI_EOL_ALM !! !! AUTHOR !! ------ -!! PA. Joulin *CNRM & IFPEN* +!! PA. Joulin *CNRM & IFPEN* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eol_debugger.f90 b/src/MNH/eol_debugger.f90 index 86e38b3e1..74fe3ef27 100644 --- a/src/MNH/eol_debugger.f90 +++ b/src/MNH/eol_debugger.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2020-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2020-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -71,7 +71,7 @@ END MODULE MODI_EOL_DEBUGGER !! !! AUTHOR !! ------ -!! PA. Joulin *CNRM & IFPEN* +!! PA. Joulin *CNRM & IFPEN* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eol_error.f90 b/src/MNH/eol_error.f90 index 556871896..87bc0df5f 100644 --- a/src/MNH/eol_error.f90 +++ b/src/MNH/eol_error.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2020-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2020-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -70,7 +70,7 @@ END MODULE MODI_EOL_ERROR !! !! AUTHOR !! ------ -!! PA. Joulin *CNRM & IFPEN* +!! PA. Joulin *CNRM & IFPEN* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eol_kine_alm.f90 b/src/MNH/eol_kine_alm.f90 index 502e92b22..6b036c7dd 100644 --- a/src/MNH/eol_kine_alm.f90 +++ b/src/MNH/eol_kine_alm.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2017-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2017-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -45,7 +45,7 @@ SUBROUTINE EOL_KINE_ALM(KTCOUNT,KTSUBCOUNT,PTSUBSTEP,PTSTEP) !! !! AUTHOR !! ------ -!! PA. Joulin *CNRM & IFPEN* +!! PA. Joulin *CNRM & IFPEN* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eol_main.f90 b/src/MNH/eol_main.f90 index a921c8ce6..d382410f0 100644 --- a/src/MNH/eol_main.f90 +++ b/src/MNH/eol_main.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2020-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2020-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -54,7 +54,7 @@ END MODULE MODI_EOL_MAIN !! !! AUTHOR !! ------ -!! PA. Joulin *CNRM & IFPEN* +!! PA. Joulin *CNRM & IFPEN* !! !! MODIFICATIONS !! ------------- @@ -158,7 +158,7 @@ XFZ_SMR_RG(:,:,:) = 0. !----------------------------------------------------------------------- ! !* 2. COMPUTES VELOCITY COMPONENTS AND DENSITY AT MASS POINT -! ------------------------------------------------------ +! ------------------------------------------------------ ! !* 2.1 Sharing the input ! @@ -187,7 +187,7 @@ CALL CLEANLIST_ll( TZFIELDS_W_ll) !-------------------------------------------------------- ! !* 3. COMPUTES AERODYNAMICS FORCES -! ---------------------------- +! ---------------------------- ! !* 3.1 Model selection ! @@ -227,7 +227,7 @@ CALL CLEANLIST_ll( TZFIELDS_F_ll) !-------------------------------------------------------- ! !* 4. SMEARING THE FORCES -! ------------------- +! ------------------- ! !* 4.1 Smearing technique selection ! @@ -264,7 +264,7 @@ CALL CLEANLIST_ll( TZFIELDS_S_ll) !------------------------------------------------------------------------------- ! !* 5. ADDING THE FORCES TO THE FIELD -! ------------------------------ +! ------------------------------ ! !* 5.1 Adding them to flux points, rotor->wind ! diff --git a/src/MNH/eol_maths.f90 b/src/MNH/eol_maths.f90 index e38dd234e..add257889 100644 --- a/src/MNH/eol_maths.f90 +++ b/src/MNH/eol_maths.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2018-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2018-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -89,7 +89,7 @@ END MODULE MODI_EOL_MATHS !! !! AUTHOR !! ------ -!! PA. Joulin *CNRM & IFPEN* +!! PA. Joulin *CNRM & IFPEN* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eol_printer.f90 b/src/MNH/eol_printer.f90 index 9bd815e48..1b3ac1e8a 100644 --- a/src/MNH/eol_printer.f90 +++ b/src/MNH/eol_printer.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2020-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2020-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -136,7 +136,7 @@ END MODULE MODI_EOL_PRINTER !! !! AUTHOR !! ------ -!! PA. Joulin *CNRM & IFPEN* +!! PA. Joulin *CNRM & IFPEN* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eol_reader.f90 b/src/MNH/eol_reader.f90 index c827b82c6..928966f49 100644 --- a/src/MNH/eol_reader.f90 +++ b/src/MNH/eol_reader.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2018-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2018-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -121,7 +121,7 @@ END MODULE MODI_EOL_READER !! !! AUTHOR !! ------ -!! PA. Joulin *CNRM & IFPEN* +!! PA. Joulin *CNRM & IFPEN* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/eol_smear.f90 b/src/MNH/eol_smear.f90 index 95f12caec..d242b2614 100644 --- a/src/MNH/eol_smear.f90 +++ b/src/MNH/eol_smear.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2018-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2018-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,7 +32,7 @@ END MODULE MODI_EOL_SMEAR !! !! AUTHOR !! ------ -!! PA. Joulin *CNRM & IFPEN* +!! PA. Joulin *CNRM & IFPEN* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/extend_grid_parameter_mnh.f90 b/src/MNH/extend_grid_parameter_mnh.f90 index 7b54a15d5..e75a19984 100644 --- a/src/MNH/extend_grid_parameter_mnh.f90 +++ b/src/MNH/extend_grid_parameter_mnh.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2015-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2015-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -83,12 +83,12 @@ IF (HREC=='XX' .OR. HREC=='DX') THEN CALL MPI_BCAST(ZDX, 1, MNHREAL_MPI, 0, NMNH_COMM_WORLD, IINFO_ll) IF( LWEST_ll() ) THEN DO JI=NHALO,1,-1 - ZX(JI) = ZX(JI+1) - ZDX + ZX(JI) = ZX(JI+1) - ZDX END DO ENDIF IF( LEAST_ll() ) THEN DO JI=NHALO,1,-1 - ZX(NIMAX+2*NHALO-JI+1) = ZX(NIMAX+2*NHALO-JI) + ZDX + ZX(NIMAX+2*NHALO-JI+1) = ZX(NIMAX+2*NHALO-JI) + ZDX END DO ENDIF END IF @@ -126,12 +126,12 @@ ELSEIF (HREC=='YY' .OR. HREC=='DY') THEN CALL MPI_BCAST(ZDY, 1, MNHREAL_MPI, 0, NMNH_COMM_WORLD, IINFO_ll) IF( LSOUTH_ll() ) THEN DO JJ=NHALO,1,-1 - ZY(JJ) = ZY(JJ+1) - ZDY + ZY(JJ) = ZY(JJ+1) - ZDY END DO ENDIF IF( LNORTH_ll() ) THEN DO JJ=NHALO,1,-1 - ZY(NJMAX+2*NHALO-JJ+1) = ZY(NJMAX+2*NHALO-JJ) + ZDY + ZY(NJMAX+2*NHALO-JJ+1) = ZY(NJMAX+2*NHALO-JJ) + ZDY END DO ENDIF END IF diff --git a/src/MNH/extract_vortex.f90 b/src/MNH/extract_vortex.f90 index 311fcecd1..d915cdeca 100644 --- a/src/MNH/extract_vortex.f90 +++ b/src/MNH/extract_vortex.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2001-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2001-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -82,7 +82,7 @@ END MODULE MODI_EXTRACT_VORTEX !! !! AUTHOR !! ------ -!! O. Nuissier * L.A. * +!! O. Nuissier * L.A. * !! R. Rogers * NOAA/AOML/HRD * !! !! MODIFICATIONS diff --git a/src/MNH/fft55.f90 b/src/MNH/fft55.f90 index 7f73c201a..77b5a49f7 100644 --- a/src/MNH/fft55.f90 +++ b/src/MNH/fft55.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1987-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1987-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -53,7 +53,7 @@ !! !! AUTHOR !! ------ -!! Clive Temperton +!! Clive Temperton !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/fill_sonfieldn.f90 b/src/MNH/fill_sonfieldn.f90 index be170da73..72aaa8365 100644 --- a/src/MNH/fill_sonfieldn.f90 +++ b/src/MNH/fill_sonfieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -53,7 +53,7 @@ END MODULE MODI_FILL_SONFIELD_n !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/fill_zsmtn.f90 b/src/MNH/fill_zsmtn.f90 index 0aec87f43..189ab4136 100644 --- a/src/MNH/fill_zsmtn.f90 +++ b/src/MNH/fill_zsmtn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2005-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2005-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -49,7 +49,7 @@ END MODULE MODI_FILL_ZSMTn !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/flat_inv.f90 b/src/MNH/flat_inv.f90 index d4d3156bf..8f65e3ab9 100644 --- a/src/MNH/flat_inv.f90 +++ b/src/MNH/flat_inv.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -104,7 +104,7 @@ END MODULE MODI_FLAT_INV !! !! AUTHOR !! ------ -!! P. Hereil and J. Stein * Meteo France * +!! P. Hereil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/flat_invz.f90 b/src/MNH/flat_invz.f90 index 2d5febdf0..22efd9da0 100644 --- a/src/MNH/flat_invz.f90 +++ b/src/MNH/flat_invz.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -109,7 +109,7 @@ SUBROUTINE FLAT_INVZ(HLBCX,HLBCY,PDXHATM,PDYHATM,PRHOM,PAF,PBF,PCF, & !! !! AUTHOR !! ------ - !! P. Hereil and J. Stein * Meteo France * + !! P. Hereil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/flux.f90 b/src/MNH/flux.f90 index 90e38267e..b0dfca5fc 100644 --- a/src/MNH/flux.f90 +++ b/src/MNH/flux.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -83,8 +83,8 @@ END MODULE MODI_FLUX !! !! AUTHOR !! ------ -!! J. Vila-Guerau * Meteo France * -!! J.-P. Lafore * Meteo France * +!! J. Vila-Guerau * Meteo France * +!! J.-P. Lafore * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -170,8 +170,8 @@ END FUNCTION FXM !! !! AUTHOR !! ------ -!! J. Vila-Guerau * Meteo France * -!! J.-P. Lafore * Meteo France * +!! J. Vila-Guerau * Meteo France * +!! J.-P. Lafore * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -258,8 +258,8 @@ END FUNCTION FYM !! !! AUTHOR !! ------ -!! J. Vila-Guerau * Meteo France * -!! J.-P. Lafore * Meteo France * +!! J. Vila-Guerau * Meteo France * +!! J.-P. Lafore * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/forc_wind.f90 b/src/MNH/forc_wind.f90 index 612837851..9a44455ff 100644 --- a/src/MNH/forc_wind.f90 +++ b/src/MNH/forc_wind.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -184,7 +184,7 @@ ALLOCATE (ZPHI(IIE+1,IKE+2)) ZAMPL2=ZAMP2B*(cos(XPI*((PTIME-1500.)/ZTSCALE2 - 1.)) + 1.) ZXSCALE=ZXSCALE0 else - ZTIME1 = 2400. + ZTIME1 = 2400. ZAMPL=ZAMPB*(cos(XPI*(ZTIME1-1500.)/ZTSCALE2) +1.) + 2.*ZAMPL0 ZAMPL2=ZAMP2B*(cos(XPI*((ZTIME1-1500.)/ZTSCALE2 - 1.)) + 1.) ZXSCALE=ZXSCALE0 diff --git a/src/MNH/forcing.f90 b/src/MNH/forcing.f90 index 522ac749e..786319656 100644 --- a/src/MNH/forcing.f90 +++ b/src/MNH/forcing.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -126,7 +126,7 @@ END MODULE MODI_FORCING !! !! AUTHOR !! ------ -!! M. Georgelin * Laboratoire d'Aerologie* +!! M. Georgelin * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- @@ -421,7 +421,7 @@ IF (GSFIRSTCALL) THEN END IF ! !* 2. INTERPOLATE IN TIME -! ------------------- +! ------------------- ! IF( TPDTCUR < TDTFRC(1) ) THEN ZXUFRC(:) = XUFRC(:,1) @@ -480,7 +480,7 @@ END IF ! ! !* 3. INTERPOLATE IN SPACE -! -------------------- +! -------------------- ! ALLOCATE(ZUF(SIZE(PUT,1),SIZE(PUT,2),SIZE(PUT,3))) ALLOCATE(ZVF(SIZE(PVT,1),SIZE(PVT,2),SIZE(PVT,3))) @@ -671,7 +671,7 @@ END IF ! ! !* 4. INTEGRATION OF THE FORCINGS IN THE SOURCES -! ------------------------------------------ +! ------------------------------------------ ! ALLOCATE(ZDZZ(SIZE(PWT,1),SIZE(PWT,2),SIZE(PWT,3))) ALLOCATE(ZRWCF(SIZE(PWT,1),SIZE(PWT,2),SIZE(PWT,3))) @@ -837,7 +837,7 @@ IF( LRELAX_THRV_FRC .OR. LRELAX_UV_FRC .OR. LRELAX_UVMEAN_FRC) THEN IF( OUSERV ) THEN WHERE( GRELAX_MASK_FRC ) PRRS(:,:,:,1) = PRRS(:,:,:,1) & - - PRHODJ(:,:,:)*(PRT(:,:,:,1)-ZRVF(:,:,:)) & + - PRHODJ(:,:,:)*(PRT(:,:,:,1)-ZRVF(:,:,:)) & / XRELAX_TIME_FRC END WHERE ! @@ -890,7 +890,7 @@ END IF ! ! !* 5. BUDGET CALLS -! ------------ +! ------------ ! ! if ( lbudget_u ) call Budget_store_end( tbudgets(NBUDGET_U ), 'FRC', prus (:, :, :) ) diff --git a/src/MNH/fun.f90 b/src/MNH/fun.f90 index 85100a77b..0b530dc52 100644 --- a/src/MNH/fun.f90 +++ b/src/MNH/fun.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -73,7 +73,7 @@ END MODULE MODI_FUN !! !! AUTHOR !! ------ -!! J.Stein * Meteo France * +!! J.Stein * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -112,8 +112,8 @@ REAL :: ZWIDTHZ ! Width of the jet along the z direction ! !------------------------------------------------------------------------------- ! -!* 1. COMPUTE FUNUYZ -! ------------- +!* 1. COMPUTE FUNUYZ +! ------------- ! IJU_ll=NJMAX_ll+2*JPHEXT IJ0=IJU_ll/2 @@ -169,7 +169,7 @@ END FUNCTION FUNUYZ !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -202,8 +202,8 @@ INTEGER :: IINFO_ll, IJU_ll ! parallel variables REAL :: ZWIDTH ! Width of the jet !------------------------------------------------------------------------------- ! -!* 1. COMPUTE FUNUY -! ------------- +!* 1. COMPUTE FUNUY +! ------------- IJU_ll=NJMAX_ll+2*JPHEXT IJ0=IJU_ll/2 ZWIDTH=XYHAT_ll(IJ0+IJU_ll/5)-XYHAT_ll(IJ0) @@ -253,7 +253,7 @@ END FUNCTION FUNUY !! !! AUTHOR !! ------ -!! J.Stein * Meteo France * +!! J.Stein * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -291,8 +291,8 @@ REAL :: ZWIDTHZ ! Width of the jet along the z direction ! !------------------------------------------------------------------------------- ! -!* 1. COMPUTE FUNVXZ -! ------------- +!* 1. COMPUTE FUNVXZ +! ------------- ! IIU_ll=NIMAX_ll+2*JPHEXT II0=IIU_ll/2 @@ -348,7 +348,7 @@ END FUNCTION FUNVXZ !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -380,8 +380,8 @@ INTEGER :: IINFO_ll, IIU_ll ! parallel variables REAL :: ZWIDTH ! Width of the jet !------------------------------------------------------------------------------- ! -!* 1. COMPUTE FUNUY -! ------------- +!* 1. COMPUTE FUNUY +! ------------- IIU_ll=NIMAX_ll+2*JPHEXT II0=IIU_ll/2 ZWIDTH=XXHAT_ll(II0+IIU_ll/5)-XXHAT_ll(II0) diff --git a/src/MNH/gamma_inc_low.f90 b/src/MNH/gamma_inc_low.f90 index bec06e6f0..22decd531 100644 --- a/src/MNH/gamma_inc_low.f90 +++ b/src/MNH/gamma_inc_low.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -56,7 +56,7 @@ END MODULE MODI_GAMMA_INC_LOW !! !! AUTHOR !! ------ -!! V. Vionnet (CNRM/GMME) +!! V. Vionnet (CNRM/GMME) !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/gdiv.f90 b/src/MNH/gdiv.f90 index dc77dde55..b7ea74e40 100644 --- a/src/MNH/gdiv.f90 +++ b/src/MNH/gdiv.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -84,7 +84,7 @@ END MODULE MODI_GDIV !! !! AUTHOR !! ------ -!! P. Hereil and J. Stein * Meteo France * +!! P. Hereil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/get_interp_halo_mnh.f90 b/src/MNH/get_interp_halo_mnh.f90 index 16fd73d36..b86de3fb7 100644 --- a/src/MNH/get_interp_halo_mnh.f90 +++ b/src/MNH/get_interp_halo_mnh.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/get_nb_procio_read_mnh.f90 b/src/MNH/get_nb_procio_read_mnh.f90 index 6e4cca793..74d0fce42 100644 --- a/src/MNH/get_nb_procio_read_mnh.f90 +++ b/src/MNH/get_nb_procio_read_mnh.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -29,8 +29,8 @@ !! !! AUTHOR !! ------ -!! M. Moge *LA - UPS* 08/01/2016 -!! J. escobar 19/04/2016 : bypass , For pb IOZ/NETCDF , pretende alway 2 ( > 1 ) I/O processors for homogenus PGD files +!! M. Moge *LA - UPS* 08/01/2016 +!! J. escobar 19/04/2016 : bypass , For pb IOZ/NETCDF , pretende alway 2 ( > 1 ) I/O processors for homogenus PGD files !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/get_nb_procio_write_mnh.f90 b/src/MNH/get_nb_procio_write_mnh.f90 index 4fb3ad5f5..2ec94d226 100644 --- a/src/MNH/get_nb_procio_write_mnh.f90 +++ b/src/MNH/get_nb_procio_write_mnh.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -29,8 +29,8 @@ !! !! AUTHOR !! ------ -!! M. Moge *LA - UPS* 08/01/2016 -!! J. escobar 19/04/2016 : bypass , For pb IOZ/NETCDF , pretende alway 2 ( > 1 ) I/O processors for homogenus PGD files +!! M. Moge *LA - UPS* 08/01/2016 +!! J. escobar 19/04/2016 : bypass , For pb IOZ/NETCDF , pretende alway 2 ( > 1 ) I/O processors for homogenus PGD files !! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O !! !! MODIFICATIONS diff --git a/src/MNH/get_sizex_lb.f90 b/src/MNH/get_sizex_lb.f90 index 198cdac80..a92564758 100644 --- a/src/MNH/get_sizex_lb.f90 +++ b/src/MNH/get_sizex_lb.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -76,7 +76,7 @@ END MODULE MODI_GET_SIZEX_LB !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/get_sizey_lb.f90 b/src/MNH/get_sizey_lb.f90 index fbff6c1dd..3cd20e1da 100644 --- a/src/MNH/get_sizey_lb.f90 +++ b/src/MNH/get_sizey_lb.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -76,7 +76,7 @@ END MODULE MODI_GET_SIZEY_LB !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/gradient_m.f90 b/src/MNH/gradient_m.f90 index 6a9d2f033..1cc6ae8de 100644 --- a/src/MNH/gradient_m.f90 +++ b/src/MNH/gradient_m.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -437,7 +437,7 @@ END FUNCTION GZ_M_M !! !! AUTHOR !! ------ -!! P. Hereil and J. Stein * Meteo France * +!! P. Hereil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -591,7 +591,7 @@ END FUNCTION GX_M_U !! !! AUTHOR !! ------ -!! P. Hereil and J. Stein * Meteo France * +!! P. Hereil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -705,7 +705,7 @@ END FUNCTION GY_M_V !! !! AUTHOR !! ------ -!! P. Hereil and J. Stein * Meteo France * +!! P. Hereil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/gravity.f90 b/src/MNH/gravity.f90 index c775ae96f..d656cd1b6 100644 --- a/src/MNH/gravity.f90 +++ b/src/MNH/gravity.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -93,7 +93,7 @@ END MODULE MODI_GRAVITY !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Pinty * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- @@ -142,7 +142,7 @@ REAL, DIMENSION(SIZE(PTHT,1),SIZE(PTHT,2),SIZE(PTHT,3)) :: & ! ! !* 1. COMPUTES THE GRAVITY TERM -! ------------------------- +! ------------------------- ! IF( .NOT.L1D ) THEN ! no buoyancy for 1D case ! diff --git a/src/MNH/gravity_impl.f90 b/src/MNH/gravity_impl.f90 index f150e242b..e6e826ef8 100644 --- a/src/MNH/gravity_impl.f90 +++ b/src/MNH/gravity_impl.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2011-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2011-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -65,7 +65,7 @@ END MODULE MODI_GRAVITY_IMPL !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ground_paramn.f90 b/src/MNH/ground_paramn.f90 index bfaa10f45..a9f0a1b4c 100644 --- a/src/MNH/ground_paramn.f90 +++ b/src/MNH/ground_paramn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -81,7 +81,7 @@ END MODULE MODI_GROUND_PARAM_n !! !! AUTHOR !! ------ -!! S. Belair * Meteo-France * +!! S. Belair * Meteo-France * !! !! MODIFICATIONS !! ------------- @@ -825,20 +825,20 @@ CALL UNSHAPE_SURF(IDIM1,IDIM2) !------------------------! IF ( LFOREFIRE ) THEN - CALL FOREFIRE_DUMP_FIELDS_n(XUT, XVT, XWT, XSVT& - , XTHT, XRT(:,:,:,1), XPABST, XTKET& - , IDIM1+2, IDIM2+2, NKMAX+2) + CALL FOREFIRE_DUMP_FIELDS_n(XUT, XVT, XWT, XSVT& + , XTHT, XRT(:,:,:,1), XPABST, XTKET& + , IDIM1+2, IDIM2+2, NKMAX+2) END IF IF ( FFCOUPLING ) THEN - CALL SEND_GROUND_WIND_n(XUT, XVT, IKB, IINFO_ll) - - CALL FOREFIRE_RECEIVE_PARAL_n() + CALL SEND_GROUND_WIND_n(XUT, XVT, IKB, IINFO_ll) + + CALL FOREFIRE_RECEIVE_PARAL_n() - CALL COUPLING_FOREFIRE_n(XTSTEP, ZSFTH, ZSFTQ, ZSFTS) - - CALL FOREFIRE_SEND_PARAL_n(IINFO_ll) + CALL COUPLING_FOREFIRE_n(XTSTEP, ZSFTH, ZSFTQ, ZSFTS) + + CALL FOREFIRE_SEND_PARAL_n(IINFO_ll) END IF diff --git a/src/MNH/height_press.f90 b/src/MNH/height_press.f90 index 554c3c2a5..af7febf98 100644 --- a/src/MNH/height_press.f90 +++ b/src/MNH/height_press.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -75,7 +75,7 @@ END MODULE MODI_HEIGHT_PRESS !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -108,8 +108,8 @@ REAL :: ZEXNGROUND ! Exn at ground level INTEGER :: JK ! Loop index !------------------------------------------------------------------------------- ! -!* 1. COMPUTE HEIGHT -! ------------ +!* 1. COMPUTE HEIGHT +! ------------ ZCPDOG = XCPD / XG ZRDOCPD = XRD / XCPD ! diff --git a/src/MNH/holland_vt.f90 b/src/MNH/holland_vt.f90 index b4dfbb94b..5c55628fe 100644 --- a/src/MNH/holland_vt.f90 +++ b/src/MNH/holland_vt.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -85,7 +85,7 @@ END MODULE MODI_HOLLAND_VT !! !! AUTHOR !! ------ -!! O. Nuissier * L.A. * +!! O. Nuissier * L.A. * !! F. Roux * L.A * !! !! MODIFICATIONS @@ -100,9 +100,9 @@ END MODULE MODI_HOLLAND_VT ! USE MODD_HURR_CONF, ONLY: XVTMAXSURF ,& ! maximum tangential wind (m/s) XRADWINDSURF,& ! radius of maximum wind (km) - XC,& ! standard coefficient for VTmax(z) - XRHO_Z, XRHO_ZZ,& ! standard coefficient for RMW(z) - XB_0, XBETA_Z, XBETA_ZZ ! standard coefficient for B(z) + XC,& ! standard coefficient for VTmax(z) + XRHO_Z, XRHO_ZZ,& ! standard coefficient for RMW(z) + XB_0, XBETA_Z, XBETA_ZZ ! standard coefficient for B(z) ! IMPLICIT NONE ! @@ -143,7 +143,7 @@ ZRADIM_IB(:) = ZRADIM(:) ** ZB(:) ! ! PVT(:) = SQRT ( ZVTMAX(:)**2 * EXP (1. - 1. / ZRADIM_IB(:) ) / ZRADIM_IB(:) + & - (PCORIO * PR_M / 2.)**2 ) - ABS(PCORIO * PR_M / 2.) + (PCORIO * PR_M / 2.)**2 ) - ABS(PCORIO * PR_M / 2.) ! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/ibm_0Dint.f90 b/src/MNH/ibm_0Dint.f90 index 67fa85cf8..13e5dc69c 100644 --- a/src/MNH/ibm_0Dint.f90 +++ b/src/MNH/ibm_0Dint.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2019-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2019-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -54,7 +54,7 @@ FUNCTION IBM_0DINT(PDELTAI,PVALUEI,HBOUND1,HBOUND2,PBOUNDI,PIBM_VISC,PIBM_DIVK) ! ! AUTHOR ! ------ - ! + ! ! Franck Auguste * CERFACS(AE) * ! ! MODIFICATIONS diff --git a/src/MNH/ibm_1Dint.f90 b/src/MNH/ibm_1Dint.f90 index 7c986e9ef..a7653e3c2 100644 --- a/src/MNH/ibm_1Dint.f90 +++ b/src/MNH/ibm_1Dint.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2019-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2019-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -66,7 +66,7 @@ FUNCTION IBM_1DINT(PLOCATI,PVALUEI,HINTERP) RESULT(PVALUEG) !! !! AUTHOR !! ------ - !! + !! !! Franck Auguste * CERFACS(AE) * !! !! MODIFICATIONS diff --git a/src/MNH/ibm_3Dint.f90 b/src/MNH/ibm_3Dint.f90 index f055a64ba..54d4077ff 100644 --- a/src/MNH/ibm_3Dint.f90 +++ b/src/MNH/ibm_3Dint.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2019-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2019-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -104,7 +104,7 @@ FUNCTION IBM_3DINT(KTYPUVW,PVALUEI,PLOCATI,PTESTG0,PLOCAT1,PVALUE1,PLOCAT2,HINTE ! ! AUTHOR ! ------ - ! + ! ! Franck Auguste * CERFACS(AE) * ! ! MODIFICATIONS diff --git a/src/MNH/ibm_valuemat1.f90 b/src/MNH/ibm_valuemat1.f90 index 8082f12c8..f2e764761 100644 --- a/src/MNH/ibm_valuemat1.f90 +++ b/src/MNH/ibm_valuemat1.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2019-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2019-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -56,7 +56,7 @@ FUNCTION IBM_VALUEMAT1(PLOCATG,PLOCATI,PVELOCI,HINTERP) RESULT(PMATRIX) ! ! AUTHOR ! ------ - ! + ! ! Franck Auguste * CERFACS(AE) * ! ! MODIFICATIONS diff --git a/src/MNH/ibm_valuemat2.f90 b/src/MNH/ibm_valuemat2.f90 index 1120cfc0d..0a062c00c 100644 --- a/src/MNH/ibm_valuemat2.f90 +++ b/src/MNH/ibm_valuemat2.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2019-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2019-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -46,7 +46,7 @@ FUNCTION IBM_VALUEMAT2(PMATRI1) RESULT(PMATRI2) ! ! AUTHOR ! ------ - ! + ! ! Franck Auguste * CERFACS(AE) * ! ! MODIFICATIONS diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90 index a08b79dae..9814a9c61 100644 --- a/src/MNH/ini_budget.f90 +++ b/src/MNH/ini_budget.f90 @@ -143,7 +143,7 @@ end subroutine Budget_preallocate !! !! AUTHOR !! ------ -!! P. Hereil * Meteo France * +!! P. Hereil * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ini_cloud.f90 b/src/MNH/ini_cloud.f90 index 2cb05cb5c..6959a33eb 100644 --- a/src/MNH/ini_cloud.f90 +++ b/src/MNH/ini_cloud.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -132,7 +132,7 @@ REAL :: ZZ, ZZR, ZT ! Work variables !------------------------------------------------------------------------------- ! !* 1. RAINDROP SPECTRUM -! ----------------- +! ----------------- ! ZN0 = 1.E7 ZZ = XPI * XRHOLW * ZN0 @@ -141,7 +141,7 @@ ZZ = XPI * XRHOLW * ZN0 !------------------------------------------------------------------------------- ! !* 2. RAINDROP FALL VELOCITY -! ---------------------- +! ---------------------- ! XCEXVT = 0.4 IKB = 1 + JPVEXT @@ -156,7 +156,7 @@ ZGBP4 = GAMMA(ZB+4.) !------------------------------------------------------------------------------- ! !* 3. AUTOCONVERSION -! -------------- +! -------------- ! XC1RC = 1.E-3 XC2RC = 0.5E-3 @@ -165,7 +165,7 @@ XC2RC = 0.5E-3 !------------------------------------------------------------------------------- ! !* 4. ACCRETION -! --------- +! --------- ! XCEXRA = (ZB+3.)/4. XCRA = 0.25 * XPI * ZA * ZN0 *ZGBP3 * ZZR / (ZZ ** XCEXRA) @@ -173,7 +173,7 @@ XCRA = 0.25 * XPI * ZA * ZN0 *ZGBP3 * ZZR / (ZZ ** XCEXRA) !------------------------------------------------------------------------------- ! !* 5. RAIN EVAPORATION -! ---------------- +! ---------------- ! ZF = 0.22 ZNU = 0.15E-4 @@ -186,7 +186,7 @@ XC2RE = 2. * XPI * ZN0 * ZF * SQRT(ZA/ZNU) * SQRT(ZZR) * ZGBP5O2 / (ZZ**XCEXRE) !------------------------------------------------------------------------------- ! !* 6. RAIN SEDIMENTATION -! ------------------ +! ------------------ ! XCEXRS = 1. + ZB /4. XCRS = (ZA/6.) * ZGBP4 * ZZR / (ZZ ** (ZB/4.)) diff --git a/src/MNH/ini_cpl.f90 b/src/MNH/ini_cpl.f90 index 2b9948e5c..f2635d5cd 100644 --- a/src/MNH/ini_cpl.f90 +++ b/src/MNH/ini_cpl.f90 @@ -189,7 +189,7 @@ END MODULE MODI_INI_CPL !! !! AUTHOR !! ------ -!! I.Mallet * Meteo France * +!! I.Mallet * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ini_cst.f90 b/src/MNH/ini_cst.f90 index c51e7149f..c42b83b77 100644 --- a/src/MNH/ini_cst.f90 +++ b/src/MNH/ini_cst.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -33,7 +33,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -69,8 +69,8 @@ REAL(KIND=JPRB) :: ZHOOK_HANDLE IF (LHOOK) CALL DR_HOOK('INI_CST',0,ZHOOK_HANDLE) CALL CST_ASSOCIATE() ! -!* 1. FUNDAMENTAL CONSTANTS -! --------------------- +!* 1. FUNDAMENTAL CONSTANTS +! --------------------- ! XPI = 2.*ASIN(1.) XKARMAN = 0.4 @@ -82,7 +82,7 @@ XAVOGADRO = 6.0221367E+23 !------------------------------------------------------------------------------- ! !* 2. ASTRONOMICAL CONSTANTS -! ---------------------- +! ---------------------- ! XDAY = 86400. XSIYEA = 365.25*XDAY*2.*XPI/ 6.283076 @@ -94,15 +94,15 @@ NDAYSEC = 24*3600 ! Number of seconds in a day ! ! !* 3. TERRESTRIAL GEOIDE CONSTANTS -! ---------------------------- +! ---------------------------- ! XRADIUS = 6371229. XG = 9.80665 ! !------------------------------------------------------------------------------- ! -!* 4. REFERENCE PRESSURE -! ------------------- +!* 4. REFERENCE PRESSURE +! ------------------- ! ! Ocean model cst same as in 1D/CMO SURFEX ! values used in ini_cst to overwrite XP00 and XTH00 @@ -115,8 +115,8 @@ XP00 = 1.E5 XTH00 = 300. !------------------------------------------------------------------------------- ! -!* 5. RADIATION CONSTANTS -! ------------------- +!* 5. RADIATION CONSTANTS +! ------------------- ! ! Original: XSTEFAN = 2.* XPI**5 * XBOLTZ**4 / (15.* XLIGHTSPEED**2 * XPLANCK**3) ! Juan: XSTEFAN = ( 2.* XPI**5 / 15. ) * ( (XBOLTZ / XPLANCK) * XBOLTZ ) * (XBOLTZ/(XLIGHTSPEED*XPLANCK))**2 @@ -127,8 +127,8 @@ XI0 = 1370. ! !------------------------------------------------------------------------------- ! -!* 6. THERMODYNAMIC CONSTANTS -! ----------------------- +!* 6. THERMODYNAMIC CONSTANTS +! ----------------------- ! XMD = 28.9644E-3 XMV = 18.0153E-3 @@ -159,8 +159,8 @@ XALPHAOC = 1.9E-4 ! Coeff of Haline contraction coeff (S-1) XBETAOC= 7.7475E-4 ! -!* 7. PRECOMPUTED CONSTANTS -! --------------------- +!* 7. PRECOMPUTED CONSTANTS +! --------------------- ! RDSRV = XRD/XRV RDSCPD = XRD/XCPD diff --git a/src/MNH/ini_deep_convection.f90 b/src/MNH/ini_deep_convection.f90 index 187d2e820..a0fead5a6 100644 --- a/src/MNH/ini_deep_convection.f90 +++ b/src/MNH/ini_deep_convection.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -94,7 +94,7 @@ END MODULE MODI_INI_DEEP_CONVECTION !! !! AUTHOR !! ------ -!! P. Bechtold * Laboratoire d'Aerologie* +!! P. Bechtold * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- @@ -180,13 +180,13 @@ TYPE(TFIELDMETADATA) :: TZFIELD !------------------------------------------------------------------------------- ! !* 1. INITIALIZE CONSTANTS USED IN DEEP CONVECTION PARAMETERIZATION -! ------------------------------------------------------------- +! ------------------------------------------------------------- ! ! call of INI_CONVPAR is now in routine CONVECTION ! ! !* 2. INITIALIZE CONVECTIVE TENDENCIES -! -------------------------------- +! -------------------------------- ! !If TPINIFILE file was written with a MesoNH version < 5.6, some variables had different names or were not available GOLDFILEFORMAT = ( TPINIFILE%NMNHVERSION(1) < 5 & diff --git a/src/MNH/ini_drag.f90 b/src/MNH/ini_drag.f90 index aea5faa99..6758eb12f 100644 --- a/src/MNH/ini_drag.f90 +++ b/src/MNH/ini_drag.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2012-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2012-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -43,7 +43,7 @@ END MODULE MODI_INI_DRAG !! !! AUTHOR !! ------ -!! J. Colin * Meteo France * +!! J. Colin * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ini_dynamics.f90 b/src/MNH/ini_dynamics.f90 index 44a9bc9bd..eb29a7f46 100644 --- a/src/MNH/ini_dynamics.f90 +++ b/src/MNH/ini_dynamics.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -267,7 +267,7 @@ SUBROUTINE INI_DYNAMICS(PLON,PLAT,PRHODJ,PTHVREF,PMAP,PZZ, & !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ini_eol_adnr.f90 b/src/MNH/ini_eol_adnr.f90 index 9e069eed9..340d24b9b 100644 --- a/src/MNH/ini_eol_adnr.f90 +++ b/src/MNH/ini_eol_adnr.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2018-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2018-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -60,7 +60,7 @@ END MODULE MODI_INI_EOL_ADNR !! !! AUTHOR !! ------ -!! PA. Joulin * Meteo France & IFPEN * +!! PA. Joulin * Meteo France & IFPEN * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ini_eol_adr.f90 b/src/MNH/ini_eol_adr.f90 index 2ecf8c777..a3c30e35f 100644 --- a/src/MNH/ini_eol_adr.f90 +++ b/src/MNH/ini_eol_adr.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2018-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2018-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -293,7 +293,7 @@ ALLOCATE(XPOS_TOWO_RG (INB_WT,3) ) ! Current tower origin pos ALLOCATE(XPOS_TELT_RG (INB_WT,INB_TELT,3) ) ! Current tower element pos. in RG ALLOCATE(XPOS_TELT_RT (INB_WT,INB_TELT,3) ) ! Current tower element pos. in RT ALLOCATE(XANGINI_TOW_RG (INB_WT,3) ) ! Initial tower ori. in RG -! Nacelle +! Nacelle ALLOCATE(XPOSINI_NACO_RT (INB_WT,3) ) ! Initial nacelle origin pos. in RT ALLOCATE(XPOS_NACO_RG (INB_WT,3) ) ! Current nacelle origin pos. in RG ALLOCATE(XPOS_NELT_RG (INB_WT,INB_NELT,3) ) ! Current nacelle element pos. in RG @@ -323,7 +323,7 @@ ALLOCATE(XSURF_APP_ELT (INB_WT,INB_RELT) ) ! Element lift surface ! Tower ALLOCATE(XTVEL_TOWO_RG (INB_WT,3) ) ! Tower base trans. vel. in RG ALLOCATE(XTVEL_TELT_RG (INB_WT,INB_TELT,3) ) ! Tower element trans. vel. in RG -ALLOCATE(XRVEL_RT_RG (INB_WT,3) ) ! RT/RG rot. vel. +ALLOCATE(XRVEL_RT_RG (INB_WT,3) ) ! RT/RG rot. vel. ! Nacelle ALLOCATE(XTVEL_NACO_RT (INB_WT,3) ) ! Nacelle base trans. vel. in RT ALLOCATE(XTVEL_NELT_RG (INB_WT,INB_NELT,3) ) ! Nacelle element trans. vel. in RG @@ -405,7 +405,7 @@ DO JROT=1, INB_WT ! Velocities XTVEL_NACO_RT(JROT,:) = 0d0 XRVEL_RN_RT(JROT,:) = 0d0 -! Positions (Rotor, (XYZ)) ! From last point of tower +! Positions (Rotor, (XYZ)) ! From last point of tower ! Origin XPOSINI_NACO_RT(JROT,:) = 0d0 ! Distance between nacelle base and tower top ! Elements @@ -426,7 +426,7 @@ DO JROT=1, INB_WT XRVEL_RH_RN(JROT,1) = 0d0 XRVEL_RH_RN(JROT,2) = 0d0 XRVEL_RH_RN(JROT,3) = TFARM%XOMEGA(JROT) -! Position (Rotor, (XYZ)) ! From nacelle last point +! Position (Rotor, (XYZ)) ! From nacelle last point XPOSINI_HUB_RN(JROT,1) = 0d0 XPOSINI_HUB_RN(JROT,2) = 0d0 XPOSINI_HUB_RN(JROT,3) = 0d0 diff --git a/src/MNH/ini_eol_alm.f90 b/src/MNH/ini_eol_alm.f90 index 301f7d35d..1c776840a 100644 --- a/src/MNH/ini_eol_alm.f90 +++ b/src/MNH/ini_eol_alm.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2018-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2018-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -80,7 +80,7 @@ END MODULE MODI_INI_EOL_ALM !! !! AUTHOR !! ------ -!! PA. Joulin * Meteo France & IFPEN * +!! PA. Joulin * Meteo France & IFPEN * !! !! MODIFICATIONS !! ------------- @@ -277,7 +277,7 @@ ALLOCATE(XPOS_TOWO_RG (INB_WT,3) ) ! Current tower origin pos ALLOCATE(XPOS_TELT_RG (INB_WT,INB_TELT,3) ) ! Current tower element pos. in RG ALLOCATE(XPOS_TELT_RT (INB_WT,INB_TELT,3) ) ! Current tower element pos. in RT ALLOCATE(XANGINI_TOW_RG (INB_WT,3) ) ! Initial tower ori. in RG -! Nacelle +! Nacelle ALLOCATE(XPOSINI_NACO_RT (INB_WT,3) ) ! Initial nacelle origin pos. in RT ALLOCATE(XPOS_NACO_RG (INB_WT,3) ) ! Current nacelle origin pos. in RG ALLOCATE(XPOS_NELT_RG (INB_WT,INB_NELT,3) ) ! Current nacelle element pos. in RG @@ -305,7 +305,7 @@ ALLOCATE(XSURF_ELT (INB_WT,INB_B,INB_BELT) ) ! Element lift surface ! Tower ALLOCATE(XTVEL_TOWO_RG (INB_WT,3) ) ! Tower base trans. vel. in RG ALLOCATE(XTVEL_TELT_RG (INB_WT,INB_TELT,3) ) ! Tower element trans. vel. in RG -ALLOCATE(XRVEL_RT_RG (INB_WT,3) ) ! RT/RG rot. vel. +ALLOCATE(XRVEL_RT_RG (INB_WT,3) ) ! RT/RG rot. vel. ! Nacelle ALLOCATE(XTVEL_NACO_RT (INB_WT,3) ) ! Nacelle base trans. vel. in RT ALLOCATE(XTVEL_NELT_RG (INB_WT,INB_NELT,3) ) ! Nacelle element trans. vel. in RG @@ -385,7 +385,7 @@ DO JROT=1, INB_WT ! Velocities XTVEL_NACO_RT(JROT,:) = 0d0 XRVEL_RN_RT(JROT,:) = 0d0 -! Positions (Rotor, (XYZ)) ! From last point of tower +! Positions (Rotor, (XYZ)) ! From last point of tower ! Origin XPOSINI_NACO_RT(JROT,:) = 0d0 ! Distance between nacelle base and tower top ! Elements @@ -406,7 +406,7 @@ DO JROT=1, INB_WT XRVEL_RH_RN(JROT,1) = 0d0 XRVEL_RH_RN(JROT,2) = 0d0 XRVEL_RH_RN(JROT,3) = TFARM%XOMEGA(JROT) -! Position (Rotor, (XYZ)) ! From nacelle last point +! Position (Rotor, (XYZ)) ! From nacelle last point XPOSINI_HUB_RN(JROT,1) = 0d0 XPOSINI_HUB_RN(JROT,2) = 0d0 XPOSINI_HUB_RN(JROT,3) = 0d0 @@ -417,7 +417,7 @@ DO JROT=1, INB_WT ! !* 4.5 Blades DO JBLA=1, INB_B -! Velocities +! Velocities XRVEL_RB_RH(JROT,JBLA,:) = 0d0 XTVEL_BLA_RH(JROT,JBLA,:) = 0d0 ! Position (Rotor, Blade, (XYZ)) ! From hub point diff --git a/src/MNH/ini_field_elec.f90 b/src/MNH/ini_field_elec.f90 index 49206a1d8..258b5993a 100644 --- a/src/MNH/ini_field_elec.f90 +++ b/src/MNH/ini_field_elec.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -49,7 +49,7 @@ END MODULE MODI_INI_FIELD_ELEC !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aérologie * +!! J.-P. Pinty * Laboratoire d'Aérologie * !! !! MODIFICATIONS !! ------------- @@ -64,8 +64,8 @@ END MODULE MODI_INI_FIELD_ELEC !! !!------------------------------------------------------------------------------- ! -!* 0. DECLARATIONS -! ------------ +!* 0. DECLARATIONS +! ------------ ! USE MODD_PARAMETERS USE MODD_CONF @@ -83,7 +83,7 @@ USE MODE_ll ! IMPLICIT NONE ! -!* 0.1 Declaration of dummy arguments +!* 0.1 Declaration of dummy arguments ! REAL, DIMENSION(:,:,:), INTENT(IN) :: PDXX ! Metric coefficients REAL, DIMENSION(:,:,:), INTENT(IN) :: PDYY ! Metric coefficients @@ -92,7 +92,7 @@ REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDZX ! Metric coefficients REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PDZY ! Metric coefficients REAL, DIMENSION(:,:,:), INTENT(IN) :: PZZ ! vertical grid ! -!* 0.2 Declaration of local variables +!* 0.2 Declaration of local variables ! ! CHARACTER(LEN=4), DIMENSION(2) :: ZLBCX ! x-direction LBC type diff --git a/src/MNH/ini_flash_geom_elec.f90 b/src/MNH/ini_flash_geom_elec.f90 index e543b5ca9..5494f5c24 100644 --- a/src/MNH/ini_flash_geom_elec.f90 +++ b/src/MNH/ini_flash_geom_elec.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -16,9 +16,9 @@ END SUBROUTINE INI_FLASH_GEOM_ELEC END INTERFACE END MODULE MODI_INI_FLASH_GEOM_ELEC ! -! ####################################### +! ####################################### SUBROUTINE INI_FLASH_GEOM_ELEC (HCLOUD) -! ####################################### +! ####################################### ! !!**** *INI_FLASH_GEOM_ELEC* - routine to initialize the lightning flashes !! @@ -55,8 +55,8 @@ END MODULE MODI_INI_FLASH_GEOM_ELEC !! !------------------------------------------------------------------------------- ! -!* 0. DECLARATIONS -! ------------ +!* 0. DECLARATIONS +! ------------ ! USE MODD_CST, ONLY : XPI USE MODD_RAIN_ICE_DESCR_n,ONLY : XALPHAR_I=>XALPHAR, XNUR_I=>XNUR, XCCR, & @@ -81,12 +81,12 @@ USE MODI_MOMG ! IMPLICIT NONE ! -!* 0.1 Declaration of dummy arguments +!* 0.1 Declaration of dummy arguments ! CHARACTER(LEN=4), INTENT(IN) :: HCLOUD ! microphysics scheme ! ! -!* 0.2 Declaration of local variables +!* 0.2 Declaration of local variables ! ! variables used to cope with the module variables common to icex and lima REAL :: ZALPHAR, ZNUR, & @@ -97,8 +97,8 @@ REAL :: ZALPHAR, ZNUR, & ! !------------------------------------------------------------------------------- ! -!* 1. PRELIMINARIES -! ------------- +!* 1. PRELIMINARIES +! ------------- ! !* 1.1 Address module variables common to ICEx and LIMA ! @@ -237,8 +237,8 @@ XALT_CG = 2000. ! m ! !---------------------------------------------------------------------------- ! -!* 3. INITIALIZATIONS -! --------------- +!* 3. INITIALIZATIONS +! --------------- ! NNBLIGHT = 0 NNB_CG = 0 diff --git a/src/MNH/ini_lb.f90 b/src/MNH/ini_lb.f90 index f55708c99..366bb8d56 100644 --- a/src/MNH/ini_lb.f90 +++ b/src/MNH/ini_lb.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1998-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1998-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -112,7 +112,7 @@ SUBROUTINE INI_LB(TPINIFILE,OLSOURCE,KSV, & !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! D. Gazen L.A. !! !! MODIFICATIONS diff --git a/src/MNH/ini_lg.f90 b/src/MNH/ini_lg.f90 index 8f5428cae..d616f7415 100644 --- a/src/MNH/ini_lg.f90 +++ b/src/MNH/ini_lg.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2001-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2001-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -55,7 +55,7 @@ END MODULE MODI_INI_LG !! !! AUTHOR !! ------ -!! P. Jabouille / J Stein * Meteo France * +!! P. Jabouille / J Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ini_ls.f90 b/src/MNH/ini_ls.f90 index d5395028e..09daab912 100644 --- a/src/MNH/ini_ls.f90 +++ b/src/MNH/ini_ls.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1998-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1998-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -76,7 +76,7 @@ END MODULE MODI_INI_LS !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ini_mean_field.f90 b/src/MNH/ini_mean_field.f90 index 5dddb8bd5..73fad335d 100644 --- a/src/MNH/ini_mean_field.f90 +++ b/src/MNH/ini_mean_field.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2009-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2009-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -42,7 +42,7 @@ END MODULE MODI_INI_MEAN_FIELD !! !! AUTHOR !! ------ -!! P. Aumond * Meteo France * +!! P. Aumond * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ini_prog_var.f90 b/src/MNH/ini_prog_var.f90 index f0d7cc687..882a62a2d 100644 --- a/src/MNH/ini_prog_var.f90 +++ b/src/MNH/ini_prog_var.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -66,7 +66,7 @@ END MODULE MODI_INI_PROG_VAR !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/ini_radar.f90 b/src/MNH/ini_radar.f90 index 671d1f6e9..69486960d 100644 --- a/src/MNH/ini_radar.f90 +++ b/src/MNH/ini_radar.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -148,7 +148,7 @@ XCXH = -1.0 !------------------------------------------------------------------------------- ! !* 2. DIMENSIONAL DISTRIBUTIONS OF THE SPECIES -! ---------------------------------------- +! ---------------------------------------- ! !* 2.1 Raindrops distribution ! diff --git a/src/MNH/ini_radiations.f90 b/src/MNH/ini_radiations.f90 index a19a3b71f..ceb7d9f84 100644 --- a/src/MNH/ini_radiations.f90 +++ b/src/MNH/ini_radiations.f90 @@ -109,7 +109,7 @@ END MODULE MODI_INI_RADIATIONS !! !! AUTHOR !! ------ -!! V. Masson * Laboratoire d'Aerologie* +!! V. Masson * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- @@ -247,7 +247,7 @@ END IF !------------------------------------------------------------------------------- ! !* 2. COMPUTES THE SOLAR DECLINATION ANGLE -! ------------------------------------ +! ------------------------------------ ! ZDECSOL = 0.006918-0.399912*COS(ZAD) +0.070257*SIN(ZAD) & -0.006758*COS(2.*ZAD)+0.000907*SIN(2.*ZAD) & @@ -258,7 +258,7 @@ PCOSDEL = COS(ZDECSOL) !------------------------------------------------------------------------------- ! !* 3. COMPUTES THE SIDERAL HOUR CORRECTION -! ------------------------------------ +! ------------------------------------ ! ZA1 = (1.00554*ZDATE- 6.28306)*(XPI/180.0) ZA2 = (1.93946*ZDATE+23.35089)*(XPI/180.0) @@ -267,7 +267,7 @@ PTSIDER = (7.67825*SIN(ZA1)+10.09176*SIN(ZA2)) / 60.0 !------------------------------------------------------------------------------- ! !* 4. COMPUTES THE DAILY SOLAR CONSTANT CORRECTION -! -------------------------------------------- +! -------------------------------------------- ! PCORSOL = 1.00011+0.034221*COS(ZAD) +0.001280*SIN(ZAD) & +0.000719*COS(2.*ZAD)+0.000077*SIN(2.*ZAD) @@ -275,7 +275,7 @@ PCORSOL = 1.00011+0.034221*COS(ZAD) +0.001280*SIN(ZAD) & !------------------------------------------------------------------------------- ! !* 5. COMPUTES THE SLOPE ANGLE AND THE AZIMUTHAL SLOPE ANGLE -! ------------------------------------------------------ +! ------------------------------------------------------ ! ! IF(LFLAT) THEN @@ -306,7 +306,7 @@ CALL ADD2DFIELD_ll ( TPINITHALO2D_ll, PSLOPAZI, 'INI_RADIATIONS::PSLOPAZI' ) !------------------------------------------------------------------------------- ! !* 9. INITIALIZE TIME FOR THE RADIATION CALL -! -------------------------------------- +! -------------------------------------- ! PSWU(:,:,:) = 0. PSWD(:,:,:) = 0. @@ -346,7 +346,7 @@ END IF !------------------------------------------------------------------------------- ! !* 10. INITIALIZE COLUMN AGGREGATION FOR RADIATION CALL -! ------------------------------------------------- +! ------------------------------------------------- CALL INI_RADIATIONS_AGG (KRAD_AGG,KI_RAD_AGG,KJ_RAD_AGG,KIOR_RAD_AGG,KJOR_RAD_AGG,KRAD_AGG_FLAG) ! diff --git a/src/MNH/ini_radiations_agg.f90 b/src/MNH/ini_radiations_agg.f90 index 71679e0dd..1bfdd5ae3 100644 --- a/src/MNH/ini_radiations_agg.f90 +++ b/src/MNH/ini_radiations_agg.f90 @@ -63,7 +63,7 @@ END MODULE MODI_INI_RADIATIONS_AGG !! !! AUTHOR !! ------ -!! V. Masson * CNRM * +!! V. Masson * CNRM * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ini_radiations_ecmwf.f90 b/src/MNH/ini_radiations_ecmwf.f90 index 73aa70d07..32d02e0e1 100644 --- a/src/MNH/ini_radiations_ecmwf.f90 +++ b/src/MNH/ini_radiations_ecmwf.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -141,7 +141,7 @@ END MODULE MODI_INI_RADIATIONS_ECMWF !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Pinty * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- @@ -293,7 +293,7 @@ CALL GET_GLOBALDIMS_ll ( IIMAX_ll,IJMAX_ll ) !------------------------------------------------------------------------------- ! !* 6. INITIALIZES THE STANDARD ATMOSPHERES AND CHOOSES THE CLOSEST ONE -! ---------------------------------------------------------------- +! ---------------------------------------------------------------- ! CALL INI_STAND_ATM ! @@ -385,7 +385,7 @@ KFLEV = IKE -JPVEXT + SIZE(PSTATM,1) - KSTATM + 1 !------------------------------------------------------------------------------- ! !* 7. INITIALIZES THE ECMWF RADIATION PACKAGE -! ------------------------------------------------ +! ------------------------------------------------ ! KDLON = (IIE-IIB+1)*(IJE-IJB+1) ! number of column KFLUX = 6 @@ -401,7 +401,7 @@ CALL INI_RADCONF (HLW,KSWB,OSUBG_COND) !------------------------------------------------------------------------------- ! !* 8. INITIALIZE RADIATIVELY ACTIVE COMPOUNDS (3D FIELDS) -! ------------------------------------------------------ +! ------------------------------------------------------ ! !* 8.1 Aerosols and Ozone climatologies ! diff --git a/src/MNH/ini_segn.f90 b/src/MNH/ini_segn.f90 index 7ba8aaf33..fe38350ef 100644 --- a/src/MNH/ini_segn.f90 +++ b/src/MNH/ini_segn.f90 @@ -125,7 +125,7 @@ END MODULE MODI_INI_SEG_n !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/init_ground_paramn.f90 b/src/MNH/init_ground_paramn.f90 index 2125d9dcf..bddb0a06e 100644 --- a/src/MNH/init_ground_paramn.f90 +++ b/src/MNH/init_ground_paramn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2003-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -56,7 +56,7 @@ END MODULE MODI_INIT_GROUND_PARAM_n !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/init_horgrid_lln.f90 b/src/MNH/init_horgrid_lln.f90 index 1488d7636..ab3e22335 100644 --- a/src/MNH/init_horgrid_lln.f90 +++ b/src/MNH/init_horgrid_lln.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -33,7 +33,7 @@ !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/initial_guess.f90 b/src/MNH/initial_guess.f90 index 5bfca50c5..b2cc4eb06 100644 --- a/src/MNH/initial_guess.f90 +++ b/src/MNH/initial_guess.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -125,7 +125,7 @@ END MODULE MODI_INITIAL_GUESS !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Pinty * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- @@ -193,13 +193,13 @@ REAL :: ZINVTSTEP !------------------------------------------------------------------------------- ! !* 1. COMPUTES THE INVERSE OF THE APPLICABLE TIMESTEP -! ----------------------------------------------- +! ----------------------------------------------- ! ZINVTSTEP = 1./PTSTEP ! ! !* 2. COMPUTES THE FIRST SOURCE TERMS -! ------------------------------- +! ------------------------------- ! ! *** momentum ! forward-in-time time-marching scheme diff --git a/src/MNH/interp3d.f90 b/src/MNH/interp3d.f90 index d6a05a70b..271e168a4 100644 --- a/src/MNH/interp3d.f90 +++ b/src/MNH/interp3d.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1997-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1997-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -48,7 +48,7 @@ END MODULE MODI_INTERP3D !! !! AUTHOR !! ------ -!! +!! !! V.Ducrocq Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/ion_attach_elec.f90 b/src/MNH/ion_attach_elec.f90 index cd99d72d4..cea0df65f 100644 --- a/src/MNH/ion_attach_elec.f90 +++ b/src/MNH/ion_attach_elec.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2010-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2010-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -89,8 +89,8 @@ END MODULE MODI_ION_ATTACH_ELEC ! !------------------------------------------------------------------------------- ! -!* 0. DECLARATIONS -! ------------ +!* 0. DECLARATIONS +! ------------ ! use modd_budget, only : lbudget_sv, NBUDGET_SV1, tbudgets USE MODD_CONF, ONLY : CCONF @@ -140,7 +140,7 @@ USE MODI_MOMG IMPLICIT NONE ! -! 0.1 Declaration of arguments +! 0.1 Declaration of arguments ! INTEGER, INTENT(IN) :: KTCOUNT ! Temporal loop counter INTEGER, INTENT(IN) :: KRR ! Number of moist variables @@ -170,7 +170,7 @@ REAL, DIMENSION(:,:,:), OPTIONAL, INTENT(IN) :: PCGS ! Graupel nb conc s REAL, DIMENSION(:,:,:), OPTIONAL, INTENT(IN) :: PCHS ! Hail nb conc source ! ! -! 0.2 Declaration of local variables +! 0.2 Declaration of local variables ! REAL, DIMENSION(:), ALLOCATABLE :: ZT ! Temperature (K) REAL, DIMENSION(:), ALLOCATABLE :: ZCONC, & ! Number concentration @@ -363,7 +363,7 @@ END IF ! !------------------------------------------------------------------------------- ! -!* 3. TRANSFORM VOLUM. SOURCE TERMS INTO MIXING RATIO +!* 3. TRANSFORM VOLUM. SOURCE TERMS INTO MIXING RATIO ! FOR WATER SPECIES, AND VOLUMIC CONTENT FOR ELECTRIC VARIABLES ! ------------------------------------------------------------- ! @@ -404,7 +404,7 @@ ENDDO ! !------------------------------------------------------------------------------- ! -!* 4. COMPUTE ATTACHMENT DUE TO ION DIFFUSION AND CONDUCTION +!* 4. COMPUTE ATTACHMENT DUE TO ION DIFFUSION AND CONDUCTION ! ------------------------------------------------------ ! ! Attachment to cloud droplets, rain, cloud ice, snow, graupel, @@ -414,7 +414,7 @@ ENDDO IF( IVALID /= 0 ) THEN ! ! -!* 4.1 Attachment to cloud droplets +!* 4.1 Attachment to cloud droplets ! ALLOCATE (ZCONC(IVALID)) ALLOCATE (ZVIT (IVALID)) @@ -431,7 +431,7 @@ IF( IVALID /= 0 ) THEN PSVS(:,:,:,ITYPE)) ! ! -!* 4.2 Attachment to raindrops, ice crystals, snow, graupel, +!* 4.2 Attachment to raindrops, ice crystals, snow, graupel, ! and hail (if activated) ! DO ITYPE = 3, KRR @@ -454,7 +454,7 @@ IF (ALLOCATED(ZCHT)) DEALLOCATE(ZCHT) ! !------------------------------------------------------------------------------- ! -!* 5. RETURN TO VOLUMETRIC SOURCE (Prognostic units) +!* 5. RETURN TO VOLUMETRIC SOURCE (Prognostic units) ! --------------------------- ! DO JRR = 1, KRR @@ -467,7 +467,7 @@ ENDDO ! !------------------------------------------------------------------------------- ! -!* 6. BUDGET +!* 6. BUDGET ! ------ ! if ( lbudget_sv ) then @@ -528,7 +528,7 @@ ZRADIUS(:) = 0. ! SELECT CASE (ITYPE) ! -!* 1. PARAMETERS FOR CLOUD +!* 1. PARAMETERS FOR CLOUD ! -------------------- CASE (2) ! @@ -589,7 +589,7 @@ SELECT CASE (ITYPE) END IF ! ! -!* 2. PARAMETERS FOR RAIN +!* 2. PARAMETERS FOR RAIN ! ------------------- CASE (3) ! @@ -629,7 +629,7 @@ SELECT CASE (ITYPE) END IF ! ! -!* 3. PARAMETERS FOR ICE +!* 3. PARAMETERS FOR ICE ! ------------------ ! CASE (4) @@ -676,7 +676,7 @@ SELECT CASE (ITYPE) END IF ! ! -!* 4. PARAMETERS FOR SNOW +!* 4. PARAMETERS FOR SNOW ! ------------------- ! CASE (5) @@ -714,7 +714,7 @@ SELECT CASE (ITYPE) END IF ! ! -!* 5. PARAMETERS FOR GRAUPEL +!* 5. PARAMETERS FOR GRAUPEL ! ---------------------- ! CASE (6) @@ -752,7 +752,7 @@ SELECT CASE (ITYPE) END IF ! ! -!* 6. PARAMETERS FOR HAIL +!* 6. PARAMETERS FOR HAIL ! ------------------- ! CASE (7) @@ -803,11 +803,11 @@ END SUBROUTINE HYDROPARAM ! source for PQVS) ! ! -!* 0. DECLARATIONS -! ------------ +!* 0. DECLARATIONS +! ------------ IMPLICIT NONE ! -!* 0.1 declaration of dummy arguments +!* 0.1 declaration of dummy arguments ! REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PQPIS ! Positive ion concentration REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PQNIS ! Negative ion concentration @@ -816,7 +816,7 @@ INTEGER, DIMENSION(:), INTENT(IN) :: IGRIDX, IGRIDY, IGRIDZ ! Index of ! valid gridpoints ! -!* 0.2 declaration of local variables +!* 0.2 declaration of local variables ! INTEGER :: JI, JJ, JK, IV REAL :: ZNC, ZRADI, ZVT ! Nb conc., radius, fallspeed of the hydrometeor category @@ -831,7 +831,7 @@ REAL :: ZEFIELD ! Electric field magnitude REAL :: ZQBOUND ! Limit charge for conduction ! ! -!* 1. COMPUTE ION ATTACHMENT +!* 1. COMPUTE ION ATTACHMENT ! ---------------------- ! DO IV = 1, IVALID @@ -844,7 +844,7 @@ DO IV = 1, IVALID ZRADI = ZRADIUS(IV) ZVT = ZVIT(IV) ! -!* 1.0 Ion diffusion to a particle +!* 1.0 Ion diffusion to a particle ! ZDPIDT_D = 0. ZDNIDT_D = 0. @@ -878,7 +878,7 @@ DO IV = 1, IVALID ENDIF ! ! -!* 1.1 Ion conduction to a particle +!* 1.1 Ion conduction to a particle ! ZDPIDT_C = 0. ZDNIDT_C = 0. diff --git a/src/MNH/ion_bound4drift.f90 b/src/MNH/ion_bound4drift.f90 index 6dfe884ee..2cb94e051 100644 --- a/src/MNH/ion_bound4drift.f90 +++ b/src/MNH/ion_bound4drift.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -56,7 +56,7 @@ END MODULE MODI_ION_BOUND4DRIFT !! ------ !! M. Chong 12/2010 !! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 -!! +!! !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS diff --git a/src/MNH/ion_boundaries.f90 b/src/MNH/ion_boundaries.f90 index 7847ad6c3..38e8975b7 100644 --- a/src/MNH/ion_boundaries.f90 +++ b/src/MNH/ion_boundaries.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -55,7 +55,7 @@ END MODULE MODI_ION_BOUNDARIES !! AUTHOR !! ------ !! M. Chong 12/2010 -!! +!! !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS diff --git a/src/MNH/lap_m.f90 b/src/MNH/lap_m.f90 index 5eceef4f0..dd2aa3a54 100644 --- a/src/MNH/lap_m.f90 +++ b/src/MNH/lap_m.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2007-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2007-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -89,7 +89,7 @@ END MODULE MODI_LAP_M !! !! AUTHOR !! ------ -!! P. Hereil and J. Stein * Meteo France * +!! P. Hereil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/les_pdf_ll.f90 b/src/MNH/les_pdf_ll.f90 index c47c34e14..0d377c284 100644 --- a/src/MNH/les_pdf_ll.f90 +++ b/src/MNH/les_pdf_ll.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -215,7 +215,7 @@ DO JPDF=1,NPDF DO JJ=1,IJ DO JI=1,II IF ( OMASK(JI,JJ,JK).AND.(PA(JI,JJ,JK)/=XUNDEF).AND.& - (PA(JI,JJ,JK)>=ZLIMITPDF(JPDF)).AND.& + (PA(JI,JJ,JK)>=ZLIMITPDF(JPDF)).AND.& (PA(JI,JJ,JK)<ZLIMITPDF(JPDF+1))) THEN ZA_SUM(JK,JPDF) = ZA_SUM(JK,JPDF) + 1 END IF @@ -309,7 +309,7 @@ DO JPDF=1,NPDF DO JJ=1,IJ DO JI=1,II IF ( OMASK(JI,JJ).AND.(PA(JI,JJ,JK)/=XUNDEF).AND.& - (PA(JI,JJ,JK)>=ZLIMITPDF(JPDF)).AND.& + (PA(JI,JJ,JK)>=ZLIMITPDF(JPDF)).AND.& (PA(JI,JJ,JK)<ZLIMITPDF(JPDF+1))) THEN ZA_SUM(JK,JPDF) = ZA_SUM(JK,JPDF) + 1 END IF diff --git a/src/MNH/lidar.f90 b/src/MNH/lidar.f90 index 93cfad846..0023ce9b0 100644 --- a/src/MNH/lidar.f90 +++ b/src/MNH/lidar.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2007-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2007-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -227,7 +227,7 @@ REAL :: ZCCG, ZCXG, ZLBEXG, ZLBG ! ----------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS -! ----------------------- +! ----------------------- ! CALL GET_INDICE_ll (IIB,IJB,IIE,IJE) IKB=1+JPVEXT diff --git a/src/MNH/mask_compress.f90 b/src/MNH/mask_compress.f90 index b03f27445..4f3f56cfd 100644 --- a/src/MNH/mask_compress.f90 +++ b/src/MNH/mask_compress.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -73,7 +73,7 @@ END MODULE MODI_MASK_COMPRESS !! !! AUTHOR !! ------ -!! J. Nicolau * Meteo France * +!! J. Nicolau * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -122,8 +122,8 @@ INTEGER :: IIE,IJE ! Upper bounds of the physical ! CALL GET_INDICE_ll(IIB,IJB,IIE,IJE) ! -!* 2. SOURCE TRANSFERT IN A LOCAL ARRAY -! --------------------------------- +!* 2. SOURCE TRANSFERT IN A LOCAL ARRAY +! --------------------------------- ! ZVARS=0. DO IK=1, NBUKH-NBUKL+1 @@ -132,8 +132,8 @@ END DO ! !------------------------------------------------------------------------------- ! -!* 3. COMPRESSIONS IN I AND J DIRECTIONS -! ---------------------------------- +!* 3. COMPRESSIONS IN I AND J DIRECTIONS +! ---------------------------------- ! DO IM=1, NBUMASK DO IK=1, NBUKH-NBUKL+1 @@ -143,8 +143,8 @@ END DO ! !------------------------------------------------------------------------------- ! -!* 4. COMPRESSION IN K DIRECTION -! -------------------------- +!* 4. COMPRESSION IN K DIRECTION +! -------------------------- IF (LBU_KCP) THEN PCOMPRESS(1,:)=SUM(ZCOMP,1) ! diff --git a/src/MNH/mass_leak.f90 b/src/MNH/mass_leak.f90 index c5dc3e31e..871e6843f 100644 --- a/src/MNH/mass_leak.f90 +++ b/src/MNH/mass_leak.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -217,7 +217,7 @@ IF( HLBCY(1) /= 'CYCL' ) THEN ! END IF ! -!CALL REDUCESUM_ll(ZLEAK,IINFO_ll) ! we do the reducesum_ll in SUM_DD_R2_ll so we do not do it here +!CALL REDUCESUM_ll(ZLEAK,IINFO_ll) ! we do the reducesum_ll in SUM_DD_R2_ll so we do not do it here ! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/metrics.f90 b/src/MNH/metrics.f90 index b973e0920..4e7f128c8 100644 --- a/src/MNH/metrics.f90 +++ b/src/MNH/metrics.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -71,7 +71,7 @@ END MODULE MODI_METRICS !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -79,8 +79,8 @@ END MODULE MODI_METRICS !! 14/02/01 (V. Masson and J. Stein) PDZZ initialized below the surface !! (influences the 3D turbulence of W) and PDXX,PDYY,PDZZ at the top !! 19/03/2008 (J.Escobar) remove spread !!! -!! 2014 (M.Faivre) -!! 25/02/2015 (M.Moge) minor bug fix with MPPDB_CHECK +!! 2014 (M.Faivre) +!! 25/02/2015 (M.Moge) minor bug fix with MPPDB_CHECK !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS diff --git a/src/MNH/mnh2lpdm.f90 b/src/MNH/mnh2lpdm.f90 index 21d162a5d..3918b994b 100644 --- a/src/MNH/mnh2lpdm.f90 +++ b/src/MNH/mnh2lpdm.f90 @@ -1,16 +1,16 @@ -!MNH_LIC Copyright 2002-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------------- ! ######spl PROGRAM MNH2LPDM -! ############## +! ############## !----------------------------------------------------------------------------- -!**** MNH2DIF COUPLAGE MESO-NH / SPRAY. +!**** MNH2DIF COUPLAGE MESO-NH / SPRAY. ! -! Auteur : Michel Bouzom, DP/SERV/ENV -! Creation : 16.07.2002 +! Auteur : Michel Bouzom, DP/SERV/ENV +! Creation : 16.07.2002 ! Modification : 07.01.2006 (T.LAUVAUX, adaptation LPDM) ! Modification : 04.01.2009 (F. BONNARDOT, DP/SER/ENV ) ! P. Wautelet 05/2016-04/2018: new data structures and calls for I/O @@ -22,10 +22,10 @@ ! ! ! -!* 0. DECLARATIONS. -! ------------- +!* 0. DECLARATIONS. +! ------------- ! -!* 0.1 Modules. +!* 0.1 Modules. ! USE MODD_CONF, ONLY : CPROGRAM USE MODD_IO, ONLY : TFILEDATA, TFILE_OUTPUTLISTING, TPTR2FILE @@ -49,7 +49,7 @@ USE MODI_VERSION USE MODN_CONFIO ! ! -!* 0.2 Variables locales. +!* 0.2 Variables locales. ! IMPLICIT NONE ! @@ -70,8 +70,8 @@ TYPE(TFILEDATA),POINTER :: TZNMLFILE => NULL() ! Namelist file ! ! ! -!* 1. INITIALISATION. -! --------------- +!* 1. INITIALISATION. +! --------------- ! CPROGRAM='M2LPDM' CALL GOTO_MODEL(1) @@ -87,23 +87,23 @@ CALL IO_File_open(TLUOUT0) TLUOUT => TLUOUT0 TFILE_OUTPUTLISTING => TLUOUT0 ! -!* 1.1 Variables generales. +!* 1.1 Variables generales. ! CFMNH(:) = '' ! ! -!* 1.2 Initialisation routines LL. +!* 1.2 Initialisation routines LL. ! CALL IO_Init() ! ! -!* 1.3 Ouverture du fichier log. +!* 1.3 Ouverture du fichier log. ! CALL IO_File_add2list(TZLOGFILE,YFLOG,'TXT','WRITE') CALL IO_File_open(TZLOGFILE) ! ! -!* 1.4 Lecture des namelists. +!* 1.4 Lecture des namelists. ! CALL IO_File_add2list(TZNMLFILE,YFNML,'NML','READ') CALL IO_File_open(TZNMLFILE) @@ -124,7 +124,7 @@ CALL IO_Config_set() CALL IO_File_close(TZNMLFILE) ! ! -!* 1.5 Comptage des FM a traiter. +!* 1.5 Comptage des FM a traiter. ! IF (LEN_TRIM(CFMNH(1))>0) THEN NBMNH=1 @@ -141,10 +141,10 @@ END IF ! ! ! -!* 2. TRAITEMENTS. -! ------------ +!* 2. TRAITEMENTS. +! ------------ ! -!* 2.1 Ouverture des fichiers METEO et GRILLE et DATE. +!* 2.1 Ouverture des fichiers METEO et GRILLE et DATE. ! CALL IO_File_add2list(TZGRIDFILE,CFGRI,'TXT','WRITE') CALL IO_File_open(TZGRIDFILE) @@ -152,12 +152,12 @@ CALL IO_File_add2list(TZDATEFILE,CFDAT,'TXT','WRITE') CALL IO_File_open(TZDATEFILE) ! ! -!* 2.2 Preparation du couplage. +!* 2.2 Preparation du couplage. ! CALL MNH2LPDM_INI(TZFMNH(1)%TZFILE,TZFMNH(NBMNH)%TZFILE,TZLOGFILE,TZGRIDFILE,TZDATEFILE) ! ! -!* 2.3 Traitement des echeances. +!* 2.3 Traitement des echeances. ! DO JFIC=1,NBMNH print*,"CFMTO(JFIC)=",CFMTO(JFIC) @@ -170,7 +170,7 @@ DO JFIC=1,NBMNH END DO ! ! -!* 2.4 Fermeture des fichiers, METEO, GRILLE et LOG. +!* 2.4 Fermeture des fichiers, METEO, GRILLE et LOG. ! CALL IO_File_close(TZGRIDFILE) CALL IO_File_close(TZDATEFILE) diff --git a/src/MNH/mnh2lpdm_ech.f90 b/src/MNH/mnh2lpdm_ech.f90 index 46a16fa5e..c7ee235ab 100644 --- a/src/MNH/mnh2lpdm_ech.f90 +++ b/src/MNH/mnh2lpdm_ech.f90 @@ -1,13 +1,13 @@ -!MNH_LIC Copyright 2009-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2009-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------------- ! ######spl SUBROUTINE MNH2LPDM_ECH(TPFILE,TPMETEOFILE) -! ################################################## +! ################################################## !----------------------------------------------------------------------- -!**** MNH2S2_ECH TRAITEMENT D'UNE ECHEANCE. +!**** MNH2S2_ECH TRAITEMENT D'UNE ECHEANCE. ! ! Auteur : Francois Bonnardot, DP/SERV/ENV ! Creation : 07.01.2009 @@ -18,10 +18,10 @@ ! P. Wautelet 05/11/2020: correct I/O of MNH2LPDM !----------------------------------------------------------------------- ! -!* 0. DECLARATIONS. -! ------------- +!* 0. DECLARATIONS. +! ------------- ! -!* 0.1 Modules. +!* 0.1 Modules. ! ! ! @@ -44,13 +44,13 @@ USE MODE_IO_MANAGE_STRUCT, only: IO_File_add2list IMPLICIT NONE ! ! -!* 0.2 Arguments. +!* 0.2 Arguments. ! TYPE(TFILEDATA),POINTER,INTENT(INOUT) :: TPFILE TYPE(TFILEDATA),POINTER,INTENT(IN) :: TPMETEOFILE ! ! -!* 0.3 Variables locales. +!* 0.3 Variables locales. ! CHARACTER(LEN=NFILENAMELGTMAX) :: YFTURB ! Stockage champs de turbulence. INTEGER :: IFTURB @@ -65,22 +65,22 @@ TYPE(TFILEDATA),POINTER :: TZFILE ! ! ! -!* 1. INITIALISATION. -! --------------- +!* 1. INITIALISATION. +! --------------- ! -!* 1.1 Blabla. +!* 1.1 Blabla. ! TZFILE => NULL() IFMTO = TPMETEOFILE%NLU ! -!* 2. LECTURE DES DONNEES MESO-NH DE BASE. -! ------------------------------------ +!* 2. LECTURE DES DONNEES MESO-NH DE BASE. +! ------------------------------------ ! -!* 2.1 Ouverture du fichier Meso-NH. +!* 2.1 Ouverture du fichier Meso-NH. ! CALL IO_File_open(TPFILE) ! -!* 2.2 Date et heure courante. +!* 2.2 Date et heure courante. ! CALL IO_Field_read(TPFILE,'DTCUR',TZDTCUR) ! @@ -100,7 +100,7 @@ print 20300, ICURJJ,ICURMM,ICURAA,ICURHH,ICURMN,ICURSS ! ! ! -!* 2.3 Lecture des champs Meso-NH de base. +!* 2.3 Lecture des champs Meso-NH de base. ! CALL IO_Field_read(TPFILE,'UT', XUT) CALL IO_Field_read(TPFILE,'VT', XVT) @@ -170,16 +170,16 @@ CALL IO_Field_read(TPFILE,'RRT', XRMRT) ! ! Lecture des donnees Meso-NH terminee.' ! -!* 2.4 Fermeture du fichier Meso-NH. +!* 2.4 Fermeture du fichier Meso-NH. ! CALL IO_File_close(TPFILE) ! ! -!* 3. PREPARATION DES DONNEES. -! ------------------------ +!* 3. PREPARATION DES DONNEES. +! ------------------------ ! ! -!* 3.2 Niveaux altitude "hors-sol" (1:NKMAX). +!* 3.2 Niveaux altitude "hors-sol" (1:NKMAX). ! XSU(:,:,1:NKMAX) = XUT(NSIB:NSIE,NSJB:NSJE,NKB:NKE) XSV(:,:,1:NKMAX) = XVT(NSIB:NSIE,NSJB:NSJE,NKB:NKE) @@ -197,8 +197,8 @@ XSSFU(:,:) = XSFU(NSIB:NSIE,NSJB:NSJE) XSSFV(:,:) = XSFV(NSIB:NSIE,NSJB:NSJE) ! ! -!* 4. CALCULS DES TEMPS LAGRANGIENS ET VARIANCES DU VENT POUR LPDM. -! ------------------------------------------------------------ +!* 4. CALCULS DES TEMPS LAGRANGIENS ET VARIANCES DU VENT POUR LPDM. +! ------------------------------------------------------------ ! XRVSRD = XRV/XRD ! @@ -263,7 +263,7 @@ XSSFV(:,:) = XSFV(NSIB:NSIE,NSJB:NSJE) ! !* Conditions stables. ! - !* XSSIGU,XSSIGW <u'2>**0.5, <w'2>**0.5 + !* XSSIGU,XSSIGW <u'2>**0.5, <w'2>**0.5 DO JK=1,NKMAX IF (XSHAUT(JK).LT.XSHMIX(JI,JJ)) THEN XSSIGU(JI,JJ,JK) = SQRT( 0.5 * & @@ -398,7 +398,7 @@ XSSFV(:,:) = XSFV(NSIB:NSIE,NSJB:NSJE) ! ELSE ! CTURBPARAM=="ISOTROPE" ! - !* XSSIGU,XSSIGW <u'2>**0.5, <w'2>**0.5 + !* XSSIGU,XSSIGW <u'2>**0.5, <w'2>**0.5 ! XSSIGW(JI,JJ,:) = SQRT(2./3.*XSTKE(JI,JJ,:)) XSSIGU(JI,JJ,:) = XSSIGW(JI,JJ,:) @@ -455,8 +455,8 @@ XSSFV(:,:) = XSFV(NSIB:NSIE,NSJB:NSJE) ! -!* 5. ECRITURES FIC MTO. -! ------------------ +!* 5. ECRITURES FIC MTO. +! ------------------ ! ! DO JK = 1,NKMAX diff --git a/src/MNH/mnh2lpdm_ini.f90 b/src/MNH/mnh2lpdm_ini.f90 index fa1ee9187..fa9b5f282 100644 --- a/src/MNH/mnh2lpdm_ini.f90 +++ b/src/MNH/mnh2lpdm_ini.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2009-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2009-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -12,8 +12,8 @@ ! Creation : 04.01.2009 (mnh2s2_ini.f90) ! ! -! Arguments explicites. -! --------------------- +! Arguments explicites. +! --------------------- ! TPFILE1,TPFILE2 First and last files to treat ! TPLOGFILE Log file ! TPGRIDFILE Grid file @@ -27,10 +27,10 @@ ! ! ! -!* 0. INITIALISATION. -! --------------- +!* 0. INITIALISATION. +! --------------- ! -!* 0.1 Modules. +!* 0.1 Modules. ! USE MODD_CST USE MODD_DIM_n @@ -54,7 +54,7 @@ USE MODE_MODELN_HANDLER USE MODI_READ_HGRID USE MODI_XYTOLATLON ! -!* 0.2 Arguments. +!* 0.2 Arguments. ! IMPLICIT NONE ! @@ -64,7 +64,7 @@ TYPE(TFILEDATA),POINTER,INTENT(IN) :: TPGRIDFILE TYPE(TFILEDATA),POINTER,INTENT(IN) :: TPDATEFILE ! ! -!* 0.3 Variables locales. +!* 0.3 Variables locales. ! CHARACTER(LEN=NFILENAMELGTMAX) :: YNAME, YDAD ! Noms du FM et de son papa. CHARACTER(LEN=2) :: YSTORAGE ! Type de variable. @@ -87,8 +87,8 @@ type(tfieldmetadata) :: tzfield ! ! ! -!* 1. INITIALISATION. -! --------------- +!* 1. INITIALISATION. +! --------------- ! IFDAT = TPDATEFILE%NLU IFGRI = TPGRIDFILE%NLU @@ -99,10 +99,10 @@ CALL INI_CST CALL GOTO_MODEL(1) ! ! -!* 2. DONNEES MESO-NH. -! ---------------- +!* 2. DONNEES MESO-NH. +! ---------------- ! -!* 2.1 Ouverture du fichier Meso-NH. +!* 2.1 Ouverture du fichier Meso-NH. ! CALL IO_File_open(TPFILE1) CALL IO_File_open(TPFILE2) @@ -139,14 +139,14 @@ NMDLMM=TZDTEXP1%nmonth NMDLJJ=TZDTEXP1%nday NMDLSS=NINT(TZDTEXP1%xtime) ! -!* Heure du modele arrondie a 5 minutes pres. +!* Heure du modele arrondie a 5 minutes pres. ! NMDLMN = NINT( (REAL(NMDLSS)/60.0)/5.0 )*5 NMDLSS = 0 NMDLHH =NMDLMN/60 NMDLMN =NMDLMN-NMDLHH*60 ! -!* 2.3 Grille horizontale. +!* 2.3 Grille horizontale. ! CALL READ_HGRID(1,TPFILE1,YNAME,YDAD,YSTORAGE) IF (YNAME == YDAD) THEN @@ -166,7 +166,7 @@ NIE=NIU-JPHEXT NJE=NJU-JPHEXT ! ! -!* 2.4 Nombre de niveaux-verticaux. +!* 2.4 Nombre de niveaux-verticaux. ! CALL IO_Field_read(TPFILE1,'KMAX',NKMAX) !WRITE(IFLOG,*) '%%% MNH2S2_INI Lecture du nombre de niveau OK.' @@ -176,7 +176,7 @@ NKB = 1+JPVEXT NKE = NKU-JPVEXT ! ! -!* 2.5 Allocations Meso-NH. +!* 2.5 Allocations Meso-NH. ! ALLOCATE( XZHAT(NKU) ) ALLOCATE( XZS(NIU,NJU) ) @@ -196,16 +196,16 @@ ALLOCATE( XINRT(NIU,NJU)) ALLOCATE( XSFU(NIU,NJU)) ALLOCATE( XSFV(NIU,NJU)) ! -!* 2.6 Decoupage vertical. +!* 2.6 Decoupage vertical. ! CALL IO_Field_read(TPFILE1,'ZHAT',XZHAT) CALL IO_Field_read(TPFILE1,'ZTOP',XZTOP) ! -!* 2.7 Orographie. +!* 2.7 Orographie. ! CALL IO_Field_read(TPFILE1,'ZS',XZS) ! -!* 2.8 Rugosite Z0. +!* 2.8 Rugosite Z0. ! tzfield = tfieldmetadata( & cmnhname = 'Z0', & @@ -222,8 +222,8 @@ XXPTSOMNH=XXHAT(1)+(XXHAT(2)-XXHAT(1))/2 XYPTSOMNH=XYHAT(1)+(XYHAT(2)-XYHAT(1))/2 CALL SM_LATLON(XLATORI,XLONORI,XXPTSOMNH,XYPTSOMNH,XLATOR,XLONOR) ! -!* 2.9 DOMAINE D'EXTRACTION. -! --------------------- +!* 2.9 DOMAINE D'EXTRACTION. +! --------------------- ! NSIB = NIB NSIE = NIE @@ -234,8 +234,8 @@ NSIMAX = NSIE-NSIB+1 NSJMAX = NSJE-NSJB+1 ! ! -!* 3. Impression de controle Meso-NH. -! ------------------------------- +!* 3. Impression de controle Meso-NH. +! ------------------------------- ! ! Domaine horizontal Meso-NH. !modif 12.2014 : passage a 1 seul domaine MesoNH @@ -271,10 +271,10 @@ WRITE(IFLOG,'(6x,a8,i4)') 'tlz ',1 WRITE(IFLOG,'(6x,a8,i4)') 'intopr ',1 WRITE(IFLOG,*) ' grid structure' ! -!* 4. FICHIER METEO. -! -------------- +!* 4. FICHIER METEO. +! -------------- ! -!* 4.1 Allocations. +!* 4.1 Allocations. ! ALLOCATE( XSHAUT(NKMAX)) ALLOCATE( XSREL(NSIMAX,NSJMAX) ) @@ -445,7 +445,7 @@ DEALLOCATE(XZS) DEALLOCATE(XZ0) DEALLOCATE(XZHAT) ! -! Fermeture du fichier Meso-NH. +! Fermeture du fichier Meso-NH. ! CALL IO_File_close(TPFILE1) CALL IO_File_close(TPFILE2) diff --git a/src/MNH/mnh_oasis_define.F90 b/src/MNH/mnh_oasis_define.F90 index c2c948f5f..01bdb79f7 100644 --- a/src/MNH/mnh_oasis_define.F90 +++ b/src/MNH/mnh_oasis_define.F90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -46,7 +46,7 @@ SUBROUTINE MNH_OASIS_DEFINE(HPROGRAM,IP) !! !! AUTHOR !! ------ -!! J. Pianezze *LPO* +!! J. Pianezze *LPO* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnh_oasis_grid.F90 b/src/MNH/mnh_oasis_grid.F90 index 22d99b6c0..440ac2e7a 100644 --- a/src/MNH/mnh_oasis_grid.F90 +++ b/src/MNH/mnh_oasis_grid.F90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -48,7 +48,7 @@ SUBROUTINE MNH_OASIS_GRID(OD_MASTER,KD_LCOMM) !! !! AUTHOR !! ------ -!! J. Pianezze *LOPS* +!! J. Pianezze *LOPS* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnh_oasis_recv.F90 b/src/MNH/mnh_oasis_recv.F90 index 80a2d0db9..6b0858bad 100644 --- a/src/MNH/mnh_oasis_recv.F90 +++ b/src/MNH/mnh_oasis_recv.F90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -62,7 +62,7 @@ SUBROUTINE MNH_OASIS_RECV (HPROGRAM,KI,KSW,PTIMEC,PTSTEP_SURF, & !! !! AUTHOR !! ------ -!! J. Pianezze *LPO* +!! J. Pianezze *LPO* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnh_oasis_send.F90 b/src/MNH/mnh_oasis_send.F90 index a3e6ebcc9..a99f713a9 100644 --- a/src/MNH/mnh_oasis_send.F90 +++ b/src/MNH/mnh_oasis_send.F90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -47,7 +47,7 @@ SUBROUTINE MNH_OASIS_SEND(HPROGRAM,KI,PTIMEC,PSTEP_SURF) !! !! AUTHOR !! ------ -!! J. Pianezze *LPO* +!! J. Pianezze *LPO* !! !! MODIFICATIONS !! ------------- @@ -67,7 +67,7 @@ USE MODN_SFX_OASIS, ONLY : XTSTEP_CPL_LAND, & ! USE MODD_SFX_OASIS, ONLY : LCPL_LAND,LCPL_GW, & LCPL_FLOOD,LCPL_CALVING, & - LCPL_RIVCARB, & + LCPL_RIVCARB, & LCPL_LAKE, & LCPL_SEA,LCPL_SEAICE, & LCPL_WAVE diff --git a/src/MNH/mnhclose_aux_io_surf.f90 b/src/MNH/mnhclose_aux_io_surf.f90 index 9a5ae99ca..fe2b1c324 100644 --- a/src/MNH/mnhclose_aux_io_surf.f90 +++ b/src/MNH/mnhclose_aux_io_surf.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2003-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -45,7 +45,7 @@ END MODULE MODI_MNHCLOSE_AUX_IO_SURF !! !! AUTHOR !! ------ -!! S.Malardel *Meteo France* +!! S.Malardel *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhclose_namelist.f90 b/src/MNH/mnhclose_namelist.f90 index 824cdb3f0..3f6a4680d 100644 --- a/src/MNH/mnhclose_namelist.f90 +++ b/src/MNH/mnhclose_namelist.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -42,7 +42,7 @@ END MODULE MODI_MNHCLOSE_NAMELIST !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhclose_write_cover_tex.f90 b/src/MNH/mnhclose_write_cover_tex.f90 index c041ea0d0..66e36891c 100644 --- a/src/MNH/mnhclose_write_cover_tex.f90 +++ b/src/MNH/mnhclose_write_cover_tex.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhend_io_surfn.f90 b/src/MNH/mnhend_io_surfn.f90 index e8ff587fe..6e88a9701 100644 --- a/src/MNH/mnhend_io_surfn.f90 +++ b/src/MNH/mnhend_io_surfn.f90 @@ -41,7 +41,7 @@ END MODULE MODI_MNHEND_IO_SURF_n !! !! AUTHOR !! ------ -!! S.Malardel *Meteo France* +!! S.Malardel *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhget_luout.f90 b/src/MNH/mnhget_luout.f90 index 342b35f47..6f2703eaf 100644 --- a/src/MNH/mnhget_luout.f90 +++ b/src/MNH/mnhget_luout.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -42,7 +42,7 @@ END MODULE MODI_MNHGET_LUOUT !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhget_size_fulln.f90 b/src/MNH/mnhget_size_fulln.f90 index 2b09a1574..a828e02ae 100644 --- a/src/MNH/mnhget_size_fulln.f90 +++ b/src/MNH/mnhget_size_fulln.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -49,7 +49,7 @@ END MODULE MODI_MNHGET_SIZE_FULL_n !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhget_surf_paramn.f90 b/src/MNH/mnhget_surf_paramn.f90 index a44293771..2366a972a 100644 --- a/src/MNH/mnhget_surf_paramn.f90 +++ b/src/MNH/mnhget_surf_paramn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2003-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -73,7 +73,7 @@ END MODULE MODI_MNHGET_SURF_PARAM_n !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhinit_io_surfn.f90 b/src/MNH/mnhinit_io_surfn.f90 index 99d0b9d6e..e6194c3e1 100644 --- a/src/MNH/mnhinit_io_surfn.f90 +++ b/src/MNH/mnhinit_io_surfn.f90 @@ -43,7 +43,7 @@ END MODULE MODI_MNHINIT_IO_SURF_n !! !! AUTHOR !! ------ -!! S.Malardel *Meteo France* +!! S.Malardel *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhopen_namelist.f90 b/src/MNH/mnhopen_namelist.f90 index d84590952..c4ceb3e2b 100644 --- a/src/MNH/mnhopen_namelist.f90 +++ b/src/MNH/mnhopen_namelist.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2004-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2004-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -45,7 +45,7 @@ END MODULE MODI_MNHOPEN_NAMELIST !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhopen_write_cover_tex.f90 b/src/MNH/mnhopen_write_cover_tex.f90 index 941758e61..cb8dcd2ac 100644 --- a/src/MNH/mnhopen_write_cover_tex.f90 +++ b/src/MNH/mnhopen_write_cover_tex.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2003-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhput_zsn.f90 b/src/MNH/mnhput_zsn.f90 index 952f8646f..2db16bbab 100644 --- a/src/MNH/mnhput_zsn.f90 +++ b/src/MNH/mnhput_zsn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -46,7 +46,7 @@ END MODULE MODI_MNHPUT_ZS_n !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mnhread_zs_dummyn.f90 b/src/MNH/mnhread_zs_dummyn.f90 index eb5eb084a..28067dd83 100644 --- a/src/MNH/mnhread_zs_dummyn.f90 +++ b/src/MNH/mnhread_zs_dummyn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2004-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2004-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -46,7 +46,7 @@ END MODULE MODI_MNHREAD_ZS_DUMMY_n !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -84,7 +84,7 @@ INTEGER :: IJU ! Y array size !------------------------------------------------------------------------------- ! !* 1. READS IN THE LFI FILE -! --------------------- +! --------------------- ! !* 1.0 General information : ! ------------------- diff --git a/src/MNH/mnhwrite_zs_dummyn.f90 b/src/MNH/mnhwrite_zs_dummyn.f90 index 29392ec2b..aee5cdcb4 100644 --- a/src/MNH/mnhwrite_zs_dummyn.f90 +++ b/src/MNH/mnhwrite_zs_dummyn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -46,7 +46,7 @@ END MODULE MODI_MNHWRITE_ZS_DUMMY_n !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_advfrcn.f90 b/src/MNH/modd_advfrcn.f90 index f33bceda8..c0a6b7d73 100644 --- a/src/MNH/modd_advfrcn.f90 +++ b/src/MNH/modd_advfrcn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -25,7 +25,7 @@ !! !! AUTHOR !! ------ -!! P. Peyrille from modd_frc +!! P. Peyrille from modd_frc !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_advn.f90 b/src/MNH/modd_advn.f90 index 52f24fc62..0ce0e9d2f 100644 --- a/src/MNH/modd_advn.f90 +++ b/src/MNH/modd_advn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -25,7 +25,7 @@ !! !! AUTHOR !! ------ -!! Vila, Lafore *Meteo France* +!! Vila, Lafore *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_allprofilern.f90 b/src/MNH/modd_allprofilern.f90 index cb9c52744..476191e4a 100644 --- a/src/MNH/modd_allprofilern.f90 +++ b/src/MNH/modd_allprofilern.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2021-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2021-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -24,7 +24,7 @@ !! !! AUTHOR !! ------ -!! E. Jezequel *Meteo France* +!! E. Jezequel *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_allstationn.f90 b/src/MNH/modd_allstationn.f90 index f36f760b2..13ee07c65 100644 --- a/src/MNH/modd_allstationn.f90 +++ b/src/MNH/modd_allstationn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2021-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2021-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -24,7 +24,7 @@ !! !! AUTHOR !! ------ -!! E. Jezequel *Meteo France* +!! E. Jezequel *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_aunifacparam.f90 b/src/MNH/modd_aunifacparam.f90 index 773c196a9..ae022a118 100644 --- a/src/MNH/modd_aunifacparam.f90 +++ b/src/MNH/modd_aunifacparam.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,11 +32,11 @@ module modd_aunifacparam ! in order to pass them properly into the Fortran unifac routine. ! !revision History: 1. Developed by Betty Pun, AER, December, 1999 -! under CARB funding +! under CARB funding ! !**************************************************************************/ -!/* no. of molecules */ +!/* no. of molecules */ integer, parameter :: NMOL_AQ = NBSP + 1 !/* no. of functional groups */ diff --git a/src/MNH/modd_bakout.f90 b/src/MNH/modd_bakout.f90 index 03c203d7d..8f5d12b87 100644 --- a/src/MNH/modd_bakout.f90 +++ b/src/MNH/modd_bakout.f90 @@ -29,7 +29,7 @@ !! !! AUTHOR !! ------ -!! J.P. Lafore *Meteo France* +!! J.P. Lafore *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_bikhardtn.f90 b/src/MNH/modd_bikhardtn.f90 index 44701b65e..530f944ad 100644 --- a/src/MNH/modd_bikhardtn.f90 +++ b/src/MNH/modd_bikhardtn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -30,7 +30,7 @@ !! !! AUTHOR !! ------ -!! Masson *Meteo France* +!! Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_binsolu.f90 b/src/MNH/modd_binsolu.f90 index 62c31bf10..381502265 100644 --- a/src/MNH/modd_binsolu.f90 +++ b/src/MNH/modd_binsolu.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -19,7 +19,7 @@ MODULE MODD_BINSOLU !Include file: binsolu.h ! !Purpose: concentration of solute (micromol solute / microgram water) - ! in a binary solution at RH = Aw = 0, 0.1, 0.2, 0.3 etc + ! in a binary solution at RH = Aw = 0, 0.1, 0.2, 0.3 etc ! !Include dependencies: used in zsr.c ! diff --git a/src/MNH/modd_blowsnow.f90 b/src/MNH/modd_blowsnow.f90 index 36180eadd..522bdada8 100644 --- a/src/MNH/modd_blowsnow.f90 +++ b/src/MNH/modd_blowsnow.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -40,8 +40,8 @@ LOGICAL :: LBLOWSNOW = .FALSE. ! switch to active pronostic blowing snow ! INTEGER :: NBLOWSNOW3D = 2 ! Number of blowing snow variables ! as scalar in Meso-NH. The curent version of the model use two scalars: -! - Number concentration (#/kg) -! - Mass concentration (kg/kg) +! - Number concentration (#/kg) +! - Mass concentration (kg/kg) INTEGER :: NBLOWSNOW_2D = 3 ! Number of 2D blowing snow variables ! adected in Meso-NH. The curent version of the model advectes three variables: diff --git a/src/MNH/modd_budget.f90 b/src/MNH/modd_budget.f90 index cb073570d..68f60130b 100644 --- a/src/MNH/modd_budget.f90 +++ b/src/MNH/modd_budget.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -24,7 +24,7 @@ !! !! AUTHOR !! ------ -!! P. Hereil *Meteo France* +!! P. Hereil *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_bunifacparam.f90 b/src/MNH/modd_bunifacparam.f90 index 2ef275887..7aa034ab8 100644 --- a/src/MNH/modd_bunifacparam.f90 +++ b/src/MNH/modd_bunifacparam.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -29,7 +29,7 @@ module modd_bunifacparam ! in order to pass them properly into the Fortran unifac routine. ! !revision History: 1. Developed by Betty Pun, AER, December, 1999 - ! under CARB funding + ! under CARB funding ! 2. Modified by Betty Pun, AER, December, 1999 ! under CARB funding for Type B module !************************************************************************ @@ -39,7 +39,7 @@ module modd_bunifacparam integer, parameter :: NMOL_ORG = NBSP + NBSPOA ! no. of functional groups -integer, parameter :: NFUNC_ORG = 16 +integer, parameter :: NFUNC_ORG = 16 !/* Z = 10 is a fixed parameter in Unifac */ real, parameter :: Z = 10.0 diff --git a/src/MNH/modd_ch_aeron.f90 b/src/MNH/modd_ch_aeron.f90 index 121c2373d..ee27fc910 100644 --- a/src/MNH/modd_ch_aeron.f90 +++ b/src/MNH/modd_ch_aeron.f90 @@ -1,4 +1,4 @@ -!ORILAM_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!ORILAM_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !ORILAM_LIC This is part of the ORILAM software governed by the CeCILL-C licence !ORILAM_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !ORILAM_LIC for details. @@ -56,7 +56,7 @@ TYPE CH_AERO_t REAL, DIMENSION(:,:,:), POINTER :: XCCTOT=>NULL() ! Composition of 3rd Moment (%) REAL, DIMENSION(:,:), POINTER :: XCTOTG=>NULL() ! Total concentration of volatile ! species (HNO3, NH3) (ug/m3) in - ! the air + ! the air REAL, DIMENSION(:,:,:,:), POINTER :: XFRAC=>NULL() ! Gas fraction into organic species REAL, DIMENSION(:,:,:,:), POINTER :: XMI=>NULL() ! Molar mass of aerosol species (g/mol) REAL, DIMENSION(:,:,:,:), POINTER :: XSOLORG=>NULL() ! Solubility fraction of SOA (%) diff --git a/src/MNH/modd_ch_budget_n.f90 b/src/MNH/modd_ch_budget_n.f90 index 4fe8de9b6..5c51afadd 100644 --- a/src/MNH/modd_ch_budget_n.f90 +++ b/src/MNH/modd_ch_budget_n.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2016-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2016-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! F. Brosse *Laboratoire d'Aerologie UPS-CNRS* +!! F. Brosse *Laboratoire d'Aerologie UPS-CNRS* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_ch_meteo.f90 b/src/MNH/modd_ch_meteo.f90 index 6edfe5c73..b323d38f9 100644 --- a/src/MNH/modd_ch_meteo.f90 +++ b/src/MNH/modd_ch_meteo.f90 @@ -1,13 +1,8 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------- -!--------------- special set of characters for RCS information -!----------------------------------------------------------------- -! $Source$ $Revision$ -! MASDEV4_7 modd 2006/05/18 13:07:25 -!----------------------------------------------------------------- !! ###################### MODULE MODD_CH_METEO !! ###################### @@ -38,18 +33,11 @@ IMPLICIT NONE SAVE ! -INTEGER :: NMETEORECS - ! number of records -! -INTEGER :: NMETEORECACT = 1 - ! actual record (used in temporal interpolation) -! -REAL, DIMENSION(:), ALLOCATABLE :: XMETEOTIME - ! the time of the individual records -! -REAL, DIMENSION(:,:), ALLOCATABLE :: XMETEODATA - ! the meteodata (the first dimension is the number of - ! elements NMETEOVARS, the second dimension is the number - ! of records) +INTEGER :: NMETEORECS ! number of records +INTEGER :: NMETEORECACT = 1 ! actual record (used in temporal interpolation) +REAL, DIMENSION(:), ALLOCATABLE :: XMETEOTIME ! the time of the individual records +REAL, DIMENSION(:,:), ALLOCATABLE :: XMETEODATA ! the meteodata (the first dimension is the number of + ! elements NMETEOVARS, the second dimension is the number + ! of records) ! END MODULE MODD_CH_METEO diff --git a/src/MNH/modd_ch_prodlosstotn.f90 b/src/MNH/modd_ch_prodlosstotn.f90 index a5fb75b1c..0943e3aad 100644 --- a/src/MNH/modd_ch_prodlosstotn.f90 +++ b/src/MNH/modd_ch_prodlosstotn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2016-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2016-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -26,7 +26,7 @@ !! !! AUTHOR !! ------ -!! F. Brosse *Laboratoire d'Aerologie UPS-CNRS* +!! F. Brosse *Laboratoire d'Aerologie UPS-CNRS* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_ch_solvern.f90 b/src/MNH/modd_ch_solvern.f90 index 50e54f48a..45209c9e4 100644 --- a/src/MNH/modd_ch_solvern.f90 +++ b/src/MNH/modd_ch_solvern.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -43,7 +43,7 @@ TYPE CH_SOLVER_t !* 0.2 parameters for LinSSA solver ! INTEGER :: NSSA = 0 ! number of variables to be treated - ! as "steady state" + ! as "steady state" !JUAN INTEGER, DIMENSION(:), POINTER :: NSSAINDEX => NULL() ! index set of steady state variables !JUAN @@ -51,39 +51,39 @@ TYPE CH_SOLVER_t !* 0.3 tolerances (used by NAG and SVODE solvers) ! REAL :: XRTOL = 0.001 ! relative tolerance for SVODE - ! and D02EAF,D02EBF,D02NBF + ! and D02EAF,D02EBF,D02NBF ! REAL :: XATOL = 0.1 ! absolute tolerance for SVODE - ! and D02NBF + ! and D02NBF ! !* 0.4 parameters for NAG's D02EBF solver ! INTEGER :: NRELAB = 2 ! choose relative error: ! 1 for correct decimal places - ! 2 for correct significant digits - ! 0 for a mixture + ! 2 for correct significant digits + ! 0 for a mixture ! !* 0.5 parameters for SVODE and NAG's D02EBF/D02NBF solvers ! INTEGER :: NPED = 1 ! calculation of the Jacobian matric: - ! 0 for numerical Jacobian - ! 1 for analytical Jacobian (using subroutine CH_JAC) + ! 0 for numerical Jacobian + ! 1 for analytical Jacobian (using subroutine CH_JAC) ! !* 0.6 parameters for NAG's D02NBF solver ! INTEGER :: NMAXORD = 5 ! maximum order for the BDF method (0<NMAXORD<=5) LOGICAL :: LPETZLD = .TRUE. ! perform Petzold local error test (recommended) CHARACTER(len=1) :: CMETHOD = "N" ! method to use non-linear system - ! N or D for modified Newton iteration + ! N or D for modified Newton iteration ! F for functional iteration CHARACTER(len=1) :: CNORM = "A" ! type of norm to be used ! A or D for averaged L2 norm - ! M for maximum norm + ! M for maximum norm INTEGER :: NTRACE = 0 ! level of output from D02NBF - ! -1 (no output) <= NTRACE <= 3 (maximum) - ! 0 only warnings are printed - ! >0 details on Jacobian entries, nonlinear - ! iteration and time integration are given + ! -1 (no output) <= NTRACE <= 3 (maximum) + ! 0 only warnings are printed + ! >0 details on Jacobian entries, nonlinear + ! iteration and time integration are given ! !* 0.7 parameters for CRANCK solver ! diff --git a/src/MNH/modd_cloud_mfn.f90 b/src/MNH/modd_cloud_mfn.f90 index 39ab825f1..a00900d84 100644 --- a/src/MNH/modd_cloud_mfn.f90 +++ b/src/MNH/modd_cloud_mfn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -26,7 +26,7 @@ !! !! AUTHOR !! ------ -!! J. Pergaud * Meteo-France * +!! J. Pergaud * Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_cloupar.f90 b/src/MNH/modd_cloupar.f90 index 7660c5335..a90a79acb 100644 --- a/src/MNH/modd_cloupar.f90 +++ b/src/MNH/modd_cloupar.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -30,7 +30,7 @@ !! !! AUTHOR !! ------ -!! E. Richard *Laboratoire d'Aerologie* +!! E. Richard *Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_condsamp.f90 b/src/MNH/modd_condsamp.f90 index 6da7a6969..6451e28fc 100644 --- a/src/MNH/modd_condsamp.f90 +++ b/src/MNH/modd_condsamp.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -6,12 +6,12 @@ MODULE MODD_CONDSAMP ! ################## !------------------------------------------------------------------------------- -!*** MODD_CONDSAMP Declaration of conditional sampling tracers +!*** MODD_CONDSAMP Declaration of conditional sampling tracers ! !! AUTHOR !! ------ -! : C.Lac -! Creation : 01/06/2011 +! : C.Lac +! Creation : 01/06/2011 ! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_confn.f90 b/src/MNH/modd_confn.f90 index 65c145731..6110ab588 100644 --- a/src/MNH/modd_confn.f90 +++ b/src/MNH/modd_confn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_cst.f90 b/src/MNH/modd_cst.f90 index 35ae49793..ac21eace7 100644 --- a/src/MNH/modd_cst.f90 +++ b/src/MNH/modd_cst.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -53,7 +53,7 @@ REAL, PARAMETER :: XLAM_CRAD = 3.154E-3 ! RASTA cloud radar wavelength (m) <=> 9 TYPE CST_t ! !* 1. FUNDAMENTAL CONSTANTS - ! --------------------- + ! --------------------- REAL :: XPI !< Pi REAL :: XKARMAN !< von karman constant REAL :: XLIGHTSPEED !< light speed @@ -62,18 +62,18 @@ TYPE CST_t REAL :: XAVOGADRO !< Avogadro number ! !* 2. ASTRONOMICAL CONSTANTS - ! ---------------------- + ! ---------------------- REAL :: XDAY,XSIYEA,XSIDAY !< day duration, sideral year duration, sideral day duration INTEGER :: NDAYSEC !< Number of seconds in a day REAL :: XOMEGA !< Earth rotation ! !* 3. TERRESTRIAL GEOIDE CONSTANTS - ! ---------------------------- + ! ---------------------------- REAL :: XRADIUS !< Earth radius REAL :: XG !< Gravity constant ! !* 4. REFERENCE PRESSURE - ! ------------------- + ! ------------------- REAL :: XP00 !< Reference pressure REAL :: XP00OCEAN !< Reference pressure for ocean model REAL :: XRH00OCEAN !< Reference density for ocean model @@ -82,11 +82,11 @@ TYPE CST_t REAL :: XSA00OCEAN !< Ref value for SAlinity in ocean model ! !* 5. RADIATION CONSTANTS - ! ------------------- + ! ------------------- REAL :: XSTEFAN,XI0 !< Stefan-Boltzman constant, solar constant ! !* 6. THERMODYNAMIC CONSTANTS - ! ----------------------- + ! ----------------------- REAL :: XMD,XMV !< Molar mass of dry air and molar mass of vapor REAL :: XRD,XRV !< Gaz constant for dry air, gaz constant for vapor REAL :: XEPSILO !< XMV/XMD @@ -113,13 +113,13 @@ TYPE CST_t REAL :: XRHOLI !< Volumic mass of ice ! !* 7. PRECOMPUTED CONSTANTS - ! --------------------- + ! --------------------- REAL :: RDSRV !< XRD/XRV REAL :: RDSCPD !< XRD/XCPD REAL :: RINVXP00 !< 1./XP00 ! !* 8. MACHINE PRECISION VALUE DEPENDING of REAL4/8 USE - ! --------------------- + ! --------------------- REAL :: XMNH_TINY !< minimum real on this machine REAL :: XMNH_TINY_12 !< sqrt(minimum real on this machine) REAL :: XMNH_EPSILON !< minimum space with 1.0 diff --git a/src/MNH/modd_curvcorn.f90 b/src/MNH/modd_curvcorn.f90 index 62f624047..8e0d57c70 100644 --- a/src/MNH/modd_curvcorn.f90 +++ b/src/MNH/modd_curvcorn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,7 +32,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_def_eddyUV_fluxn.f90 b/src/MNH/modd_def_eddyUV_fluxn.f90 index ec4b60cca..5acbca5da 100644 --- a/src/MNH/modd_def_eddyUV_fluxn.f90 +++ b/src/MNH/modd_def_eddyUV_fluxn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2004-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -19,7 +19,7 @@ !! !! AUTHOR !! ------ -!! P.Peyrille 18/02/04 +!! P.Peyrille 18/02/04 !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_def_eddy_fluxn.f90 b/src/MNH/modd_def_eddy_fluxn.f90 index bba90d7e7..55b95999c 100644 --- a/src/MNH/modd_def_eddy_fluxn.f90 +++ b/src/MNH/modd_def_eddy_fluxn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2004-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -19,7 +19,7 @@ !! !! AUTHOR !! ------ -!! P.Peyrille 18/02/04 +!! P.Peyrille 18/02/04 !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_def_gr_field.f90 b/src/MNH/modd_def_gr_field.f90 index f6e973c73..978361c72 100644 --- a/src/MNH/modd_def_gr_field.f90 +++ b/src/MNH/modd_def_gr_field.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -30,7 +30,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_diag_blank.f90 b/src/MNH/modd_diag_blank.f90 index 0fc391911..5a452edf7 100644 --- a/src/MNH/modd_diag_blank.f90 +++ b/src/MNH/modd_diag_blank.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,7 +32,7 @@ !! !! AUTHOR !! ------ -!! K. Suhre *Laboratoire d'Aerologie* +!! K. Suhre *Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_diag_flag.f90 b/src/MNH/modd_diag_flag.f90 index 94ce52ed5..6fcde810f 100644 --- a/src/MNH/modd_diag_flag.f90 +++ b/src/MNH/modd_diag_flag.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1998-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1998-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -23,7 +23,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_dimn.f90 b/src/MNH/modd_dimn.f90 index 622541f68..86ebfd6aa 100644 --- a/src/MNH/modd_dimn.f90 +++ b/src/MNH/modd_dimn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -31,7 +31,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_dummy_gr_fieldn.f90 b/src/MNH/modd_dummy_gr_fieldn.f90 index b11b0a9a6..3423b56a9 100644 --- a/src/MNH/modd_dummy_gr_fieldn.f90 +++ b/src/MNH/modd_dummy_gr_fieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,7 +32,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_dummy_pgdfields.f90 b/src/MNH/modd_dummy_pgdfields.f90 index 844958634..51bb1f35f 100644 --- a/src/MNH/modd_dummy_pgdfields.f90 +++ b/src/MNH/modd_dummy_pgdfields.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -31,7 +31,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_dyn.f90 b/src/MNH/modd_dyn.f90 index b4d85475f..540df74e1 100644 --- a/src/MNH/modd_dyn.f90 +++ b/src/MNH/modd_dyn.f90 @@ -26,7 +26,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_dynn.f90 b/src/MNH/modd_dynn.f90 index 9fc3a3e98..eedc310de 100644 --- a/src/MNH/modd_dynn.f90 +++ b/src/MNH/modd_dynn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -26,7 +26,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_dynzd.f90 b/src/MNH/modd_dynzd.f90 index 46f0930c9..d3377f5f3 100644 --- a/src/MNH/modd_dynzd.f90 +++ b/src/MNH/modd_dynzd.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -31,7 +31,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -42,7 +42,7 @@ !! Modifications 15/03/98 (Stein) Add LHO_RELAX for each variables !! Modifications 22/01/01 (Gazen) Add LHORELAX_SVC2R2, _SVCHEM, _SVLG !! Modifications 29/11/02 (Pinty) Add LHORELAX_SVC1R3, _SVELEC -!! Modifications 03/11/04 (Zängl) Add fields for truly horizontal diffusion +!! Modifications 03/11/04 (Z�ngl) Add fields for truly horizontal diffusion !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -50,7 +50,7 @@ IMPLICIT NONE ! -! Additional variables needed for truly horizontal diffusion (G. Zängl) +! Additional variables needed for truly horizontal diffusion (G. Z�ngl) LOGICAL, SAVE :: LZDIFFU ! Logical switch if modified diffusion is used diff --git a/src/MNH/modd_dynzdn.f90 b/src/MNH/modd_dynzdn.f90 index 25e0674dc..cdc624de5 100644 --- a/src/MNH/modd_dynzdn.f90 +++ b/src/MNH/modd_dynzdn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -31,7 +31,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -42,7 +42,7 @@ !! Modifications 15/03/98 (Stein) Add LHO_RELAX for each variables !! Modifications 22/01/01 (Gazen) Add LHORELAX_SVC2R2, _SVCHEM, _SVLG !! Modifications 29/11/02 (Pinty) Add LHORELAX_SVC1R3, _SVELEC -!! Modifications 03/11/04 (Zängl) Add fields for truly horizontal diffusion +!! Modifications 03/11/04 (Z�ngl) Add fields for truly horizontal diffusion !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -54,7 +54,7 @@ IMPLICIT NONE TYPE DYNZD_t ! -! Additional variables needed for truly horizontal diffusion (G. Zängl) +! Additional variables needed for truly horizontal diffusion (G. Z�ngl) ! Interpolation coefficients TYPE(TYPE_ZDIFFU_HALO2) :: XZDIFFU_HALO2 ! diff --git a/src/MNH/modd_elec_flash.f90 b/src/MNH/modd_elec_flash.f90 index b551df8ef..f0f43e341 100644 --- a/src/MNH/modd_elec_flash.f90 +++ b/src/MNH/modd_elec_flash.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -23,7 +23,7 @@ !! !! AUTHOR !! ------ -!! J.-P. Pinty *Laboratoire Aerologie* +!! J.-P. Pinty *Laboratoire Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_emis_pgdfields.f90 b/src/MNH/modd_emis_pgdfields.f90 index 2197bf3f0..b1320c62f 100644 --- a/src/MNH/modd_emis_pgdfields.f90 +++ b/src/MNH/modd_emis_pgdfields.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -31,7 +31,7 @@ !! !! AUTHOR !! ------ -!! D. Gazen *L.A.* +!! D. Gazen *L.A.* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_eol_kine_adr.f90 b/src/MNH/modd_eol_kine_adr.f90 index e10f891b8..3735eacc3 100644 --- a/src/MNH/modd_eol_kine_adr.f90 +++ b/src/MNH/modd_eol_kine_adr.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2018-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2018-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -48,7 +48,7 @@ REAL, DIMENSION(:,:,:), ALLOCATABLE :: XPOS_TELT_RG REAL, DIMENSION(:,:,:), ALLOCATABLE :: XPOS_TELT_RT ! Current tower element position, in tower frame REAL, DIMENSION(:,:), ALLOCATABLE :: XANGINI_TOW_RG ! Initial tower orientation in global ref frame -! Nacelle +! Nacelle REAL, DIMENSION(:,:), ALLOCATABLE :: XPOSINI_NACO_RT ! Initial nacelle position, in tower reference frame REAL, DIMENSION(:,:), ALLOCATABLE :: XPOS_NACO_RG ! Initial nacelle position, in global reference frame REAL, DIMENSION(:,:,:), ALLOCATABLE :: XPOS_NELT_RG ! Initial nacelle position, in global reference frame @@ -82,7 +82,7 @@ REAL, DIMENSION(:,:), ALLOCATABLE :: XSURF_APP_ELT ! Tower REAL, DIMENSION(:,:), ALLOCATABLE :: XTVEL_TOWO_RG ! Tower base translation velocity, in global reference frame REAL, DIMENSION(:,:,:), ALLOCATABLE :: XTVEL_TELT_RG ! Tower element velocity, in global reference frame -REAL, DIMENSION(:,:), ALLOCATABLE :: XRVEL_RT_RG ! RT/RG rotational velocity +REAL, DIMENSION(:,:), ALLOCATABLE :: XRVEL_RT_RG ! RT/RG rotational velocity ! Nacelle REAL, DIMENSION(:,:), ALLOCATABLE :: XTVEL_NACO_RT ! Nacelle base translation velocity, in tower reference frame diff --git a/src/MNH/modd_eol_kine_alm.f90 b/src/MNH/modd_eol_kine_alm.f90 index 4ee2d3a5d..10dbe7890 100644 --- a/src/MNH/modd_eol_kine_alm.f90 +++ b/src/MNH/modd_eol_kine_alm.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2018-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2018-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -47,7 +47,7 @@ REAL, DIMENSION(:,:,:), ALLOCATABLE :: XPOS_TELT_RG REAL, DIMENSION(:,:,:), ALLOCATABLE :: XPOS_TELT_RT ! Current tower element position, in tower frame REAL, DIMENSION(:,:), ALLOCATABLE :: XANGINI_TOW_RG ! Initial tower orientation in global ref frame -! Nacelle +! Nacelle REAL, DIMENSION(:,:), ALLOCATABLE :: XPOSINI_NACO_RT ! Initial nacelle position, in tower reference frame REAL, DIMENSION(:,:), ALLOCATABLE :: XPOS_NACO_RG ! Initial nacelle position, in global reference frame REAL, DIMENSION(:,:,:), ALLOCATABLE :: XPOS_NELT_RG ! Initial nacelle position, in global reference frame @@ -79,7 +79,7 @@ REAL, DIMENSION(:,:,:), ALLOCATABLE :: XSURF_ELT ! Tower REAL, DIMENSION(:,:), ALLOCATABLE :: XTVEL_TOWO_RG ! Tower base translation velocity, in global reference frame REAL, DIMENSION(:,:,:), ALLOCATABLE :: XTVEL_TELT_RG ! Tower element velocity, in global reference frame -REAL, DIMENSION(:,:), ALLOCATABLE :: XRVEL_RT_RG ! RT/RG rotational velocity +REAL, DIMENSION(:,:), ALLOCATABLE :: XRVEL_RT_RG ! RT/RG rotational velocity ! Nacelle REAL, DIMENSION(:,:), ALLOCATABLE :: XTVEL_NACO_RT ! Nacelle base translation velocity, in tower reference frame diff --git a/src/MNH/modd_fieldn.f90 b/src/MNH/modd_fieldn.f90 index 5073c5450..a5687459f 100644 --- a/src/MNH/modd_fieldn.f90 +++ b/src/MNH/modd_fieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_frc.f90 b/src/MNH/modd_frc.f90 index 91994b803..98ce64445 100644 --- a/src/MNH/modd_frc.f90 +++ b/src/MNH/modd_frc.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -34,7 +34,7 @@ !! !! AUTHOR !! ------ -!! Marc Georgelin Labo d'aerologie +!! Marc Georgelin Labo d'aerologie !! !! MODIFICATIONS !! ------------- @@ -64,10 +64,10 @@ TYPE (DATE_TIME), SAVE, DIMENSION(:), ALLOCATABLE :: TDTFRC ! date of ! each forcing profile ! REAL, SAVE, DIMENSION(:,:), ALLOCATABLE :: XUFRC, &! geostrophic wind - XVFRC, &! components U and V - XWFRC ! large scale vertical wind + XVFRC, &! components U and V + XWFRC ! large scale vertical wind REAL, SAVE, DIMENSION(:,:), ALLOCATABLE :: XTHFRC, &! large scale TH profile - XRVFRC ! large scale RV profile + XRVFRC ! large scale RV profile REAL, SAVE, DIMENSION(:,:), ALLOCATABLE :: XGXTHFRC,&! large scale TH gradient XGYTHFRC ! along the X and Y axis REAL, SAVE, DIMENSION(:,:), ALLOCATABLE :: XTENDTHFRC,&! large scale TH tendency @@ -87,7 +87,7 @@ LOGICAL, SAVE :: LGEOST_TH_FRC ! enables thermal wind advection LOGICAL, SAVE :: LTEND_THRV_FRC ! enables tendency forcing LOGICAL, SAVE :: LTEND_UV_FRC ! enables tendency forcing of the wind LOGICAL, SAVE :: LVERT_MOTION_FRC ! enables prescribed a forced vertical - ! transport for all prognostic variables + ! transport for all prognostic variables LOGICAL, SAVE :: LRELAX_THRV_FRC ! enables temp. and humidity relaxation LOGICAL, SAVE :: LRELAX_UV_FRC ! enables horizontal wind relaxation applied to the full wind field LOGICAL, SAVE :: LRELAX_UVMEAN_FRC ! enables horizontal wind relaxation applied to the horiz. avg. wind @@ -96,8 +96,8 @@ REAL, SAVE :: XRELAX_TIME_FRC ! e-folding time for relaxation REAL, SAVE :: XRELAX_HEIGHT_FRC ! height below which relaxation ! is never applied CHARACTER(len=4), SAVE :: CRELAX_HEIGHT_TYPE ! "THGR" relax. above maximal dTH/dz - ! (but always above XRELAX_HEIGHT_FRC) - ! "FIXE" relax. above XRELAX_HEIGHT_FRC + ! (but always above XRELAX_HEIGHT_FRC) + ! "FIXE" relax. above XRELAX_HEIGHT_FRC ! LOGICAL, SAVE :: LTRANS ! enables a Galilean translation of the ! domain of simulation diff --git a/src/MNH/modd_frcn.f90 b/src/MNH/modd_frcn.f90 index fc9c68362..cedff2155 100644 --- a/src/MNH/modd_frcn.f90 +++ b/src/MNH/modd_frcn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -23,7 +23,7 @@ !! !! AUTHOR !! ------ -!! V. Masson & C. Lac *Meteo France* +!! V. Masson & C. Lac *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_getn.f90 b/src/MNH/modd_getn.f90 index 5978b7c2f..a756f6e1a 100644 --- a/src/MNH/modd_getn.f90 +++ b/src/MNH/modd_getn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_gr_fieldn.f90 b/src/MNH/modd_gr_fieldn.f90 index f287396f4..1e9027dc1 100644 --- a/src/MNH/modd_gr_fieldn.f90 +++ b/src/MNH/modd_gr_fieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! S. Belair *Meteo France* +!! S. Belair *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_grid.f90 b/src/MNH/modd_grid.f90 index 089a08e1d..bad2f4726 100644 --- a/src/MNH/modd_grid.f90 +++ b/src/MNH/modd_grid.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,7 +32,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_gridn.f90 b/src/MNH/modd_gridn.f90 index c5fcc566b..c8626601a 100644 --- a/src/MNH/modd_gridn.f90 +++ b/src/MNH/modd_gridn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_ground_par.f90 b/src/MNH/modd_ground_par.f90 index 0ad7806de..cc7d8bfec 100644 --- a/src/MNH/modd_ground_par.f90 +++ b/src/MNH/modd_ground_par.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -33,7 +33,7 @@ !! !! AUTHOR !! ------ -!! S. Belair *Meteo France* +!! S. Belair *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_hurr_conf.f90 b/src/MNH/modd_hurr_conf.f90 index 2466c3b1a..1328e8781 100644 --- a/src/MNH/modd_hurr_conf.f90 +++ b/src/MNH/modd_hurr_conf.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2001-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2001-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -29,7 +29,7 @@ !! !! AUTHOR !! ------ -!! O. Nuissier * L.A * +!! O. Nuissier * L.A * !! R. Rogers * NOAA/AOML/HRD * !! !! MODIFICATIONS diff --git a/src/MNH/modd_ibm_lsf.f90 b/src/MNH/modd_ibm_lsf.f90 index 27dfa7d21..57a75ce56 100644 --- a/src/MNH/modd_ibm_lsf.f90 +++ b/src/MNH/modd_ibm_lsf.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2019-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2019-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -26,7 +26,7 @@ MODULE MODD_IBM_LSF !! !! AUTHOR !! ------ - !! Franck Auguste (CERFACS-AE) + !! Franck Auguste (CERFACS-AE) !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_ibm_paramn.f90 b/src/MNH/modd_ibm_paramn.f90 index 642abc204..77f6e0dc3 100644 --- a/src/MNH/modd_ibm_paramn.f90 +++ b/src/MNH/modd_ibm_paramn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2019-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2019-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -26,7 +26,7 @@ MODULE MODD_IBM_PARAM_n ! ! AUTHOR ! ------ - ! Franck Auguste (CERFACS-AE) + ! Franck Auguste (CERFACS-AE) ! ! MODIFICATIONS ! ------------- diff --git a/src/MNH/modd_ice_c1r3_descr.f90 b/src/MNH/modd_ice_c1r3_descr.f90 index 2a3de68e1..60859a04b 100644 --- a/src/MNH/modd_ice_c1r3_descr.f90 +++ b/src/MNH/modd_ice_c1r3_descr.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2000-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2000-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -40,7 +40,7 @@ !! !! AUTHOR !! ------ -!! J.-P. Pinty *Laboratoire d'Aerologie* +!! J.-P. Pinty *Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_ice_c1r3_param.f90 b/src/MNH/modd_ice_c1r3_param.f90 index 97c472e8a..742ba57b2 100644 --- a/src/MNH/modd_ice_c1r3_param.f90 +++ b/src/MNH/modd_ice_c1r3_param.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -16,7 +16,7 @@ !! extensively used in the C1R3 cold scheme. !! AUTHOR !! ------ -!! J.-P. Pinty *Laboratoire d'Aerologie* +!! J.-P. Pinty *Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- @@ -33,12 +33,12 @@ IMPLICIT NONE ! REAL,SAVE :: XFSEDRI,XFSEDCI, & ! Constants for sedimentation - XFSEDS, XEXSEDS, & ! fluxes of R and C for Ice, - XFSEDG, XEXSEDG ! of R for Snow and Graupel + XFSEDS, XEXSEDS, & ! fluxes of R and C for Ice, + XFSEDG, XEXSEDG ! of R for Snow and Graupel ! REAL,SAVE :: XNUC_DEP,XEXSI_DEP,XEX_DEP, & ! Constants for heterogeneous - XNUC_CON,XEXTT_CON,XEX_CON, & ! ice nucleation : DEP et CON - XMNU0 ! mass of nucleated ice crystal + XNUC_CON,XEXTT_CON,XEX_CON, & ! ice nucleation : DEP et CON + XMNU0 ! mass of nucleated ice crystal ! REAL,SAVE :: XRHOI_HONH,XCEXP_DIFVAP_HONH, & ! Constants for homogeneous XCOEF_DIFVAP_HONH,XRCOEF_HONH, & ! haze freezing : HHONI @@ -48,7 +48,7 @@ REAL,SAVE :: XRHOI_HONH,XCEXP_DIFVAP_HONH, & ! Constants for homogeneous XC1_HONH,XC2_HONH,XC3_HONH ! REAL,SAVE :: XC_HONC,XR_HONC, & ! Constants for homogeneous - XTEXP1_HONC,XTEXP2_HONC, & ! droplet freezing : CHONI + XTEXP1_HONC,XTEXP2_HONC, & ! droplet freezing : CHONI XTEXP3_HONC,XTEXP4_HONC, & XTEXP5_HONC ! @@ -63,9 +63,9 @@ REAL,SAVE :: XCSCNVI_MAX, XLBDASCNVI_MAX, & XR0DEPSI,XR1DEPSI ! pristine ice : SCNVI ! REAL,SAVE :: XSCFAC, & ! Constants for the Bergeron - X0DEPI,X2DEPI, & ! Findeisen process and + X0DEPI,X2DEPI, & ! Findeisen process and X0DEPS,X1DEPS,XEX0DEPS,XEX1DEPS, & ! deposition : DEP on S and - X0DEPG,X1DEPG,XEX0DEPG,XEX1DEPG ! on G + X0DEPG,X1DEPG,XEX0DEPG,XEX1DEPG ! on G ! REAL,SAVE :: XKER_ZRNIC_A1,XKER_ZRNIC_A2 ! Long-Zrnic Kernels ! @@ -78,24 +78,24 @@ REAL,SAVE :: XAUTO3, XAUTO4, & ! Constants for pristine ice XTEXAUTI ! REAL,SAVE :: XCOLEXIS, & ! Constants for snow - XAGGS_CLARGE1,XAGGS_CLARGE2, & ! aggregation : AGG + XAGGS_CLARGE1,XAGGS_CLARGE2, & ! aggregation : AGG XAGGS_RLARGE1,XAGGS_RLARGE2 ! REAL,SAVE :: XHMTMIN,XHMTMAX,XHM1,XHM2, & ! Constants for the XHM_YIELD,XHM_COLLCS,XHM_FACTS, & ! revised XHM_COLLCG,XHM_FACTG, & ! Hallett-Mossop process - XGAMINC_HMC_BOUND_MIN, & ! Min val. of Lbda_c for HMC - XGAMINC_HMC_BOUND_MAX, & ! Max val. of Lbda_c for HMC + XGAMINC_HMC_BOUND_MIN, & ! Min val. of Lbda_c for HMC + XGAMINC_HMC_BOUND_MAX, & ! Max val. of Lbda_c for HMC XHMSINTP1,XHMSINTP2, & ! (this is no more used !) XHMLINTP1,XHMLINTP2 ! REAL,SAVE :: XDCSLIM,XCOLCS, & ! Constants for the riming of - XEXCRIMSS,XCRIMSS, & ! the aggregates : RIM - XEXCRIMSG,XCRIMSG, & ! - XEXSRIMCG,XSRIMCG, & ! - XGAMINC_BOUND_MIN, & ! Min val. of Lbda_s for RIM - XGAMINC_BOUND_MAX, & ! Max val. of Lbda_s for RIM - XRIMINTP1,XRIMINTP2 ! Csts for lin. interpol. of + XEXCRIMSS,XCRIMSS, & ! the aggregates : RIM + XEXCRIMSG,XCRIMSG, & ! + XEXSRIMCG,XSRIMCG, & ! + XGAMINC_BOUND_MIN, & ! Min val. of Lbda_s for RIM + XGAMINC_BOUND_MAX, & ! Max val. of Lbda_s for RIM + XRIMINTP1,XRIMINTP2 ! Csts for lin. interpol. of ! the tab. incomplete Gamma law INTEGER,SAVE :: NGAMINC ! Number of tab. Lbda_s REAL, DIMENSION(:), SAVE, ALLOCATABLE & @@ -107,28 +107,28 @@ REAL,SAVE :: XFRACCSS, & ! Constants for the accretion XLBRACCS1,XLBRACCS2,XLBRACCS3, & ! raindrops onto the aggregates XFSACCRG, & ! ACC (processes RACCSS and XLBSACCR1,XLBSACCR2,XLBSACCR3, & ! SACCRG) - XACCLBDAS_MIN, & ! Min val. of Lbda_s for ACC - XACCLBDAS_MAX, & ! Max val. of Lbda_s for ACC - XACCLBDAR_MIN, & ! Min val. of Lbda_r for ACC - XACCLBDAR_MAX, & ! Max val. of Lbda_r for ACC - XACCINTP1S,XACCINTP2S, & ! Csts for bilin. interpol. of - XACCINTP1R,XACCINTP2R ! Lbda_s and Lbda_r in the - ! XKER_RACCSS and XKER_SACCRG - ! tables + XACCLBDAS_MIN, & ! Min val. of Lbda_s for ACC + XACCLBDAS_MAX, & ! Max val. of Lbda_s for ACC + XACCLBDAR_MIN, & ! Min val. of Lbda_r for ACC + XACCLBDAR_MAX, & ! Max val. of Lbda_r for ACC + XACCINTP1S,XACCINTP2S, & ! Csts for bilin. interpol. of + XACCINTP1R,XACCINTP2R ! Lbda_s and Lbda_r in the + ! XKER_RACCSS and XKER_SACCRG + ! tables INTEGER,SAVE :: NACCLBDAS, & ! Number of Lbda_s values and - NACCLBDAR ! of Lbda_r values in the - ! XKER_RACCSS and XKER_SACCRG - ! tables + NACCLBDAR ! of Lbda_r values in the + ! XKER_RACCSS and XKER_SACCRG + ! tables REAL,DIMENSION(:,:), SAVE, ALLOCATABLE & - :: XKER_RACCSS, & ! Normalized kernel for RACCSS - XKER_RACCS, & ! Normalized kernel for RACCS - XKER_SACCRG ! Normalized kernel for SACCRG + :: XKER_RACCSS, & ! Normalized kernel for RACCSS + XKER_RACCS, & ! Normalized kernel for RACCS + XKER_SACCRG ! Normalized kernel for SACCRG REAL,SAVE :: XFSCVMG ! Melting-conversion factor of ! the aggregates ! REAL,SAVE :: XCOLIR, & ! Constants for rain contact - XEXRCFRI,XRCFRI, & ! freezing : CFR - XEXICFRR,XICFRR ! + XEXRCFRI,XRCFRI, & ! freezing : CFR + XEXICFRR,XICFRR ! ! REAL,SAVE :: XFCDRYG, & ! Constants for the dry growth XCOLCG, & ! of the graupeln : @@ -138,23 +138,23 @@ REAL,SAVE :: XFCDRYG, & ! Constants for the dry growth XFRDRYG, & ! RSDRYG XLBRDRYG1,XLBRDRYG2,XLBRDRYG3, & ! RRDRYG XDRYLBDAR_MIN, & ! Min val. of Lbda_r for DRY - XDRYLBDAR_MAX, & ! Max val. of Lbda_r for DRY + XDRYLBDAR_MAX, & ! Max val. of Lbda_r for DRY XDRYLBDAS_MIN, & ! Min val. of Lbda_s for DRY - XDRYLBDAS_MAX, & ! Max val. of Lbda_s for DRY - XDRYLBDAG_MIN, & ! Min val. of Lbda_g for DRY - XDRYLBDAG_MAX, & ! Max val. of Lbda_g for DRY - XDRYINTP1R,XDRYINTP2R, & ! Csts for bilin. interpol. of - XDRYINTP1S,XDRYINTP2S, & ! Lbda_r, Lbda_s and Lbda_g in - XDRYINTP1G,XDRYINTP2G ! the XKER_SDRYG and XKER_RDRYG + XDRYLBDAS_MAX, & ! Max val. of Lbda_s for DRY + XDRYLBDAG_MIN, & ! Min val. of Lbda_g for DRY + XDRYLBDAG_MAX, & ! Max val. of Lbda_g for DRY + XDRYINTP1R,XDRYINTP2R, & ! Csts for bilin. interpol. of + XDRYINTP1S,XDRYINTP2S, & ! Lbda_r, Lbda_s and Lbda_g in + XDRYINTP1G,XDRYINTP2G ! the XKER_SDRYG and XKER_RDRYG ! tables INTEGER,SAVE :: NDRYLBDAR, & ! Number of Lbda_r, - NDRYLBDAS, & ! of Lbda_s and - NDRYLBDAG ! of Lbda_g values in - ! the XKER_SDRYG and XKER_RDRYG - ! tables + NDRYLBDAS, & ! of Lbda_s and + NDRYLBDAG ! of Lbda_g values in + ! the XKER_SDRYG and XKER_RDRYG + ! tables REAL,DIMENSION(:,:), SAVE, ALLOCATABLE & :: XKER_SDRYG, & ! Normalized kernel for SDRYG - XKER_RDRYG ! Normalized kernel for RDRYG + XKER_RDRYG ! Normalized kernel for RDRYG REAL,SAVE :: XCONCI_MAX ! Limitation of the pristine ! ice concentration (init and grid-nesting) REAL,SAVE :: XFREFFI ! Factor to compute the cloud ice effective radius diff --git a/src/MNH/modd_io_nam.f90 b/src/MNH/modd_io_nam.f90 index e5249d0d4..75eae2ab6 100644 --- a/src/MNH/modd_io_nam.f90 +++ b/src/MNH/modd_io_nam.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -22,7 +22,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_io_surf_mnh.f90 b/src/MNH/modd_io_surf_mnh.f90 index edb9bcb59..6fa2cc0ba 100644 --- a/src/MNH/modd_io_surf_mnh.f90 +++ b/src/MNH/modd_io_surf_mnh.f90 @@ -22,12 +22,12 @@ !! !! AUTHOR !! ------ -!! S.Malardel *Meteo France* +!! S.Malardel *Meteo France* !! !! MODIFICATIONS !! ------------- !! -!! M.Faivre 2014 +!! M.Faivre 2014 !! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O ! !* 0. DECLARATIONS diff --git a/src/MNH/modd_lbcn.f90 b/src/MNH/modd_lbcn.f90 index f85b29390..5435c8efa 100644 --- a/src/MNH/modd_lbcn.f90 +++ b/src/MNH/modd_lbcn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -25,7 +25,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq and J-P. Lafore *Meteo France* +!! V. Ducrocq and J-P. Lafore *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_lesn.f90 b/src/MNH/modd_lesn.f90 index 2d2009b06..fad841dd7 100644 --- a/src/MNH/modd_lesn.f90 +++ b/src/MNH/modd_lesn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! J. Cuxart *INM and Meteo France* +!! J. Cuxart *INM and Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_lg.f90 b/src/MNH/modd_lg.f90 index 80b567fac..8cdf56a49 100644 --- a/src/MNH/modd_lg.f90 +++ b/src/MNH/modd_lg.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2001-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2001-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -20,7 +20,7 @@ !! !! AUTHOR !! ------ -!! P. Jabouille *CNRM* +!! P. Jabouille *CNRM* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_lma_simulator.f90 b/src/MNH/modd_lma_simulator.f90 index 1fbca6376..888353f3a 100644 --- a/src/MNH/modd_lma_simulator.f90 +++ b/src/MNH/modd_lma_simulator.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2013-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2013-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -23,7 +23,7 @@ !! !! AUTHOR !! ------ -!! J.-P. Pinty *Laboratoire Aerologie* +!! J.-P. Pinty *Laboratoire Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_lunitn.f90 b/src/MNH/modd_lunitn.f90 index cee189b4b..6cf6df4a7 100644 --- a/src/MNH/modd_lunitn.f90 +++ b/src/MNH/modd_lunitn.f90 @@ -26,7 +26,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_mean_fieldn.f90 b/src/MNH/modd_mean_fieldn.f90 index 44f92e439..b6c1fd396 100644 --- a/src/MNH/modd_mean_fieldn.f90 +++ b/src/MNH/modd_mean_fieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2011-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2011-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -25,7 +25,7 @@ !! !! AUTHOR !! ------ -!! P.Aumond *Meteo France* +!! P.Aumond *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_metricsn.f90 b/src/MNH/modd_metricsn.f90 index 33cec104e..74eb6e1ce 100644 --- a/src/MNH/modd_metricsn.f90 +++ b/src/MNH/modd_metricsn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -30,7 +30,7 @@ !! !! AUTHOR !! ------ -!! P. Jabouille *Meteo France* +!! P. Jabouille *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_mnh2lpdm.f90 b/src/MNH/modd_mnh2lpdm.f90 index f09af209e..119e4141b 100644 --- a/src/MNH/modd_mnh2lpdm.f90 +++ b/src/MNH/modd_mnh2lpdm.f90 @@ -1,21 +1,21 @@ -!MNH_LIC Copyright 2002-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------- ! ######spl MODULE MODD_MNH2LPDM -! ################## +! ################## !----------------------------------------------------------------------------- -!* MODD_MNH2S2 : BORDEL MIMIESQUE, NO COMMENT. +!* MODD_MNH2S2 : BORDEL MIMIESQUE, NO COMMENT. ! -! Auteur : Michel Bouzom, DP/SERV/ENV -! Creation : 18.01.2002 +! Auteur : Michel Bouzom, DP/SERV/ENV +! Creation : 18.01.2002 !----------------------------------------------------------------------------- ! ! -!* FICHIERS ET NAMELISTS. -! ---------------------- +!* FICHIERS ET NAMELISTS. +! ---------------------- ! USE MODD_PARAMETERS, ONLY: NFILENAMELGTMAX ! @@ -38,15 +38,15 @@ NAMELIST/NAM_TURB/ CTURBPARAM ! ! ! -!* MESO-NH. -! -------- +!* MESO-NH. +! -------- ! -!* Dimensions et indices utiles Meso-NH. +!* Dimensions et indices utiles Meso-NH. ! INTEGER, SAVE :: NIU,NJU,NKU ! Taille des tableaux de travail. INTEGER, SAVE :: NIB,NIE,NJB,NJE,NKB,NKE ! Bornes du domaine physiques. ! -!* Champs Meso-NH a extraire. +!* Champs Meso-NH a extraire. ! REAL, DIMENSION(:,:,:),ALLOCATABLE :: XUT,XVT,XWT ! Vent. REAL, DIMENSION(:,:,:),ALLOCATABLE :: XTHT ! Tempe potentielle. @@ -64,8 +64,8 @@ REAL, DIMENSION(:,:,:),ALLOCATABLE :: XWPTHP ! flux de chaleur sensible ! w'theta' REAL, DIMENSION(:,:),ALLOCATABLE :: XZ0 ! -!* VARIABLES POUR FICHIER METEO. -! ----------------------------- +!* VARIABLES POUR FICHIER METEO. +! ----------------------------- ! INTEGER, SAVE :: NSIMAX,NSJMAX ! Dimensions du domaine a extraire. INTEGER, SAVE :: NSIB,NSIE,NSJB,NSJE ! Bornes du domaine a extraire. diff --git a/src/MNH/modd_nest_pgdn.f90 b/src/MNH/modd_nest_pgdn.f90 index bdda633b1..0d34552d4 100644 --- a/src/MNH/modd_nest_pgdn.f90 +++ b/src/MNH/modd_nest_pgdn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_nesting.f90 b/src/MNH/modd_nesting.f90 index d644d0260..293f10390 100644 --- a/src/MNH/modd_nesting.f90 +++ b/src/MNH/modd_nesting.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! J.P. Lafore *Meteo France* +!! J.P. Lafore *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_nudgingn.f90 b/src/MNH/modd_nudgingn.f90 index 2bdadfb0f..236ae9b22 100644 --- a/src/MNH/modd_nudgingn.f90 +++ b/src/MNH/modd_nudgingn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2006-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2006-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -22,7 +22,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_outn.f90 b/src/MNH/modd_outn.f90 index fbdf63e62..f14ebbd36 100644 --- a/src/MNH/modd_outn.f90 +++ b/src/MNH/modd_outn.f90 @@ -26,7 +26,7 @@ !! !! AUTHOR !! ------ -!! J.Stein *Meteo France* +!! J.Stein *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_pack_gr_fieldn.f90 b/src/MNH/modd_pack_gr_fieldn.f90 index 4fa5a880c..6bf3c8b96 100644 --- a/src/MNH/modd_pack_gr_fieldn.f90 +++ b/src/MNH/modd_pack_gr_fieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -33,7 +33,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_parameters.f90 b/src/MNH/modd_parameters.f90 index d8083f24c..5d7470cc3 100644 --- a/src/MNH/modd_parameters.f90 +++ b/src/MNH/modd_parameters.f90 @@ -25,7 +25,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_paramn.f90 b/src/MNH/modd_paramn.f90 index 4eb1ba87d..7f44488ed 100644 --- a/src/MNH/modd_paramn.f90 +++ b/src/MNH/modd_paramn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -25,7 +25,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_paspol.f90 b/src/MNH/modd_paspol.f90 index 9bffdd53d..192cf8f08 100644 --- a/src/MNH/modd_paspol.f90 +++ b/src/MNH/modd_paspol.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2001-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2001-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -7,12 +7,12 @@ MODULE MODD_PASPOL ! ################## !------------------------------------------------------------------------------- -!*** MODD_PASPOL Declaration of passive pollutants +!*** MODD_PASPOL Declaration of passive pollutants ! !! AUTHOR !! ------ -! : Michel Bouzom, DP/SERV/ENV -! Creation : 09.10.2001 +! : Michel Bouzom, DP/SERV/ENV +! Creation : 09.10.2001 ! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/modd_paspoln.f90 b/src/MNH/modd_paspoln.f90 index 15b972db7..8888c7f57 100644 --- a/src/MNH/modd_paspoln.f90 +++ b/src/MNH/modd_paspoln.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -8,13 +8,13 @@ MODULE MODD_PASPOL_n ! #################### !------------------------------------------------------------------------------- -!*** MODD_PASPOL_n Declaration of passive pollutant global variables +!*** MODD_PASPOL_n Declaration of passive pollutant global variables ! !! AUTHOR !! ------ ! -! : Michel Bouzom, DP/SERV/ENV -! Creation : 09.10.2001 +! : Michel Bouzom, DP/SERV/ENV +! Creation : 09.10.2001 ! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/modd_past_fieldn.f90 b/src/MNH/modd_past_fieldn.f90 index 1362b0ae0..e41838219 100644 --- a/src/MNH/modd_past_fieldn.f90 +++ b/src/MNH/modd_past_fieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2013-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_pgddim.f90 b/src/MNH/modd_pgddim.f90 index eb023e1ba..e416846c8 100644 --- a/src/MNH/modd_pgddim.f90 +++ b/src/MNH/modd_pgddim.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -30,7 +30,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_pgdfields.f90 b/src/MNH/modd_pgdfields.f90 index 8d6197d24..437f372b1 100644 --- a/src/MNH/modd_pgdfields.f90 +++ b/src/MNH/modd_pgdfields.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -31,7 +31,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_pgdgrid.f90 b/src/MNH/modd_pgdgrid.f90 index 03150e9c0..a526b1198 100644 --- a/src/MNH/modd_pgdgrid.f90 +++ b/src/MNH/modd_pgdgrid.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,7 +32,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_pgdsilwork.f90 b/src/MNH/modd_pgdsilwork.f90 index 94f569238..92ea948d0 100644 --- a/src/MNH/modd_pgdsilwork.f90 +++ b/src/MNH/modd_pgdsilwork.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_pgdssowork.f90 b/src/MNH/modd_pgdssowork.f90 index 865981360..41e57afc6 100644 --- a/src/MNH/modd_pgdssowork.f90 +++ b/src/MNH/modd_pgdssowork.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_pgdz0dwork.f90 b/src/MNH/modd_pgdz0dwork.f90 index b5f7b1647..ac7fb6b97 100644 --- a/src/MNH/modd_pgdz0dwork.f90 +++ b/src/MNH/modd_pgdz0dwork.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_profilern.f90 b/src/MNH/modd_profilern.f90 index 96b70fb2e..838c5b684 100644 --- a/src/MNH/modd_profilern.f90 +++ b/src/MNH/modd_profilern.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -24,7 +24,7 @@ !! !! AUTHOR !! ------ -!! P. Tulet *Meteo France* +!! P. Tulet *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_radar.f90 b/src/MNH/modd_radar.f90 index f66b0d2f6..cdcf49d26 100644 --- a/src/MNH/modd_radar.f90 +++ b/src/MNH/modd_radar.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -22,7 +22,7 @@ !! !! AUTHOR !! ------ -!! O. Caumont & V. Ducrocq * Meteo France * +!! O. Caumont & V. Ducrocq * Meteo France * !! !! !! MODIFICATIONS diff --git a/src/MNH/modd_radiationsn.f90 b/src/MNH/modd_radiationsn.f90 index 4cac01d2d..aa6146db0 100644 --- a/src/MNH/modd_radiationsn.f90 +++ b/src/MNH/modd_radiationsn.f90 @@ -52,9 +52,9 @@ TYPE RADIATIONS_t ! ! INTEGER :: NDLON ! number of columns where the radiation - ! calculations are performed + ! calculations are performed INTEGER :: NFLEV ! number of vertical levels where the radiation - ! calculations are performed + ! calculations are performed INTEGER :: NFLUX ! number of top and ground fluxes in the output INTEGER :: NRAD ! number of satellite radiances to synthesize INTEGER :: NAER ! number od AERosol classes @@ -67,7 +67,7 @@ TYPE RADIATIONS_t INTEGER :: NSWB_MNH! number of SW bands practically used (14 if ECRAD, NSWB if original code) INTEGER :: NLWB_MNH! number of LW bands practically used (16 if RRTM) INTEGER :: NSTATM ! index od the STAndard ATMosphere level just above - ! the model top + ! the model top ! INTEGER, DIMENSION(:,:), POINTER :: NCLEARCOL_TM1=>NULL() ! trace of cloud/clear columns at ! the previous radiation time step ! (to be replaced by a logical array when fmread-writ could treat this kind of data) diff --git a/src/MNH/modd_recycl_paramn.f90 b/src/MNH/modd_recycl_paramn.f90 index 52872ad2a..6faec662d 100644 --- a/src/MNH/modd_recycl_paramn.f90 +++ b/src/MNH/modd_recycl_paramn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2021-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2021-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -26,7 +26,7 @@ ! ! AUTHOR ! ------ -! Tim Nagel (Meteo-France) +! Tim Nagel (Meteo-France) ! ! MODIFICATIONS ! ------------- diff --git a/src/MNH/modd_ref.f90 b/src/MNH/modd_ref.f90 index 3d1e6025b..7f6b39235 100644 --- a/src/MNH/modd_ref.f90 +++ b/src/MNH/modd_ref.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_refn.f90 b/src/MNH/modd_refn.f90 index 32c06096c..a9db2fff2 100644 --- a/src/MNH/modd_refn.f90 +++ b/src/MNH/modd_refn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_relfrcn.f90 b/src/MNH/modd_relfrcn.f90 index a7e612115..1fb5b3214 100644 --- a/src/MNH/modd_relfrcn.f90 +++ b/src/MNH/modd_relfrcn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -25,7 +25,7 @@ !! !! AUTHOR !! ------ -!! P. Peyrille from modd_frc +!! P. Peyrille from modd_frc !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_secpgd_fieldn.f90 b/src/MNH/modd_secpgd_fieldn.f90 index 4c304a173..1d31d9a83 100644 --- a/src/MNH/modd_secpgd_fieldn.f90 +++ b/src/MNH/modd_secpgd_fieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! V. Masson +!! V. Masson !! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/modd_spawn.f90 b/src/MNH/modd_spawn.f90 index 2fa01ed4e..25b19089f 100644 --- a/src/MNH/modd_spawn.f90 +++ b/src/MNH/modd_spawn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1999-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1999-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -26,7 +26,7 @@ !! !! AUTHOR !! ------ -!! P. Jabouille *Meteo France* +!! P. Jabouille *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_splineswork.f90 b/src/MNH/modd_splineswork.f90 index 6ac5fd04d..cd6feeb30 100644 --- a/src/MNH/modd_splineswork.f90 +++ b/src/MNH/modd_splineswork.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_stand_atm.f90 b/src/MNH/modd_stand_atm.f90 index e42aae611..232758646 100644 --- a/src/MNH/modd_stand_atm.f90 +++ b/src/MNH/modd_stand_atm.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -45,14 +45,10 @@ IMPLICIT NONE ! REAL, DIMENSION(:,:), ALLOCATABLE :: XSTROATM ! Standard tropical atmosphere -REAL, DIMENSION(:,:), ALLOCATABLE :: XSMLSATM ! Standard summer atmosphere - ! in the mid-latitudes -REAL, DIMENSION(:,:), ALLOCATABLE :: XSMLWATM ! Standard winter atmosphere - ! in the mid-latitudes -REAL, DIMENSION(:,:), ALLOCATABLE :: XSPOSATM ! Standard summer atmosphere - ! above the polar circles -REAL, DIMENSION(:,:), ALLOCATABLE :: XSPOWATM ! Standard winter atmosphere - ! above the polar circles +REAL, DIMENSION(:,:), ALLOCATABLE :: XSMLSATM ! Standard summer atmosphere in the mid-latitudes +REAL, DIMENSION(:,:), ALLOCATABLE :: XSMLWATM ! Standard winter atmosphere in the mid-latitudes +REAL, DIMENSION(:,:), ALLOCATABLE :: XSPOSATM ! Standard summer atmosphere above the polar circles +REAL, DIMENSION(:,:), ALLOCATABLE :: XSPOWATM ! Standard winter atmosphere above the polar circles ! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/modd_stationn.f90 b/src/MNH/modd_stationn.f90 index 63d8aac03..753083988 100644 --- a/src/MNH/modd_stationn.f90 +++ b/src/MNH/modd_stationn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -24,7 +24,7 @@ !! !! AUTHOR !! ------ -!! P. Tulet *Meteo France* +!! P. Tulet *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_sub_elecn.f90 b/src/MNH/modd_sub_elecn.f90 index 1f5b6b940..d8760983f 100644 --- a/src/MNH/modd_sub_elecn.f90 +++ b/src/MNH/modd_sub_elecn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2011-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2011-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -22,7 +22,7 @@ !! !! AUTHOR !! ------ -!! C.Barthe, C.Lac *Meteo France* +!! C.Barthe, C.Lac *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_sub_paspoln.f90 b/src/MNH/modd_sub_paspoln.f90 index 0d06e8bef..c15927670 100644 --- a/src/MNH/modd_sub_paspoln.f90 +++ b/src/MNH/modd_sub_paspoln.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -29,7 +29,7 @@ !! !! AUTHOR !! ------ -!! C. Lac *Meteo France* +!! C. Lac *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_time.f90 b/src/MNH/modd_time.f90 index b1752e05b..73bcb8d11 100644 --- a/src/MNH/modd_time.f90 +++ b/src/MNH/modd_time.f90 @@ -25,7 +25,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_timen.f90 b/src/MNH/modd_timen.f90 index a75c3363a..e063f32e0 100644 --- a/src/MNH/modd_timen.f90 +++ b/src/MNH/modd_timen.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -25,7 +25,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_type_date.f90 b/src/MNH/modd_type_date.f90 index 31b67ef89..4a5a62b7d 100644 --- a/src/MNH/modd_type_date.f90 +++ b/src/MNH/modd_type_date.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1997-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1997-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -25,7 +25,7 @@ module modd_type_date !! !! AUTHOR !! ------ -!! P. Jabouille *Meteo France* +!! P. Jabouille *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_type_statprof.f90 b/src/MNH/modd_type_statprof.f90 index 0e7b81bb0..1e85955fe 100644 --- a/src/MNH/modd_type_statprof.f90 +++ b/src/MNH/modd_type_statprof.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -24,7 +24,7 @@ !! !! AUTHOR !! ------ -!! P. Tulet *Meteo France* +!! P. Tulet *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modd_unifacparam.f90 b/src/MNH/modd_unifacparam.f90 index 81ae9ca3b..8149e2618 100644 --- a/src/MNH/modd_unifacparam.f90 +++ b/src/MNH/modd_unifacparam.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,7 +32,7 @@ MODULE MODD_UNIFACPARAM ! in order to pass them properly into the Fortran unifac routine. ! !revision History: 1. Developed by Betty Pun, AER, December, 1999 -! under CARB funding +! under CARB funding ! !************************************************************************** ! diff --git a/src/MNH/modd_vegn.f90 b/src/MNH/modd_vegn.f90 index 8372fbbd4..68903ccbd 100644 --- a/src/MNH/modd_vegn.f90 +++ b/src/MNH/modd_vegn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,7 +32,7 @@ !! !! AUTHOR !! ------ -!! P. Aumond *Meteo France* +!! P. Aumond *Meteo France* !! !------------------------------------------------------------------------------- ! diff --git a/src/MNH/modd_ver_interp_lin.f90 b/src/MNH/modd_ver_interp_lin.f90 index 23bea6932..1237f501f 100644 --- a/src/MNH/modd_ver_interp_lin.f90 +++ b/src/MNH/modd_ver_interp_lin.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -30,7 +30,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mode_RBK90_Integrator.f90 b/src/MNH/mode_RBK90_Integrator.f90 index 536726def..1a0a93de6 100644 --- a/src/MNH/mode_RBK90_Integrator.f90 +++ b/src/MNH/mode_RBK90_Integrator.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -119,8 +119,8 @@ REAL, INTENT(IN) :: RTOL(NSPECIES) RSTATUS(:) = 0.0 !JPP !~~~> fine-tune the integrator: -!JPP ICNTRL(1) = 0 ! 0 - non-autonomous, 1 - autonomous -!JPP ICNTRL(2) = 0 ! 0 - vector tolerances, 1 - scalars +!JPP ICNTRL(1) = 0 ! 0 - non-autonomous, 1 - autonomous +!JPP ICNTRL(2) = 0 ! 0 - vector tolerances, 1 - scalars ! If optional parameters are given, and if they are >0, ! then they overwrite default settings. diff --git a/src/MNH/mode_RBK90_linearalgebra.f90 b/src/MNH/mode_RBK90_linearalgebra.f90 index de787d50d..2cf489b1b 100644 --- a/src/MNH/mode_RBK90_linearalgebra.f90 +++ b/src/MNH/mode_RBK90_linearalgebra.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -219,17 +219,17 @@ SUBROUTINE KppSolveTRIndirect( JVS, X ) DO i=1,NVAR X(i) = X(i)/JVS(LU_DIAG(i)) - ! subtract all nonzero elements in row i of JVS from X + ! subtract all nonzero elements in row i of JVS from X DO j=LU_DIAG(i)+1,LU_CROW(i+1)-1 - X(LU_ICOL(j)) = X(LU_ICOL(j))-JVS(j)*X(i) - END DO + X(LU_ICOL(j)) = X(LU_ICOL(j))-JVS(j)*X(i) + END DO END DO DO i=NVAR, 1, -1 - ! subtract all nonzero elements in row i of JVS from X + ! subtract all nonzero elements in row i of JVS from X DO j=LU_CROW(i),LU_DIAG(i)-1 - X(LU_ICOL(j)) = X(LU_ICOL(j))-JVS(j)*X(i) - END DO + X(LU_ICOL(j)) = X(LU_ICOL(j))-JVS(j)*X(i) + END DO END DO END SUBROUTINE KppSolveTRIndirect @@ -311,17 +311,17 @@ SUBROUTINE KppSolveTRCmplx( JVS, X ) DO i=1,NVAR X(i) = X(i)/JVS(LU_DIAG(i)) - ! subtract all nonzero elements in row i of JVS from X + ! subtract all nonzero elements in row i of JVS from X DO j=LU_DIAG(i)+1,LU_CROW(i+1)-1 - X(LU_ICOL(j)) = X(LU_ICOL(j))-JVS(j)*X(i) - END DO + X(LU_ICOL(j)) = X(LU_ICOL(j))-JVS(j)*X(i) + END DO END DO DO i=NVAR, 1, -1 - ! subtract all nonzero elements in row i of JVS from X + ! subtract all nonzero elements in row i of JVS from X DO j=LU_CROW(i),LU_DIAG(i)-1 - X(LU_ICOL(j)) = X(LU_ICOL(j))-JVS(j)*X(i) - END DO + X(LU_ICOL(j)) = X(LU_ICOL(j))-JVS(j)*X(i) + END DO END DO END SUBROUTINE KppSolveTRCmplx @@ -344,19 +344,19 @@ SUBROUTINE KppSolveTRCmplxR( JVSR, JVSI, XR, XI ) den = JVSR(LU_DIAG(i))**2 + JVSI(LU_DIAG(i))**2 XR(i) = (XR(i)*JVSR(LU_DIAG(i)) + XI(i)*JVSI(LU_DIAG(i)))/den XI(i) = (XI(i)*JVSR(LU_DIAG(i)) - XR(i)*JVSI(LU_DIAG(i)))/den - ! subtract all nonzero elements in row i of JVS from X + ! subtract all nonzero elements in row i of JVS from X DO j=LU_DIAG(i)+1,LU_CROW(i+1)-1 - XR(LU_ICOL(j)) = XR(LU_ICOL(j))-(JVSR(j)*XR(i) - JVSI(j)*XI(i)) - XI(LU_ICOL(j)) = XI(LU_ICOL(j))-(JVSI(j)*XR(i) + JVSR(j)*XI(i)) - END DO + XR(LU_ICOL(j)) = XR(LU_ICOL(j))-(JVSR(j)*XR(i) - JVSI(j)*XI(i)) + XI(LU_ICOL(j)) = XI(LU_ICOL(j))-(JVSI(j)*XR(i) + JVSR(j)*XI(i)) + END DO END DO DO i=NVAR, 1, -1 - ! subtract all nonzero elements in row i of JVS from X + ! subtract all nonzero elements in row i of JVS from X DO j=LU_CROW(i),LU_DIAG(i)-1 - XR(LU_ICOL(j)) = XR(LU_ICOL(j))-(JVSR(j)*XR(i) - JVSI(j)*XI(i)) - XI(LU_ICOL(j)) = XI(LU_ICOL(j))-(JVSI(j)*XR(i) + JVSR(j)*XI(i)) - END DO + XR(LU_ICOL(j)) = XR(LU_ICOL(j))-(JVSR(j)*XR(i) - JVSI(j)*XI(i)) + XI(LU_ICOL(j)) = XI(LU_ICOL(j))-(JVSI(j)*XR(i) + JVSR(j)*XI(i)) + END DO END DO END SUBROUTINE KppSolveTRCmplxR @@ -436,7 +436,7 @@ END SUBROUTINE KppSolveTRCmplxR ! !X(1:3,i) = X(1:3,i) - MATMUL(JVS(1:3,1:3,j),X(1:3,LU_ICOL(j))); ! DO k=1,3 ! DO m=1,3 -! X(k,i) = X(k,i) - JVS(k,m,j)*X(m,LU_ICOL(j)) +! X(k,i) = X(k,i) - JVS(k,m,j)*X(m,LU_ICOL(j)) ! END DO ! END DO ! END DO @@ -448,7 +448,7 @@ END SUBROUTINE KppSolveTRCmplxR ! !sum(1:3) = sum(1:3) - MATMUL(JVS(1:3,1:3,j),X(1:3,LU_ICOL(j))); ! DO k=1,3 ! DO m=1,3 -! sum(k) = sum(k) - JVS(k,m,j)*X(m,LU_ICOL(j)) +! sum(k) = sum(k) - JVS(k,m,j)*X(m,LU_ICOL(j)) ! END DO ! END DO ! END DO @@ -478,26 +478,26 @@ END SUBROUTINE KppSolveTRCmplxR ! ! X(i) = X(i)/JVS(LU_DIAG(i)) ! CALL SOL3('T',JVS(1,1,LU_DIAG(i)),IP(1,i),X(1,i)) ! DO j=LU_DIAG(i)+1,LU_CROW(i+1)-1 -! !X(1:3,LU_ICOL(j)) = X(1:3,LU_ICOL(j)) & +! !X(1:3,LU_ICOL(j)) = X(1:3,LU_ICOL(j)) & ! ! - MATMUL( TRANSPOSE(JVS(1:3,1:3,j)), X(1:3,i) ) ! DO k=1,3 ! DO m=1,3 -! X(k,LU_ICOL(j)) = X(k,LU_ICOL(j)) - JVS(m,k,j)*X(m,i) +! X(k,LU_ICOL(j)) = X(k,LU_ICOL(j)) - JVS(m,k,j)*X(m,i) ! END DO ! END DO -! END DO +! END DO ! END DO ! ! DO i=NVAR, 1, -1 ! DO j=LU_CROW(i),LU_DIAG(i)-1 -! !X(1:3,LU_ICOL(j)) = X(1:3,LU_ICOL(j)) & +! !X(1:3,LU_ICOL(j)) = X(1:3,LU_ICOL(j)) & ! ! - MATMUL( TRANSPOSE(JVS(1:3,1:3,j)), X(1:3,i) ) ! DO k=1,3 ! DO m=1,3 -! X(k,LU_ICOL(j)) = X(k,LU_ICOL(j)) - JVS(m,k,j)*X(m,i) +! X(k,LU_ICOL(j)) = X(k,LU_ICOL(j)) - JVS(m,k,j)*X(m,i) ! END DO ! END DO -! END DO +! END DO ! END DO ! !END SUBROUTINE KppSolveBigTR diff --git a/src/MNH/mode_amain.f90 b/src/MNH/mode_amain.f90 index 865b7726f..ac2f5e8d2 100644 --- a/src/MNH/mode_amain.f90 +++ b/src/MNH/mode_amain.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -29,36 +29,36 @@ CONTAINS !*********************************************************************** !Purpose: Starting point of Type A routine. Performs 2 functions: (1) ! gas/particle partition of organic compounds based on available -! water or saturation, (2) calculate water associated with organic -! solutes, (3) calculate total organic anion concnetrations, +! water or saturation, (2) calculate water associated with organic +! solutes, (3) calculate total organic anion concnetrations, ! !Arguments: 1. *aero: initial guesses of Ai in same units as inputs ug/m3 -! also contain final output from newt +! also contain final output from newt ! 2. *aeros: solid concentrations (also used to temporarily store ! input PM concentrations in LWC = 0 absorption case with -! no newton, and PM from absorption before water is added) +! no newton, and PM from absorption before water is added) ! -!Return: 1. deltaLWC is the output for water associated with the organics -! in microgram/m3 air +!Return: 1. deltaLWC is the output for water associated with the organics +! in microgram/m3 air ! !Data Needed: -! Input read in main and passed unsing global variables -! totA[i] (ug/m3 air), acHP (mole/kg water), +! Input read in main and passed unsing global variables +! totA[i] (ug/m3 air), acHP (mole/kg water), ! LWC (ug/m3 air), RH (between 0 and 1), temperature (K) ! -! Parameters: NK = no. of eq. relationship for each solute -! K = partition parameters H and K -! Ai, Gi, W in ug per m3 air units +! Parameters: NK = no. of eq. relationship for each solute +! K = partition parameters H and K +! Ai, Gi, W in ug per m3 air units ! gamma in mole fraction units, change reference -! state to Henry's law -! {H+} in moles per kg solvent, -! MW = Molecular weights in the order defined below -! borrowing MW[0] to store MW(water) -! DRH = deliquescence humidities for molecules -! (still need data) -! VP = vapor pressure in units of mass (ug) per m3 air -! pure liquid-gas partitioning: -! (1) deliquescent species +! state to Henry's law +! {H+} in moles per kg solvent, +! MW = Molecular weights in the order defined below +! borrowing MW[0] to store MW(water) +! DRH = deliquescence humidities for molecules +! (still need data) +! VP = vapor pressure in units of mass (ug) per m3 air +! pure liquid-gas partitioning: +! (1) deliquescent species ! (2) input LWC = 0 from inorganic species 5-29-99 !Notes: ! Molecules (6) @@ -94,7 +94,7 @@ CONTAINS ! 2. LWC = 0 (option 1, saturation) ! A) RH > DRH[i] ! (i) totA > VP - gas phase = VP -! - aq phase molecules only = totA[i] - VP[i] +! - aq phase molecules only = totA[i] - VP[i] ! (ii) totA < VP - gas phase only ! B) RH < DRH[i] ! (i) totA > VP - gas phase = VP @@ -107,30 +107,30 @@ CONTAINS ! !Revisions: 1. Developed by Betty Pun, AER, Jan 99 under EPRI for prototype ! Type A module with 2 compounds: malic acid and glyoxalic acid -! using newt, the globally convergent multi-dimensional -! Newton's method to solve the non-linear simultaneous equations. +! using newt, the globally convergent multi-dimensional +! Newton's method to solve the non-linear simultaneous equations. ! NR convension index 1 .. n; most arrays run from 1 to NSP+1 ! -! 2. Added code May 99 to deal with LWC input = 0 -! calculate gas-PM partition based on VPsat -! calculate water associated with organics (H2M RH < DRH) -! -! 3. Under CARB funding, modified code October 99 to -! perform the partition of 6 compounds. Removed hard-wired +! 2. Added code May 99 to deal with LWC input = 0 +! calculate gas-PM partition based on VPsat +! calculate water associated with organics (H2M RH < DRH) +! +! 3. Under CARB funding, modified code October 99 to +! perform the partition of 6 compounds. Removed hard-wired ! code regarding equations solved -! -! 4. Modified to comply with Models-3 coding standard, Betty Pun, -! AER, November 99 +! +! 4. Modified to comply with Models-3 coding standard, Betty Pun, +! AER, November 99 ! -! 5. Included flag to solve for water content based on ZSR with -! binary solution characteristics stored in file. +! 5. Included flag to solve for water content based on ZSR with +! binary solution characteristics stored in file. ! -! 6. Combine Type A and B, Betty Pun Apr 00 -! 6a. bkp 6/00 change criteria to deal with low LWC cases: -! old criteria was: -! if ((NK[i] >= 2) && (K[jeq]/acHP > Critsol)) { -! 7. Add option to do absorption when LWC = 0 11/00 -! 8. For 3-D, add option to solve absorption based on fixed PM +! 6. Combine Type A and B, Betty Pun Apr 00 +! 6a. bkp 6/00 change criteria to deal with low LWC cases: +! old criteria was: +! if ((NK[i] >= 2) && (K[jeq]/acHP > Critsol)) { +! 7. Add option to do absorption when LWC = 0 11/00 +! 8. For 3-D, add option to solve absorption based on fixed PM !****************************************************************************/ @@ -342,10 +342,10 @@ CONTAINS ! arguments: tot total amount (microgram/m3 air) of compound ! vp vapor pressure (microgram/m3 air) of compound ! *pmconc pointer to output of particulate-phase concentration - ! *gasconc pointer to output of gas-phase concentration + ! *gasconc pointer to output of gas-phase concentration ! history: 1. coded 11/28/00 BKP to replace code in 2 locations: ! - LWC > 0 and RH < DRH - ! - LWC = 0 any RH + ! - LWC = 0 any RH ! !****************************************************************/ diff --git a/src/MNH/mode_arf.f90 b/src/MNH/mode_arf.f90 index d3e43ae18..cb7c80c9b 100644 --- a/src/MNH/mode_arf.f90 +++ b/src/MNH/mode_arf.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -31,8 +31,8 @@ !! internal circulation and shape of water drops falling at terminal velocity in !! air. Quart. J. Roy. Meteor. Soc., 96, 247-256. !! -!! Brandes, E. A., G. Zhang, J. Vivekanandan, 2002: Experiments in Rainfall Estimation -!! with a Polarimetric Radar in a Subtropical Environment. J. Appl. Met., 41, 674-685 +!! Brandes, E. A., G. Zhang, J. Vivekanandan, 2002: Experiments in Rainfall Estimation +!! with a Polarimetric Radar in a Subtropical Environment. J. Appl. Met., 41, 674-685 !! !! !! AUTHOR diff --git a/src/MNH/mode_blowsnow_sedim_lkt.f90 b/src/MNH/mode_blowsnow_sedim_lkt.f90 index 3279c46c8..6bdb46dfb 100644 --- a/src/MNH/mode_blowsnow_sedim_lkt.f90 +++ b/src/MNH/mode_blowsnow_sedim_lkt.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -11,9 +11,9 @@ !! PURPOSE !! ------- !! Contains look up tables for settling velocity of drifitng snow particles -!! The parameters to be looked up are: -!! 1) Number-averaged settling velocity -!! 2) Mass-averaged settling velocity +!! The parameters to be looked up are: +!! 1) Number-averaged settling velocity +!! 2) Mass-averaged settling velocity !! They depend on the average radius and the pressure (interpolation) !! !! AUTHOR diff --git a/src/MNH/mode_gridcart.f90 b/src/MNH/mode_gridcart.f90 index 552bc71ce..51b5d3101 100644 --- a/src/MNH/mode_gridcart.f90 +++ b/src/MNH/mode_gridcart.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -89,7 +89,7 @@ CONTAINS !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mode_readtmat.f90 b/src/MNH/mode_readtmat.f90 index afd2fb450..d3628ee1e 100644 --- a/src/MNH/mode_readtmat.f90 +++ b/src/MNH/mode_readtmat.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -46,13 +46,13 @@ !! !! ----- MY_MODIF 5 ------ !! C. Augros 12/12/2012 -!! SUBROUTINE READTMAT(PLAM_RAD,PELEV_RAD,PT,Dm,RES11,IMS11,& +!! SUBROUTINE READTMAT(PLAM_RAD,PELEV_RAD,PT,Dm,RES11,IMS11,& !! RES22,IMS22,RES11f,IMS11f,RES22f,IMS22f) instead of -!! SUBROUTINE READTMAT(PLAM_RAD,PELEV_RAD,PT,Dm,S11,S22,S11f,S22f) +!! SUBROUTINE READTMAT(PLAM_RAD,PELEV_RAD,PT,Dm,S11,S22,S11f,S22f) !! !! ----- MY_MODIF 6 ------ !! C. Augros 13/12/2012 -!! add of : +!! add of : !! SUBROUTINE READTMATINT(PLAM_RAD,PELEV_RAD,PT,M,PS11_CARRE,PS22_CARRE,& !! S22S11,PRE_S22FMS11F,PIM_S22FT,PIM_S11FT) !! read the 2nd Tmat table with the PS11_CARRE, PS22_CARRE... integrated @@ -67,12 +67,12 @@ !! ----- MY_MODIF 12 ------ !! C. Augros 13/12/2012 !! -!! SUBROUTINE CALC_KTMAT(PLAM_RAD,PELEV_RAD,PT,M,PLAM_MIN,PLAM_MAX,PLAM_STEP,& -!! PELEV_MIN,PELEV_MAX,PELEV_STEP,PTC_MIN,PTC_MAX,PTC_STEP,& -!! KTMAT,PLAM_RED,PELEV_RED,PTC_RED,PM_RED)!! -!! => calcul des positions dans la table Tmat (ktmat) des coefficients à interpoler -!! et des variables réduites qui traduisent la position entre 0 et 1 de ZLAM, ZELEV, -!! ZTC et M par rapport aux bornes sup et inf +!! SUBROUTINE CALC_KTMAT(PLAM_RAD,PELEV_RAD,PT,M,PLAM_MIN,PLAM_MAX,PLAM_STEP,& +!! PELEV_MIN,PELEV_MAX,PELEV_STEP,PTC_MIN,PTC_MAX,PTC_STEP,& +!! KTMAT,PLAM_RED,PELEV_RED,PTC_RED,PM_RED)!! +!! => calcul des positions dans la table Tmat (ktmat) des coefficients à interpoler +!! et des variables réduites qui traduisent la position entre 0 et 1 de ZLAM, ZELEV, +!! ZTC et M par rapport aux bornes sup et inf !! !! ------------ MY_MODIF 13 ------ !! C. Augros 6/02/2014 @@ -328,7 +328,7 @@ REAL,DIMENSION(7) :: ZVECT_COEF !vecteur contenant tous les coef interpolés: RE !bornes inf et sup ! si on ne se trouve pas exactement sur une des bornes !IF ((ZELEV_SUP/=ZELEV_INF) .OR. (ZTC_SUP/=ZTC_INF) .OR. (ZM_SUP/=ZM_INF)) THEN -! WRITE(0,*) "IF ( (ZELEV_SUP/=ZELEV_INF) .OR. (ZTC_SUP/=ZTC_INF) .OR. (ZM_SUP/=ZM_INF))" +! WRITE(0,*) "IF ( (ZELEV_SUP/=ZELEV_INF) .OR. (ZTC_SUP/=ZTC_INF) .OR. (ZM_SUP/=ZM_INF))" !ENDIF !--- Interpolation linéaire --- diff --git a/src/MNH/mode_time.f90 b/src/MNH/mode_time.f90 index 86b9dbadb..c90914b23 100644 --- a/src/MNH/mode_time.f90 +++ b/src/MNH/mode_time.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -28,7 +28,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -81,7 +81,7 @@ CONTAINS !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/mode_typea.f90 b/src/MNH/mode_typea.f90 index efbba7162..33eec00c0 100644 --- a/src/MNH/mode_typea.f90 +++ b/src/MNH/mode_typea.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,16 +32,16 @@ module mode_typea !Subroutines called: !unidriver and partition !(unidriver is always called with all 7 molecules that may be present) - ! + ! !Revisions: 1. Developed by Betty Pun, AER, Jan 99, under EPRI funding for ! prototype SOA module with 2 condensable compounds (malic acid, - ! glyoxalic acid) and water + ! glyoxalic acid) and water ! - ! 2. Modified November 99 to accept 6 model compounds + water under - ! CARB funding (for the list of condensables see main) + ! 2. Modified November 99 to accept 6 model compounds + water under + ! CARB funding (for the list of condensables see main) ! - ! 3. Modified treatment of negative test concentrations so that - ! program does not exit prematurely. B. Pun Jan 2000. + ! 3. Modified treatment of negative test concentrations so that + ! program does not exit prematurely. B. Pun Jan 2000. !************************************************************************** CONTAINS diff --git a/src/MNH/mode_typeb.f90 b/src/MNH/mode_typeb.f90 index bf13feb89..86137ff1d 100644 --- a/src/MNH/mode_typeb.f90 +++ b/src/MNH/mode_typeb.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -31,20 +31,20 @@ module mode_typeb !! MWaom (non-volatile) = 280 ! NBSPAOM = 5, ! xaom = {0.4, 0.05, 0.15, 0.12, 0.28}; -! default breakdown of AOM -! compound mass frac. mole frac. -! C24 alkanoic acid 0.50 0.40 -! C18 alkenoic acid 0.05 0.05 -! actonyl syringol 0.11 0.15 -! C20 alkane 0.17 0.12 -! arom. dicarboxylic acid 0.17 0.28 +! default breakdown of AOM +! compound mass frac. mole frac. +! C24 alkanoic acid 0.50 0.40 +! C18 alkenoic acid 0.05 0.05 +! actonyl syringol 0.11 0.15 +! C20 alkane 0.17 0.12 +! arom. dicarboxylic acid 0.17 0.28 ! !Revision history: Developed by Betty Pun, AER, Jan 99 Under EPRI ! Modified by Betty Pun, AER, Nov 99 Under CARB ! 1. increase the number of partitioning compound ! 2. conform to models-3 coding standard -! 3. allow the selection of equations to solve when -! using Newt. +! 3. allow the selection of equations to solve when +! using Newt. ! 4. Rewritten to f90 and MESONH style: Alf Grini, CNRM !***************************************************************************/ diff --git a/src/MNH/mode_zsrpun.f90 b/src/MNH/mode_zsrpun.f90 index efdc85450..7c39932dd 100644 --- a/src/MNH/mode_zsrpun.f90 +++ b/src/MNH/mode_zsrpun.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1999-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1999-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -12,16 +12,16 @@ MODULE mode_zsrpun !************************************************************************** !Purpose: ZSR is used to calculate the amount of water associated with Type ! A organic molecules only when zsrflag = 1; when zsrflag = 0 use - ! Newt and UNIFAC to solve for Aw = RH + ! Newt and UNIFAC to solve for Aw = RH ! !Revision history: 1. Developed by Betty Pun, AER, Feb 99 under EPRI funding ! for the prototype SOA module. - ! 2. Modified November 99 by Betty Pun, AER, under CARB - ! funding to adhere to models-3 coding standards - ! 3. Modified to use ZSR or unifac to calculate water - ! associated with organics, as specified by zsrflag - ! by Betty Pun, Nov, 99. A file with xi at given Aw - ! is included binsolu.h + ! 2. Modified November 99 by Betty Pun, AER, under CARB + ! funding to adhere to models-3 coding standards + ! 3. Modified to use ZSR or unifac to calculate water + ! associated with organics, as specified by zsrflag + ! by Betty Pun, Nov, 99. A file with xi at given Aw + ! is included binsolu.h ! 4. Rewritten to FORTRAN90 by Alf Grini (alf.grini@cnrm.meteo.fr) ! P. Wautelet 10/04/2019: replace ABORT and STOP calls by Print_msg ! diff --git a/src/MNH/modn_advn.f90 b/src/MNH/modn_advn.f90 index a964c476a..26ee704b1 100644 --- a/src/MNH/modn_advn.f90 +++ b/src/MNH/modn_advn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! Vila, Lafore *Meteo France* +!! Vila, Lafore *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_backup.f90 b/src/MNH/modn_backup.f90 index d1ec3226f..756428a91 100644 --- a/src/MNH/modn_backup.f90 +++ b/src/MNH/modn_backup.f90 @@ -26,7 +26,7 @@ !! !! AUTHOR !! ------ -!! J.P. Lafore *Meteo France* +!! J.P. Lafore *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_blankn.f90 b/src/MNH/modn_blankn.f90 index 2825372c2..21de24528 100644 --- a/src/MNH/modn_blankn.f90 +++ b/src/MNH/modn_blankn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -26,7 +26,7 @@ !! !! AUTHOR !! ------ -!! K. Suhre *Laboratoire d'Aerologie* +!! K. Suhre *Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_budget.f90 b/src/MNH/modn_budget.f90 index 1cfc6d391..2e35ce75b 100644 --- a/src/MNH/modn_budget.f90 +++ b/src/MNH/modn_budget.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -210,7 +210,7 @@ !! !! AUTHOR !! ------ -!! P. Hereil *Meteo France* +!! P. Hereil *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_ch_model0d.f90 b/src/MNH/modn_ch_model0d.f90 index a2676852a..722312b63 100644 --- a/src/MNH/modn_ch_model0d.f90 +++ b/src/MNH/modn_ch_model0d.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -30,12 +30,12 @@ !! IMPLICIT ARGUMENTS !! ------------------ USE MODD_CH_MODEL0D, ONLY: XTBEGIN, XTEND, XDTACT, & - XDTOUT, XDTDIAG, & - CRUNID, & - CINITFILE, COUTFILE, CMETEOFILE, & - CRESULTFILE, CRESULTFORMAT, & - CDIAGFILE, CDIAGFORMAT, & - NVERB + XDTOUT, XDTDIAG, & + CRUNID, & + CINITFILE, COUTFILE, CMETEOFILE, & + CRESULTFILE, CRESULTFORMAT, & + CDIAGFILE, CDIAGFORMAT, & + NVERB ! !! !------------------------------------------------------------------------------ @@ -46,11 +46,11 @@ IMPLICIT NONE ! ! variables to be put into the namelist NAMELIST /NAM_CH_MODEL0D/ XTBEGIN, XTEND, XDTACT, & - XDTOUT, XDTDIAG, & - CRUNID, & - CINITFILE, COUTFILE, CMETEOFILE, & - CRESULTFILE, CRESULTFORMAT, & - CDIAGFILE, CDIAGFORMAT, & - NVERB + XDTOUT, XDTDIAG, & + CRUNID, & + CINITFILE, COUTFILE, CMETEOFILE, & + CRESULTFILE, CRESULTFORMAT, & + CDIAGFILE, CDIAGFORMAT, & + NVERB ! END MODULE MODN_CH_MODEL0D diff --git a/src/MNH/modn_condsamp.f90 b/src/MNH/modn_condsamp.f90 index 89b0b782e..ac32ccd5e 100644 --- a/src/MNH/modn_condsamp.f90 +++ b/src/MNH/modn_condsamp.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -6,12 +6,12 @@ MODULE MODN_CONDSAMP ! ################## !------------------------------------------------------------------------------- -!*** MODD_CONDSAMP Declaration of namelist NAM_CONDSAMP +!*** MODD_CONDSAMP Declaration of namelist NAM_CONDSAMP ! !! AUTHOR !! ------ -! : C.Lac -! Creation : 05.06.2011 +! : C.Lac +! Creation : 05.06.2011 !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_conf.f90 b/src/MNH/modn_conf.f90 index 50298fa9e..3297ee2ff 100644 --- a/src/MNH/modn_conf.f90 +++ b/src/MNH/modn_conf.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -59,7 +59,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_confn.f90 b/src/MNH/modn_confn.f90 index 62dd5ec60..1e3fa2229 100644 --- a/src/MNH/modn_confn.f90 +++ b/src/MNH/modn_confn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -41,7 +41,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_diag_blank.f90 b/src/MNH/modn_diag_blank.f90 index 2ecf474a5..edac420f2 100644 --- a/src/MNH/modn_diag_blank.f90 +++ b/src/MNH/modn_diag_blank.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -31,7 +31,7 @@ !! !! AUTHOR !! ------ -!! K. Suhre *Laboratoire d'Aerologie* +!! K. Suhre *Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_dragn.f90 b/src/MNH/modn_dragn.f90 index c95530875..807262c7a 100644 --- a/src/MNH/modn_dragn.f90 +++ b/src/MNH/modn_dragn.f90 @@ -18,7 +18,7 @@ !! !! AUTHOR !! ------ -!! J. Colin * Meteo-France * +!! J. Colin * Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_dyn.f90 b/src/MNH/modn_dyn.f90 index bcaad8c84..32c1d5198 100644 --- a/src/MNH/modn_dyn.f90 +++ b/src/MNH/modn_dyn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -43,7 +43,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_dynn.f90 b/src/MNH/modn_dynn.f90 index b943d5202..98f332d00 100644 --- a/src/MNH/modn_dynn.f90 +++ b/src/MNH/modn_dynn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -35,7 +35,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_elec.f90 b/src/MNH/modn_elec.f90 index 7c9e53f3c..a4aa13330 100644 --- a/src/MNH/modn_elec.f90 +++ b/src/MNH/modn_elec.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -7,9 +7,9 @@ !----------------------------------------------------------------- ! %Z% Lib:%F%, Version:%I%, Date:%D%, Last modified:%E% !----------------------------------------------------------------- -! ################# +! ################# MODULE MODN_ELEC -! ################# +! ################# ! !! !!*** *MODN_ELEC* diff --git a/src/MNH/modn_frc.f90 b/src/MNH/modn_frc.f90 index 42e04d16e..67ab42de1 100644 --- a/src/MNH/modn_frc.f90 +++ b/src/MNH/modn_frc.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -32,7 +32,7 @@ !! !! AUTHOR !! ------ -! ! Marc Georgelin Labo d'aerologie +! ! Marc Georgelin Labo d'aerologie !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_ibm_paramn.f90 b/src/MNH/modn_ibm_paramn.f90 index a17e89362..b547494f8 100644 --- a/src/MNH/modn_ibm_paramn.f90 +++ b/src/MNH/modn_ibm_paramn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2019-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2019-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -26,7 +26,7 @@ ! ! AUTHOR ! ------ -! Franck Auguste (CERFACS-AE) +! Franck Auguste (CERFACS-AE) ! ! MODIFICATIONS ! ------------- diff --git a/src/MNH/modn_lbcn.f90 b/src/MNH/modn_lbcn.f90 index 22a190ef3..2ad17518c 100644 --- a/src/MNH/modn_lbcn.f90 +++ b/src/MNH/modn_lbcn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -39,7 +39,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq and J-P. Lafore *Meteo France* +!! V. Ducrocq and J-P. Lafore *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_les.f90 b/src/MNH/modn_les.f90 index 90809d46f..048623dc3 100644 --- a/src/MNH/modn_les.f90 +++ b/src/MNH/modn_les.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -31,7 +31,7 @@ !! !! AUTHOR !! ------ -!! J. Cuxart and J. Stein * I.N.M. and Meteo-France * +!! J. Cuxart and J. Stein * I.N.M. and Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_lunitn.f90 b/src/MNH/modn_lunitn.f90 index afeb4b226..530a32e9c 100644 --- a/src/MNH/modn_lunitn.f90 +++ b/src/MNH/modn_lunitn.f90 @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_mean.f90 b/src/MNH/modn_mean.f90 index 888b5cf7b..76e19f952 100644 --- a/src/MNH/modn_mean.f90 +++ b/src/MNH/modn_mean.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -24,7 +24,7 @@ !! !! AUTHOR !! ------ -!! P.Aumond * CNRM * +!! P.Aumond * CNRM * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_nesting.f90 b/src/MNH/modn_nesting.f90 index 6ed5dda13..dfe154d23 100644 --- a/src/MNH/modn_nesting.f90 +++ b/src/MNH/modn_nesting.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -34,7 +34,7 @@ !! !! AUTHOR !! ------ -!! J. P. Lafore *Meteo France* +!! J. P. Lafore *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_nudgingn.f90 b/src/MNH/modn_nudgingn.f90 index fb518f21b..b5734ac82 100644 --- a/src/MNH/modn_nudgingn.f90 +++ b/src/MNH/modn_nudgingn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -29,7 +29,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_output.f90 b/src/MNH/modn_output.f90 index 76833605c..12ff83c1e 100644 --- a/src/MNH/modn_output.f90 +++ b/src/MNH/modn_output.f90 @@ -27,7 +27,7 @@ !! !! AUTHOR !! ------ -!! J.P. Lafore *Meteo France* +!! J.P. Lafore *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_paramn.f90 b/src/MNH/modn_paramn.f90 index 7e99b6595..7946f33bf 100644 --- a/src/MNH/modn_paramn.f90 +++ b/src/MNH/modn_paramn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -49,7 +49,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/modn_paspol.f90 b/src/MNH/modn_paspol.f90 index 48d848312..e864355ac 100644 --- a/src/MNH/modn_paspol.f90 +++ b/src/MNH/modn_paspol.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -6,12 +6,12 @@ MODULE MODN_PASPOL ! ################## !------------------------------------------------------------------------------- -!*** MODD_PASPOL Declaration of namelist NAM_PASPOL +!*** MODD_PASPOL Declaration of namelist NAM_PASPOL ! !! AUTHOR !! ------ -! : Michel Bouzom, DP/SERV/ENV -! Creation : 09.10.2001 +! : Michel Bouzom, DP/SERV/ENV +! Creation : 09.10.2001 !------------------------------------------------------------------------------- ! ! diff --git a/src/MNH/modn_recycl_paramn.f90 b/src/MNH/modn_recycl_paramn.f90 index 92007900f..260e96dd8 100644 --- a/src/MNH/modn_recycl_paramn.f90 +++ b/src/MNH/modn_recycl_paramn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2021-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2021-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -26,7 +26,7 @@ ! ! AUTHOR ! ------ -! Tim Nagel (Meteo-France) +! Tim Nagel (Meteo-France) ! ! MODIFICATIONS ! ------------- diff --git a/src/MNH/modn_viscosity.f90 b/src/MNH/modn_viscosity.f90 index 53c4e3851..e705d0794 100644 --- a/src/MNH/modn_viscosity.f90 +++ b/src/MNH/modn_viscosity.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -22,7 +22,7 @@ !! !! AUTHOR !! ------ -!! J. Colin * Meteo-France * +!! J. Colin * Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/nabla4.f90 b/src/MNH/nabla4.f90 index a41aa4dd1..c091cefea 100644 --- a/src/MNH/nabla4.f90 +++ b/src/MNH/nabla4.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -71,7 +71,7 @@ END MODULE MODI_NABLA4 !! !! AUTHOR !! ------ -!! J.-P. Pinty and J.-P. Lafore * LA & Meteo-France * +!! J.-P. Pinty and J.-P. Lafore * LA & Meteo-France * !! !! MODIFICATIONS !! ------------- @@ -146,7 +146,7 @@ END FUNCTION DX4 !! !! AUTHOR !! ------ -!! J.-P. Pinty * LA * +!! J.-P. Pinty * LA * !! !! MODIFICATIONS !! ------------- @@ -225,7 +225,7 @@ END FUNCTION DX4_2 !! !! AUTHOR !! ------ -!! J.-P. Pinty and J.-P. Lafore * LA & Meteo-France * +!! J.-P. Pinty and J.-P. Lafore * LA & Meteo-France * !! !! MODIFICATIONS !! ------------- @@ -300,7 +300,7 @@ END FUNCTION DY4 !! !! AUTHOR !! ------ -!! J.-P. Pinty * LA * +!! J.-P. Pinty * LA * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/nudging.f90 b/src/MNH/nudging.f90 index 943a4f103..66c2a890b 100644 --- a/src/MNH/nudging.f90 +++ b/src/MNH/nudging.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2006-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2006-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -69,7 +69,7 @@ END MODULE MODI_NUDGING !! !! AUTHOR !! ------ -!! V. Masson * Meteo France* +!! V. Masson * Meteo France* !! !! MODIFICATIONS !! ------------- @@ -131,7 +131,7 @@ IF (OUSERV) & ! ! !* 2. BUDGET CALLS -! ------------ +! ------------ ! if ( lbudget_u ) call Budget_store_end( tbudgets(NBUDGET_U ), 'NUD', prus (:, :, :) ) if ( lbudget_v ) call Budget_store_end( tbudgets(NBUDGET_V ), 'NUD', prvs (:, :, :) ) diff --git a/src/MNH/open_file_mnh.f90 b/src/MNH/open_file_mnh.f90 index 93343bb4a..04fe70067 100644 --- a/src/MNH/open_file_mnh.f90 +++ b/src/MNH/open_file_mnh.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2003-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2003-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -48,7 +48,7 @@ END MODULE MODI_OPEN_FILE_MNH !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/open_nestpgd_files.f90 b/src/MNH/open_nestpgd_files.f90 index 07692c010..d1d26690c 100644 --- a/src/MNH/open_nestpgd_files.f90 +++ b/src/MNH/open_nestpgd_files.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -50,7 +50,7 @@ END MODULE MODI_OPEN_NESTPGD_FILES !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/p_abs.f90 b/src/MNH/p_abs.f90 index 1d3e2d6e8..6acfb0eac 100644 --- a/src/MNH/p_abs.f90 +++ b/src/MNH/p_abs.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -48,7 +48,7 @@ END INTERFACE END MODULE MODI_P_ABS ! ####################################################################### SUBROUTINE P_ABS (KRR, KRRL, KRRI, PDRYMASST, PREFMASS, PMASS_O_PHI0, & - PTHT, PRT, PRHODJ, PRHODREF, PTHETAV, PTHVREF, & + PTHT, PRT, PRHODJ, PRHODREF, PTHETAV, PTHVREF, & PRVREF, PEXNREF, PPHIT, PPHI0 ) ! ####################################################################### ! @@ -91,7 +91,7 @@ END MODULE MODI_P_ABS !! !! AUTHOR !! ------ -!! J.-P. Lafore * Meteo France * +!! J.-P. Lafore * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -205,7 +205,7 @@ ZCVD_O_RD = (XCPD - XRD) / XRD ! ! !* 2. COMPUTES THE ABSOLUTE EXNER FUNCTION (MAE+ DUR) -! ----------------------------------------------- +! ----------------------------------------------- ! ! ! @@ -313,7 +313,7 @@ ELSEIF( CEQNSYS == 'LHE' ) THEN ! ! !* 3. COMPUTES THE ABSOLUTE PRESSURE FUNCTION (LHE) -! --------------------------------------------- +! --------------------------------------------- ! ! compute the reference moist density ! diff --git a/src/MNH/pack_2d_1d.f90 b/src/MNH/pack_2d_1d.f90 index 7c7792101..425f2c9a8 100644 --- a/src/MNH/pack_2d_1d.f90 +++ b/src/MNH/pack_2d_1d.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -81,7 +81,7 @@ END MODULE MODI_PACK_2D_1D !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -153,7 +153,7 @@ END SUBROUTINE PACK_2D_1D_FROMI2D !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -224,7 +224,7 @@ END SUBROUTINE PACK_2D_1D_FROML2D !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -294,7 +294,7 @@ END SUBROUTINE PACK_2D_1D_FROM2D !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -366,7 +366,7 @@ END SUBROUTINE PACK_2D_1D_FROM3D !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/paspol.f90 b/src/MNH/paspol.f90 index af5da0665..05ad22fd5 100644 --- a/src/MNH/paspol.f90 +++ b/src/MNH/paspol.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2008-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2008-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -150,7 +150,7 @@ TYPE(TFIELDMetaDATA) :: TZFIELD !-------------------------------------------------------------------------------------- ! ! -!* 0. Initialisation +!* 0. Initialisation ! ! CALL GET_DIM_EXT_ll('B',IIU,IJU) @@ -166,8 +166,8 @@ ALLOCATE( ZSVT(IIU,IJU,IKU) ) ZSURF = (XXHAT(2)-XXHAT(1))*(XYHAT(2)-XYHAT(1)) ! Surface d'une maille. ! ! -!* 1. INITIALIZATION OF PASSIVE POLLUTANT -! ------------------------------------- +!* 1. INITIALIZATION OF PASSIVE POLLUTANT +! ------------------------------------- ! IF (GPPFIRSTCALL) THEN @@ -199,8 +199,8 @@ IF (GPPFIRSTCALL) THEN IF (KVERB >= 10) THEN WRITE(KLUOUT,'(A)') ' ' WRITE(KLUOUT,'(A)') '******************************' - WRITE(KLUOUT,'(A)') ' EMIS_PASPOL' - WRITE(KLUOUT,'(A)') ' Initialization of sources ' + WRITE(KLUOUT,'(A)') ' EMIS_PASPOL' + WRITE(KLUOUT,'(A)') ' Initialization of sources ' WRITE(KLUOUT,'(A)') '******************************' WRITE(KLUOUT,'(A,I3.1)') 'IJU : ',IJU WRITE(KLUOUT,'(A,I3.1)') 'Rejet Nu : ',JSV @@ -209,7 +209,7 @@ IF (GPPFIRSTCALL) THEN END IF ! ! - !* 1.1 Position du rejet. + !* 1.1 Position du rejet. ! ! On calcule les coordonnees cartesiennes (ZSRCX,ZSRCY) en metres, ! puis les indices fractionnaires (ZSRCI,ZSRCJ) et entiers @@ -235,8 +235,8 @@ IF (GPPFIRSTCALL) THEN WRITE(KLUOUT,'(A,F12.4)') 'Zsrc Y (m) : ',ZSRCY WRITE(KLUOUT,'(A,F9.3)') 'Ind Rel X : ',ZSRCI WRITE(KLUOUT,'(A,F9.3)') 'Ind Rel Y : ',ZSRCJ - WRITE(KLUOUT,'(A,I5.1)') 'Ind X : ',IPIGI(JSV) - WRITE(KLUOUT,'(A,I5.1)') 'Ind Y : ',IPIGJ(JSV) + WRITE(KLUOUT,'(A,I5.1)') 'Ind X : ',IPIGI(JSV) + WRITE(KLUOUT,'(A,I5.1)') 'Ind Y : ',IPIGJ(JSV) ! WRITE(KLUOUT,'(A,F9.3)') & 'Ind X : ',(ZSRCX-XXHAT(1))/(XXHAT(2)-XXHAT(1))+1.0 @@ -253,7 +253,7 @@ IF (GPPFIRSTCALL) THEN WRITE(KLUOUT,'(A)') 'La source est dans le domaine de travail courant.' ! ! - !* 1.2 Dispersion autour de la source. + !* 1.2 Dispersion autour de la source. ! ! On commence par dispatcher le polluant sur les 4 points ! entourant la source (tableau Z4PT). @@ -311,7 +311,7 @@ IF (GPPFIRSTCALL) THEN ! ! ! - !* 1.3 Chronologie du rejet. + !* 1.3 Chronologie du rejet. ! ! Eclatement des dates caracteristiques et calcul du ! nombre de secondes depuis 0UTC (equiv. TDTCUR%xtime). @@ -359,7 +359,7 @@ IF (GPPFIRSTCALL) THEN END IF ! ! - !* 1.4 Debit (g/s) et gradients de debit (g/s/s). + !* 1.4 Debit (g/s) et gradients de debit (g/s/s). ! ! Les gradients de debit ne sont calcules que si ils sont significatifs. ! @@ -378,7 +378,7 @@ IF (GPPFIRSTCALL) THEN END IF ! ! - !* 1.5 Colonne contaminee. + !* 1.5 Colonne contaminee. ! ! ! Calcul des couches auxquelles appartiennent la base et le sommet. @@ -453,10 +453,10 @@ ENDIF ! ! ! -!* 2. EMISSIONS. -! ---------- +!* 2. EMISSIONS. +! ---------- ! -!* 2.1 Date-heure courante sous forme plus pratique. +!* 2.1 Date-heure courante sous forme plus pratique. ! WHERE (XSVT(:,:,:,NSV_PPBEG:NSV_PPEND) <0.0) & XSVT(:,:,:,NSV_PPBEG:NSV_PPEND)=0.0 @@ -471,7 +471,7 @@ DO JSV=1,NSV_PP IF ( (II.GE.IIB).AND.(II.LE.IIE).AND.(IJ.GE.IJB).AND.(IJ.LE.IJE) ) THEN ! ! - !* 2.2 Distance temporelle DEPUIS le debut de rejet. + !* 2.2 Distance temporelle DEPUIS le debut de rejet. ! TZDATE%nyear=IDEBYY(JSV);TZDATE%nmonth=IDEBMM(JSV);TZDATE%nday=IDEBDD(JSV);TZDATE%xtime=ZDEBSS(JSV) CALL DATETIME_DISTANCE(TZDATE,TDTCUR,ZDEPUIS) @@ -489,12 +489,12 @@ DO JSV=1,NSV_PP IF (ZDEPUIS.GT.ZCHRO3(JSV)) ZRATE=ZRATECST(JSV) & +ZRATEDEC(JSV)*(ZDEPUIS-ZCHRO3(JSV)) ! - ! + ! IF (CNIVO(JSV).EQ.'SRF') THEN ! ! - !* 2.5 Emission a la surface. - ! On passe par les SFSV en (g/g).m.s-1 + !* 2.5 Emission a la surface. + ! On passe par les SFSV en (g/g).m.s-1 ! ZP = XPABST(II,IJ,IKB) ZTH = XTHT(II,IJ,IKB) @@ -511,8 +511,8 @@ DO JSV=1,NSV_PP ELSE ! ! - !* 2.6 Emission en altitude. - ! On modifie directement les XVT en g/g. + !* 2.6 Emission en altitude. + ! On modifie directement les XVT en g/g. ! DO JK=1,IKE ! @@ -554,15 +554,15 @@ END DO ! BOUCLE sur les rejets. ! ! ! -!* 3. CALCUL DES CTA. +!* 3. CALCUL DES CTA. ! --------------- ! -!* 3.1 Calcul de la masse volumique de l'air en Kg/m3. +!* 3.1 Calcul de la masse volumique de l'air en Kg/m3. ! ZRHOM(:,:,:)=XPABST(:,:,:)/(XRD*XTHT(:,:,:)*((XPABST(:,:,:)/XP00)**(XRD/XCPD))) ! ! -!* 3.2 Passage en g/m3. +!* 3.2 Passage en g/m3. ! ZRHOM(:,:,:)=ZRHOM(:,:,:)*1000.0 ! @@ -576,7 +576,7 @@ DO JSV=1,NSV_PP END DO ! ! -!* 3.4 Ecriture conditionnelle. +!* 3.4 Ecriture conditionnelle. ! IF ( tpfile%lopened ) THEN TZFIELD = TFIELDMETADATA( & diff --git a/src/MNH/pinter.f90 b/src/MNH/pinter.f90 index 410199ce2..5123b5b80 100644 --- a/src/MNH/pinter.f90 +++ b/src/MNH/pinter.f90 @@ -1,13 +1,8 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------- -!--------------- special set of characters for RCS information -!----------------------------------------------------------------- -! $Source$ $Revision$ -! MASDEV4_7 newsrc 2006/05/24 18:05:53 -!----------------------------------------------------------------- ! ############################################################ MODULE MODI_PINTER ! ############################################################ @@ -139,14 +134,14 @@ OX: DO JI =1,KIU ! ii) Interpolation des points reguliers ! IF(ABS(IKD).NE.(10*KKU)) THEN - IF(HOPINT.EQ.'LOG') THEN - ZSLOPE=LOG(PLPL(JI,JJ,JKPL)/PPMNH(JI,JJ,IKD)) & + IF(HOPINT.EQ.'LOG') THEN + ZSLOPE=LOG(PLPL(JI,JJ,JKPL)/PPMNH(JI,JJ,IKD)) & /LOG(PPMNH(JI,JJ,IKD+1)/PPMNH(JI,JJ,IKD)) - ELSE - ZSLOPE=(PLPL(JI,JJ,JKPL)-PPMNH(JI,JJ,IKD)) & + ELSE + ZSLOPE=(PLPL(JI,JJ,JKPL)-PPMNH(JI,JJ,IKD)) & /(PPMNH(JI,JJ,IKD+1)-PPMNH(JI,JJ,IKD)) - ENDIF - PVPL(JI,JJ,JKPL)=PVMNH(JI,JJ,IKD) & + ENDIF + PVPL(JI,JJ,JKPL)=PVMNH(JI,JJ,IKD) & +ZSLOPE*(PVMNH(JI,JJ,IKD+1)-PVMNH(JI,JJ,IKD)) ENDIF ! @@ -155,72 +150,72 @@ OX: DO JI =1,KIU ! Extrapolation au dessus du sommet ! IF(IKD.EQ.10*KKU) THEN - IF(HNAMV.EQ.'ZMGP'.OR.HNAMV.EQ.'UB..'.OR.HNAMV.EQ.'VB..') THEN + IF(HNAMV.EQ.'ZMGP'.OR.HNAMV.EQ.'UB..'.OR.HNAMV.EQ.'VB..') THEN ! ZMGP ou UB ou VB - PVPL(JI,JJ,JKPL)=PVMNH(JI,JJ,KKU)+(PLPL(JI,JJ,JKPL)-PPMNH(JI,JJ,KKU))* & + PVPL(JI,JJ,JKPL)=PVMNH(JI,JJ,KKU)+(PLPL(JI,JJ,JKPL)-PPMNH(JI,JJ,KKU))* & (PVMNH(JI,JJ,KKU-1)-PVMNH(JI,JJ,KKU))/ & - (PPMNH(JI,JJ,KKU-1)-PPMNH(JI,JJ,KKU)) - ELSE + (PPMNH(JI,JJ,KKU-1)-PPMNH(JI,JJ,KKU)) + ELSE ! autres (T ou OMT ou RHU) - PVPL(JI,JJ,JKPL)=PVMNH(JI,JJ,KKU) - ENDIF + PVPL(JI,JJ,JKPL)=PVMNH(JI,JJ,KKU) + ENDIF ENDIF ! ! Extrapolation au dessous du sol ! IF(IKD.EQ.-10*KKU) THEN - IF(HNAMV.EQ.'ZMGP') THEN + IF(HNAMV.EQ.'ZMGP') THEN ! ZMGP - ZTSTAR=PTMNH(JI,JJ,KKB) - ZTNUL=ZTSTAR+.0065*PZGMNH(JI,JJ,KKB) - ZALF=.0065*XRD/XG - IF(ZTNUL.GE.290.5.AND.ZTSTAR.LT.290.5) THEN - ZALF=XRD*(290.5-ZTSTAR)/(PZGMNH(JI,JJ,KKB)*XG) - ELSE IF (ZTNUL.GT.290.5.AND.ZTSTAR.GT.290.5) THEN - ZALF=0. - ZTSTAR=.5*(ZTSTAR+290.5) - ENDIF - IF(ZTSTAR.LT.255) THEN - ZTSTAR=.5*(ZTSTAR+255.) - ENDIF - ZFP=ZALF*LOG(PLPL(JI,JJ,JKPL)/PPMNH(JI,JJ,KKB)) - PVPL(JI,JJ,JKPL)=PVMNH(JI,JJ,KKB)-XRD*(ZTSTAR/XG)* & + ZTSTAR=PTMNH(JI,JJ,KKB) + ZTNUL=ZTSTAR+.0065*PZGMNH(JI,JJ,KKB) + ZALF=.0065*XRD/XG + IF(ZTNUL.GE.290.5.AND.ZTSTAR.LT.290.5) THEN + ZALF=XRD*(290.5-ZTSTAR)/(PZGMNH(JI,JJ,KKB)*XG) + ELSE IF (ZTNUL.GT.290.5.AND.ZTSTAR.GT.290.5) THEN + ZALF=0. + ZTSTAR=.5*(ZTSTAR+290.5) + ENDIF + IF(ZTSTAR.LT.255) THEN + ZTSTAR=.5*(ZTSTAR+255.) + ENDIF + ZFP=ZALF*LOG(PLPL(JI,JJ,JKPL)/PPMNH(JI,JJ,KKB)) + PVPL(JI,JJ,JKPL)=PVMNH(JI,JJ,KKB)-XRD*(ZTSTAR/XG)* & LOG(PLPL(JI,JJ,JKPL)/PPMNH(JI,JJ,KKB))* & (1.+ZFP/2.+(ZFP**2)/6.) - ELSE IF(HNAMV.EQ.'T...') THEN + ELSE IF(HNAMV.EQ.'T...') THEN ! T - ZTSTAR=PTMNH(JI,JJ,KKB) - IF(PPMNH(JI,JJ,KKB).GE.PLPL(JI,JJ,JKPL)) THEN - PVPL(JI,JJ,JKPL)= & + ZTSTAR=PTMNH(JI,JJ,KKB) + IF(PPMNH(JI,JJ,KKB).GE.PLPL(JI,JJ,JKPL)) THEN + PVPL(JI,JJ,JKPL)= & ((PPMNH(JI,JJ,KKB)-PLPL(JI,JJ,JKPL))*PTMNH(JI,JJ,KKB+1) & +(PLPL(JI,JJ,JKPL)-PPMNH(JI,JJ,KKB+1))*ZTSTAR) & /(PPMNH(JI,JJ,KKB)-PPMNH(JI,JJ,KKB+1)) - ELSE IF(PLPL(JI,JJ,JKPL).GT.PPMNH(JI,JJ,KKB)) THEN - ZZSOL=PZGMNH(JI,JJ,KKB) - IF(ZZSOL.LT.2000.) THEN - ZALF=.0065*(XRD/XG) - ELSE - ZTNUL =ZTSTAR+.0065*ZZSOL - ZTPLAT=MIN(ZTNUL,298.) - IF(ZZSOL.GT.2500.) THEN - ZTPRNUL=ZTPLAT - ELSE - ZTPRNUL=.002*((2500.-ZZSOL)*ZTNUL & - +(ZZSOL-2000.)*ZTPLAT) - ENDIF - IF(ZTPRNUL.LT.ZTSTAR) THEN - ZALF=0. - ELSE - ZALF=XRD*(ZTPRNUL-ZTSTAR)/(PZGMNH(JI,JJ,KKB)*XG) - ENDIF - ENDIF - ZFP=ZALF*LOG(PLPL(JI,JJ,JKPL)/PPMNH(JI,JJ,KKB)) - PVPL(JI,JJ,JKPL)=ZTSTAR*(1.+ZFP+(ZFP**2)/2.+(ZFP**3)/6.) - ENDIF - ELSE + ELSE IF(PLPL(JI,JJ,JKPL).GT.PPMNH(JI,JJ,KKB)) THEN + ZZSOL=PZGMNH(JI,JJ,KKB) + IF(ZZSOL.LT.2000.) THEN + ZALF=.0065*(XRD/XG) + ELSE + ZTNUL =ZTSTAR+.0065*ZZSOL + ZTPLAT=MIN(ZTNUL,298.) + IF(ZZSOL.GT.2500.) THEN + ZTPRNUL=ZTPLAT + ELSE + ZTPRNUL=.002*((2500.-ZZSOL)*ZTNUL & + +(ZZSOL-2000.)*ZTPLAT) + ENDIF + IF(ZTPRNUL.LT.ZTSTAR) THEN + ZALF=0. + ELSE + ZALF=XRD*(ZTPRNUL-ZTSTAR)/(PZGMNH(JI,JJ,KKB)*XG) + ENDIF + ENDIF + ZFP=ZALF*LOG(PLPL(JI,JJ,JKPL)/PPMNH(JI,JJ,KKB)) + PVPL(JI,JJ,JKPL)=ZTSTAR*(1.+ZFP+(ZFP**2)/2.+(ZFP**3)/6.) + ENDIF + ELSE ! autres (UB ou VB ou OMT ou RHU ...) - PVPL(JI,JJ,JKPL)=PVMNH(JI,JJ,KKB) - ENDIF + PVPL(JI,JJ,JKPL)=PVMNH(JI,JJ,KKB) + ENDIF ENDIF END DO PLEV END DO OY diff --git a/src/MNH/polar_calc.f90 b/src/MNH/polar_calc.f90 index badf269d5..665dd8d74 100644 --- a/src/MNH/polar_calc.f90 +++ b/src/MNH/polar_calc.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2001-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2001-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -62,7 +62,7 @@ END MODULE MODI_POLAR_CALC !! !! AUTHOR !! ------ -!! O. Nuissier * L.A. * +!! O. Nuissier * L.A. * !! R. Rogers * NOAA/AOML/HRD * !! !! MODIFICATIONS @@ -112,7 +112,7 @@ INTEGER,DIMENSION(SIZE(PVARCYL,2)) :: IPBL ! !------------------------------------------------------------------------------- ! -!* 1. INITIALIZATIONS +!* 1. INITIALIZATIONS ! --------------- ! ILUOUT0 = TLUOUT0%NLU @@ -139,7 +139,7 @@ IPBL(:)=0 IF (PRESENT(PVAR2IN)) ALLOCATE(ZVARCYL2(IR,IPHI,IP)) !----------------------------------------------------------------------------- ! -!* 2. INTERPOLATE ONTO A CYLINDRICAL GRID +!* 2. INTERPOLATE ONTO A CYLINDRICAL GRID ! (R=1 CORRESPOND TO THE CENTER OF THE VORTEX) ! -------------------------------------------- ! @@ -224,7 +224,7 @@ END SUBROUTINE POLAR_CALC3D !! !! AUTHOR !! ------ -!! O. Nuissier * L.A. * +!! O. Nuissier * L.A. * !! R. Rogers * NOAA/AOML/HRD * !! !! MODIFICATIONS @@ -273,7 +273,7 @@ INTEGER, DIMENSION(1) :: IICEN3D,IJCEN3D ! !------------------------------------------------------------------------------- ! -!* 1. INITIALIZATIONS +!* 1. INITIALIZATIONS ! --------------- ! ZVARIN3D(:,:,1)=PVARIN(:,:) diff --git a/src/MNH/polar_mean.f90 b/src/MNH/polar_mean.f90 index 2eb0ee291..398f0d558 100644 --- a/src/MNH/polar_mean.f90 +++ b/src/MNH/polar_mean.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -73,7 +73,7 @@ END MODULE MODI_POLAR_MEAN !! !! AUTHOR !! ------ -!! O. Nuissier * L.A. * +!! O. Nuissier * L.A. * !! R. Rogers * NOAA/AOML/HRD * !! !! MODIFICATIONS @@ -118,7 +118,7 @@ INTEGER :: JPHI,JP ! !------------------------------------------------------------------------------- ! -!* 1. INITIALIZATIONS +!* 1. INITIALIZATIONS ! --------------- ! ! @@ -137,7 +137,7 @@ PHDR0MOY(:) = 0. ! !------------------------------------------------------------------------------- ! -!* 2. +!* 2. ! ! DO JP = 1, IP @@ -203,7 +203,7 @@ END SUBROUTINE POLAR_MEAN_P !! !! AUTHOR !! ------ -!! O. Nuissier * L.A. * +!! O. Nuissier * L.A. * !! R. Rogers * NOAA/AOML/HRD * !! !! MODIFICATIONS @@ -244,7 +244,7 @@ REAL :: ZHDR0 ! !------------------------------------------------------------------------------- ! -!* 1. INITIALIZATIONS +!* 1. INITIALIZATIONS ! --------------- ! ! @@ -264,7 +264,7 @@ PHDR0MOY(:,:) = 0. ! !------------------------------------------------------------------------------- ! -!* 2. +!* 2. ! DO JP = 1, IP ZXI0 = XXHAT(PICEN(JP)) + (ZDELTAX / 2.) diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90 index 4198be8d1..e9debe845 100644 --- a/src/MNH/prep_ideal_case.f90 +++ b/src/MNH/prep_ideal_case.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -218,7 +218,7 @@ !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -648,7 +648,7 @@ CALL INI_CST !------------------------------------------------------------------------------- ! ! -!* 2. SET DEFAULT VALUES : +!* 2. SET DEFAULT VALUES : ! -------------------- ! ! @@ -668,7 +668,7 @@ CSURF = "NONE" CALL DEFAULT_EXPRE !------------------------------------------------------------------------------- ! -!* 3. READ THE EXPRE FILE : +!* 3. READ THE EXPRE FILE : ! -------------------- ! !* 3.1 initialize logical unit numbers (EXPRE and output-listing files) @@ -909,7 +909,7 @@ IF(.NOT. L1D) LHORELAX_SV(1:NSV)=.TRUE. !------------------------------------------------------------------------------- ! !* 4. ALLOCATE MEMORY FOR ARRAYS : -! ---------------------------- +! ---------------------------- ! !* 4.1 Vertical Spatial grid ! @@ -1209,7 +1209,7 @@ END IF !------------------------------------------------------------------------------- ! !* 5. INITIALIZE ALL THE MODEL VARIABLES -! ---------------------------------- +! ---------------------------------- ! ! !* 5.1 Grid variables and RS localization: @@ -1366,8 +1366,8 @@ IF ( LEN_TRIM(CPGD_FILE) == 0 .OR. .NOT. LREAD_ZS) THEN ZDIST = XXHAT(JILOOP)-REAL(NIZS)*XDELTAX XZS(JILOOP,:) = XHMAX*(XAX**2)/(XAX**2+ZDIST**2) END DO - ELSE ! three dimensionnal case - infinite profile in y direction - DO JILOOP = 1, NIU + ELSE ! three dimensionnal case - infinite profile in y direction + DO JILOOP = 1, NIU ZDIST = XXHAT(JILOOP)-REAL(NIZS)*XDELTAX XZS(JILOOP,:) = XHMAX*(XAX**2)/(XAX**2+ZDIST**2) END DO @@ -1735,8 +1735,8 @@ END IF ! !------------------------------------------------------------------------------- ! -!* 6. INITIALIZE SCALAR VARIABLES FOR CHEMISTRY -! ----------------------------------------- +!* 6. INITIALIZE SCALAR VARIABLES FOR CHEMISTRY +! ----------------------------------------- ! ! before calling chemistry CCONF = 'START' @@ -1750,8 +1750,8 @@ IF (CCLOUD == 'LIMA' .AND. ((LORILAM).OR.(LDUST).OR.(LSALT))) & CALL AER2LIMA(XSVT, XRHODREF, XRT(:,:,:,1), XPABST, XTHT, XZZ) !------------------------------------------------------------------------------- ! -!* 7. INITIALIZE LEVELSET FOR IBM -! --------------------------- +!* 7. INITIALIZE LEVELSET FOR IBM +! --------------------------- ! IF (LIBM_LSF) THEN ! @@ -1770,8 +1770,8 @@ ENDIF ! !------------------------------------------------------------------------------- ! -!* 8. WRITE THE FMFILE -! ---------------- +!* 8. WRITE THE FMFILE +! ---------------- ! CALL SECOND_MNH2(ZTIME1) ! diff --git a/src/MNH/prep_nest_pgd.f90 b/src/MNH/prep_nest_pgd.f90 index 7f57b0c9e..8957186bc 100644 --- a/src/MNH/prep_nest_pgd.f90 +++ b/src/MNH/prep_nest_pgd.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -77,7 +77,7 @@ !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90 index 8e1a7322e..67ca4cd85 100644 --- a/src/MNH/prep_real_case.f90 +++ b/src/MNH/prep_real_case.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -312,7 +312,7 @@ !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/press_height.f90 b/src/MNH/press_height.f90 index 298eca65d..39568a872 100644 --- a/src/MNH/press_height.f90 +++ b/src/MNH/press_height.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -82,7 +82,7 @@ END MODULE MODI_PRESS_HEIGHT !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -116,8 +116,8 @@ REAL :: ZEXNGROUND ! Exner function at ground level INTEGER :: JK ! Loop index !------------------------------------------------------------------------------- ! -!* 1. COMPUTE PRESSURE -! ---------------- +!* 1. COMPUTE PRESSURE +! ---------------- ! ZGSCPD = XG / XCPD ZCPDSRD = XCPD / XRD diff --git a/src/MNH/pressure_in_prep.f90 b/src/MNH/pressure_in_prep.f90 index e5d004e09..c80a08d6c 100644 --- a/src/MNH/pressure_in_prep.f90 +++ b/src/MNH/pressure_in_prep.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1998-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1998-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -54,7 +54,7 @@ END MODULE MODI_PRESSURE_IN_PREP !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/qlap.f90 b/src/MNH/qlap.f90 index 4502200a9..9762a9415 100644 --- a/src/MNH/qlap.f90 +++ b/src/MNH/qlap.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -98,7 +98,7 @@ END MODULE MODI_QLAP !! !! AUTHOR !! ------ -!! P. Hereil and J. Stein * Meteo France * +!! P. Hereil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/rad_bound.f90 b/src/MNH/rad_bound.f90 index 22c423583..a50c1aeed 100644 --- a/src/MNH/rad_bound.f90 +++ b/src/MNH/rad_bound.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -116,7 +116,7 @@ END MODULE MODI_RAD_BOUND !! !! AUTHOR !! ------ -!! J.-P. Lafore J. Stein * Meteo France * +!! J.-P. Lafore J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/radar_c2r2.f90 b/src/MNH/radar_c2r2.f90 index 4a5f14411..905e8a904 100644 --- a/src/MNH/radar_c2r2.f90 +++ b/src/MNH/radar_c2r2.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -114,16 +114,16 @@ REAL, DIMENSION(:,:,:), INTENT(OUT) :: PVVRE! vert. pol. reflectivity (mm6/m3) INTEGER :: IKB ! Coordinates of the first physical points along z INTEGER :: IND ! Number of interval to integrate the kernels REAL :: ZALPHA, ZNU, ZP ! Parameters to compute the value of the p_moment - ! of the generalized Gamma function + ! of the generalized Gamma function REAL :: ZDINFTY ! Factor used to define the "infinite" diameter ! REAL :: ZCXR=-1.0 ! for rain N ~ 1/N_0 ! (in Kessler parameterization) REAL :: ZSLOPE, ZINTERCEPT, ZEXPONENT ! parameters defining the mean axis ratio - ! functionnal + ! functionnal REAL :: ZDMELT_FACT ! factor used to compute the equivalent - ! melted diameter - ! water reflectivity (from Smith, JCAM 84) + ! melted diameter + ! water reflectivity (from Smith, JCAM 84) REAL :: ZEXP ! anciliary parameter REAL :: ZRHO00 ! Surface reference air density ! @@ -145,7 +145,7 @@ REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZWLBDC ! ! !* 1. FUNCTION STATEMENTS -! ------------------- +! ------------------- ! ! !* 1.1 p_moment of the Generalized GAMMA function diff --git a/src/MNH/radar_scattering.f90 b/src/MNH/radar_scattering.f90 index 047cb5800..5cfa419c3 100644 --- a/src/MNH/radar_scattering.f90 +++ b/src/MNH/radar_scattering.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2004-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2004-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -688,7 +688,7 @@ DO JI=1,INBRAD IF(NDIFF==7) THEN ! If T-MATRIX !--------------------------------------------------------------------------------------------- - ! 0. LECTURE DES TABLES TMAT POUR PLUIE, NEIGE, GRAUPEL + ! 0. LECTURE DES TABLES TMAT POUR PLUIE, NEIGE, GRAUPEL ! en fonction de la bande frequence !--------------------------------------------------------------------------------------------- IF ( XLAM_RAD(JI)==0.1062) THEN @@ -1107,13 +1107,13 @@ DO JI=1,INBRAD ! or each diameter D ZREFLOC(1:3)=ZREFLOC(1:3)+ZQBACK(1:3)*ZX(JJ)**2*ZW(JJ) ZREFLOC(4)=ZREFLOC(4)+ZQBACK(1)*ZX(JJ)**(2+ZDR)*ZW(JJ) - !same for attenuation with extinction coefficient + !same for attenuation with extinction coefficient IF(LATT) ZAETMP(:)=ZAETMP(:)+ZQEXT(:)*ZX(JJ)**2*ZW(JJ) END DO ! ****** end loop Gauss-Laguerre quadrature ZREFLOC(1:2)=1.E18*ZREFLOC(1:2)*(XLAM_RAD(JI)/XPI)**4/.93*ZCCR/4./ZLBDA**3 ZREFLOC(3)=ZREFLOC(3)*XPI**2/6./XLAM_RAD(JI)*ZCCR/ZLBDA & - *180.E3/XPI ! (in deg/km) + *180.E3/XPI ! (in deg/km) ZREFL(JI,JEL,JAZ,JL,JH,JV,IVDOP)=PVDOP_RAY(JI,JEL,JAZ,JL,JH,JV)*ZREFLOC(1) & -ZCR*SIN(PELEV(JI,JEL,JL,JV))*ZREFLOC(4) & *1.E18*(XLAM_RAD(JI)/XPI)**4/.93*ZCCR/4./ZLBDA**(3+ZDR) @@ -1148,7 +1148,7 @@ DO JI=1,INBRAD ZAVRINT=ZAVRINT*EXP(-2.*ZREFL(JI,JEL,JAZ,JL-1,JH,JV,IAVR)*XSTEP_RAD) END IF ZREFL(JI,JEL,JAZ,JL,JH,JV,IZER)=ZREFL(JI,JEL,JAZ,JL,JH,JV,IZER)*ZAERINT ! Z_r attenuated - ZREFL(JI,JEL,JAZ,JL,JH,JV,IZDA)=ZREFL(JI,JEL,JAZ,JL,JH,JV,IZDA)*ZAVRINT ! ZVr attenuated + ZREFL(JI,JEL,JAZ,JL,JH,JV,IZDA)=ZREFL(JI,JEL,JAZ,JL,JH,JV,IZDA)*ZAVRINT ! ZVr attenuated END IF !end IF(LATT) END IF ! mimimum rainwater mixing ratio @@ -1930,7 +1930,7 @@ DO JI=1,INBRAD ELSE ZVTEMP(:)=ZVTEMP(:)+ZREFL(JI,JEL,JAZ,JL,JH,JV,:)*PW_V(ABS((2*JV-INPTS_V-1)/2)+1) END IF - END DO ! End loop on JV + END DO ! End loop on JV ! IF(LQUAD) THEN PZE(JI,JEL,JAZ,JL,:)=PZE(JI,JEL,JAZ,JL,:)+ZVTEMP(1:SIZE(PZE,5))*PW_H(ABS((2*JH-INPTS_H-1)/2)+1) & diff --git a/src/MNH/radar_simulator.f90 b/src/MNH/radar_simulator.f90 index d03bfb657..31fda9972 100644 --- a/src/MNH/radar_simulator.f90 +++ b/src/MNH/radar_simulator.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2004-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2004-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -260,7 +260,7 @@ REAL, DIMENSION(:,:,:,:,:,:),ALLOCATABLE :: ZWORK ! ! !* 1. INITIALIZATION -! -------------- +! -------------- ! ! !* 1.1 IO and dimensions initialization diff --git a/src/MNH/radiations.f90 b/src/MNH/radiations.f90 index 246c30f19..287a9c545 100644 --- a/src/MNH/radiations.f90 +++ b/src/MNH/radiations.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -79,7 +79,7 @@ CONTAINS !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Pinty * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- @@ -767,7 +767,7 @@ END IF !------------------------------------------------------------------------------- ! !* 3. INITIALIZES THE HALF-LEVEL VARIABLES -! ------------------------------------ +! ------------------------------------ ! ALLOCATE(ZPRES_HL(KDLON,KFLEV+1)) ALLOCATE(ZT_HL(KDLON,KFLEV+1)) @@ -832,7 +832,7 @@ DO JKRAD=1,KFLEV END DO !----------------------------------------------------------------------- !* 4. INITIALIZES THE AEROSOLS and OZONE PROFILES from climatology -! ------------------------------------------- +! ------------------------------------------- ! ! 4.1 AEROSOL optical thickness ! EXPL -> defined online, otherwise climatology @@ -1100,7 +1100,7 @@ POZON = POZON !------------------------------------------------------------------------------- ! !* 5. CALLS THE E.C.M.W.F. RADIATION CODE -! ----------------------------------- +! ----------------------------------- ! ! !* 5.1 INITIALIZES 2D AND SURFACE FIELDS diff --git a/src/MNH/radiations_agg.f90 b/src/MNH/radiations_agg.f90 index f06055180..ee925f125 100644 --- a/src/MNH/radiations_agg.f90 +++ b/src/MNH/radiations_agg.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -155,7 +155,7 @@ END MODULE MODI_RADIATIONS_AGG !! !! AUTHOR !! ------ -!! V. Masson * CNRM * +!! V. Masson * CNRM * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/read_all_data_mesonh_case.f90 b/src/MNH/read_all_data_mesonh_case.f90 index f9c741227..59b215b64 100644 --- a/src/MNH/read_all_data_mesonh_case.f90 +++ b/src/MNH/read_all_data_mesonh_case.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -84,7 +84,7 @@ END MODULE MODI_READ_ALL_DATA_MESONH_CASE !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/read_desfmn.f90 b/src/MNH/read_desfmn.f90 index 64049e925..9bd8cc548 100644 --- a/src/MNH/read_desfmn.f90 +++ b/src/MNH/read_desfmn.f90 @@ -151,7 +151,7 @@ END MODULE MODI_READ_DESFM_n !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/read_dummy_gr_fieldn.f90 b/src/MNH/read_dummy_gr_fieldn.f90 index edb10fbbf..3411581a4 100644 --- a/src/MNH/read_dummy_gr_fieldn.f90 +++ b/src/MNH/read_dummy_gr_fieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -63,7 +63,7 @@ END MODULE MODI_READ_DUMMY_GR_FIELD_n !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/read_exsegn.f90 b/src/MNH/read_exsegn.f90 index cd9f74ac1..91216a6ab 100644 --- a/src/MNH/read_exsegn.f90 +++ b/src/MNH/read_exsegn.f90 @@ -200,7 +200,7 @@ END MODULE MODI_READ_EXSEG_n !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/read_field.f90 b/src/MNH/read_field.f90 index fd5bf06f1..e41590a7a 100644 --- a/src/MNH/read_field.f90 +++ b/src/MNH/read_field.f90 @@ -212,7 +212,7 @@ END MODULE MODI_READ_FIELD !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/read_grid_time_mesonh_case.f90 b/src/MNH/read_grid_time_mesonh_case.f90 index 51b1d1c98..e678fa1a6 100644 --- a/src/MNH/read_grid_time_mesonh_case.f90 +++ b/src/MNH/read_grid_time_mesonh_case.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -72,7 +72,7 @@ END MODULE MODI_READ_GRID_TIME_MESONH_CASE !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/read_prc_fmfile.f90 b/src/MNH/read_prc_fmfile.f90 index 915c2d970..76f058f41 100644 --- a/src/MNH/read_prc_fmfile.f90 +++ b/src/MNH/read_prc_fmfile.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -66,7 +66,7 @@ END MODULE MODI_READ_PRC_FMFILE !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/read_precip_field.f90 b/src/MNH/read_precip_field.f90 index 3fb16bdf4..d3df69f26 100644 --- a/src/MNH/read_precip_field.f90 +++ b/src/MNH/read_precip_field.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -81,7 +81,7 @@ END MODULE MODI_READ_PRECIP_FIELD !! !! AUTHOR !! ------ -!! J.-P. Pinty *Laboratoire d'Aerologie* +!! J.-P. Pinty *Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/read_ver_grid.f90 b/src/MNH/read_ver_grid.f90 index 2b28a476b..60cd4e4f6 100644 --- a/src/MNH/read_ver_grid.f90 +++ b/src/MNH/read_ver_grid.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -85,7 +85,7 @@ END MODULE MODI_READ_VER_GRID !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/rel_forcingn.f90 b/src/MNH/rel_forcingn.f90 index 7de540539..88dcf383d 100644 --- a/src/MNH/rel_forcingn.f90 +++ b/src/MNH/rel_forcingn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2010-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2010-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -85,7 +85,7 @@ END MODULE MODI_REL_FORCING_n !! !! AUTHOR !! ------ -!! M. Tomasini (CNRM) from forcing.f90 +!! M. Tomasini (CNRM) from forcing.f90 !! and P.Peyrille (CNRM) !! !! MODIFICATIONS @@ -187,7 +187,7 @@ IF (GSFIRSTCALL) THEN END IF ! !* 2. INTEGRATION OF TH and RV ADVECTING FORCINGS TENDANCY IN THE SOURCES -! --------------------------------------------------------------------- +! --------------------------------------------------------------------- ! ! 2.1 Temporal interpolation of each term ! ------------------------------------------ @@ -248,7 +248,7 @@ END IF END WHERE ! !* 3. BUDGET CALLS -! ------------ +! ------------ if ( lbudget_th ) call Budget_store_end( tbudgets(NBUDGET_TH), '2DREL', prths(:, :, :) ) if ( lbudget_rv ) call Budget_store_end( tbudgets(NBUDGET_RV), '2DREL', prrs (:, :, :, 1) ) diff --git a/src/MNH/relax2fw_ion.f90 b/src/MNH/relax2fw_ion.f90 index df2dafc7e..f19554024 100644 --- a/src/MNH/relax2fw_ion.f90 +++ b/src/MNH/relax2fw_ion.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2010-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2010-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -153,7 +153,7 @@ REAL, DIMENSION(SIZE(PSVM,1),SIZE(PSVM,2)) :: ZKH !------------------------------------------------------------------------------- ! !* 1. PRELIMINARIES -! ------------- +! ------------- if ( lbudget_sv ) then call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg), 'REL', prsvs(:, :, :, nsv_elecbeg) ) @@ -168,7 +168,7 @@ CALL GET_INDICE_ll(IIB,IJB,IIE,IJE) !------------------------------------------------------------------------------- ! !* 2. RELAXATION IN THE UPPER LAYERS -! ------------------------------ +! ------------------------------ ! !* 2.1 set the top-level damping coef. (upstream or leapfrog) ! @@ -188,7 +188,7 @@ CALL GET_INDICE_ll(IIB,IJB,IIE,IJE) !------------------------------------------------------------------------------- ! !* 3. RELAXATION IN THE OUTERMOST VERTICAL PLANES -! ------------------------------------------- +! ------------------------------------------- ! !* 3.1 set the rim zone damping coef. (upstream or leapfrog) ! only for the father model @@ -215,7 +215,7 @@ END IF !------------------------------------------------------------------------------- ! !* 4. STORES FIELDS IN BUDGET ARRAYS -! ------------------------------ +! ------------------------------ ! if ( lbudget_sv ) then call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg), 'REL', prsvs(:, :, :, nsv_elecbeg) ) diff --git a/src/MNH/relaxation.f90 b/src/MNH/relaxation.f90 index 1b359718e..a78ab9473 100644 --- a/src/MNH/relaxation.f90 +++ b/src/MNH/relaxation.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -444,7 +444,7 @@ LOGICAL, DIMENSION(13) :: GHORELAXSV! local array of logical ! ! !* 1. PRELIMINARIES -! ------------- +! ------------- IKU=SIZE(PUT,3) IKE=IKU-JPVEXT CALL GET_INDICE_ll(IIB,IJB,IIE,IJE) @@ -505,7 +505,7 @@ GHORELAXSV(14) = OHORELAX_SVFF !------------------------------------------------------------------------------- ! !* 2. RELAXATION IN THE UPPER LAYERS -! ------------------------------ +! ------------------------------ ! IF(OVE_RELAX) THEN ! @@ -542,7 +542,7 @@ END IF !------------------------------------------------------------------------------- ! !* 2.bis RELAXATION IN THE GROUND LAYERS -! ------------------------------ +! ------------------------------ ! IF(OVE_RELAX_GRD) THEN ! @@ -581,7 +581,7 @@ END IF !------------------------------------------------------------------------------- ! !* 3. RELAXATION IN THE OUTERMOST VERTICAL PLANES -! ------------------------------------------- +! ------------------------------------------- ! ! !* 3.1 SET THE RIM ZONE DAMPING COEF. (UPSTREAM OR LEAPFROG) @@ -738,7 +738,7 @@ END DO !------------------------------------------------------------------------------- ! !* 3. STORES FIELDS IN BUDGET ARRAYS -! ------------------------------ +! ------------------------------ ! CALL EXTRAPOL('W ', PRUS) diff --git a/src/MNH/relaxdef.f90 b/src/MNH/relaxdef.f90 index 216dc0389..2a454d1fe 100644 --- a/src/MNH/relaxdef.f90 +++ b/src/MNH/relaxdef.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -213,7 +213,7 @@ END MODULE MODI_RELAXDEF !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie * +!! J.-P. Pinty * Laboratoire d'Aerologie * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/removal_vortex.f90 b/src/MNH/removal_vortex.f90 index 5d188015a..ba9c2ffa5 100644 --- a/src/MNH/removal_vortex.f90 +++ b/src/MNH/removal_vortex.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2001-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2001-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -61,7 +61,7 @@ END MODULE MODI_REMOVAL_VORTEX !! !! AUTHOR !! ------ -!! O. Nuissier * L.A * +!! O. Nuissier * L.A * !! R. Rogers * NOAA/AOML/HRD * !! !! MODIFICATIONS @@ -149,7 +149,7 @@ INTEGER :: IRESP ! Return code of FM-routines ! !------------------------------------------------------------------------------- ! -!* 1. INITIALIZATIONS +!* 1. INITIALIZATIONS ! --------------- ! ILUOUT0 = TLUOUT0%NLU diff --git a/src/MNH/retrieve1_nest_infon.f90 b/src/MNH/retrieve1_nest_infon.f90 index 8edcfee38..e54b90626 100644 --- a/src/MNH/retrieve1_nest_infon.f90 +++ b/src/MNH/retrieve1_nest_infon.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -75,7 +75,7 @@ END MODULE MODI_RETRIEVE1_NEST_INFO_n !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/retrieve2_nest_infon.f90 b/src/MNH/retrieve2_nest_infon.f90 index f0a138d1a..20b8f6ad5 100644 --- a/src/MNH/retrieve2_nest_infon.f90 +++ b/src/MNH/retrieve2_nest_infon.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -80,7 +80,7 @@ END MODULE MODI_RETRIEVE2_NEST_INFO_n !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -325,19 +325,19 @@ ENDIF ZERROR_X=MINVAL(ABS(XPGDXHAT(:)-ZXHATFIRSTENTRY_C)) ZERROR_Y=MINVAL(ABS(XPGDYHAT(:)-ZYHATFIRSTENTRY_C)) IF ( ZERROR_X+ZERROR_Y > ZEPS ) THEN - WRITE(ILUOUT,*) 'the first physical flux point of model ',KDAD,' does not correspond' - WRITE(ILUOUT,*) 'to any of its father.' - WRITE(ILUOUT,*) 'error on x and y : ', ZERROR_X,ZERROR_Y + WRITE(ILUOUT,*) 'the first physical flux point of model ',KDAD,' does not correspond' + WRITE(ILUOUT,*) 'to any of its father.' + WRITE(ILUOUT,*) 'error on x and y : ', ZERROR_X,ZERROR_Y !callabortstop !CALL ABORT ! STOP END IF ! ELSE ! IF (MINVAL(ABS(ZPGDLAT1(:,:)-ZLAT2)+ABS(ZPGDLON1(:,:)-ZLON2))>ZEPS) THEN -! WRITE(ILUOUT,*) 'the first physical flux point of model ',KDAD,' does not correspond' -! WRITE(ILUOUT,*) 'to any of its father.' -! WRITE(ILUOUT,*) 'sum of error on latitude and longitude: ', & -! MINVAL(ABS(ZPGDLAT1(:,:)-ZLAT2)+ABS(ZPGDLON1(:,:)-ZLON2)) +! WRITE(ILUOUT,*) 'the first physical flux point of model ',KDAD,' does not correspond' +! WRITE(ILUOUT,*) 'to any of its father.' +! WRITE(ILUOUT,*) 'sum of error on latitude and longitude: ', & +! MINVAL(ABS(ZPGDLAT1(:,:)-ZLAT2)+ABS(ZPGDLON1(:,:)-ZLON2)) !callabortstop !CALL ABORT ! STOP diff --git a/src/MNH/richardson.f90 b/src/MNH/richardson.f90 index 7f80f4a6d..e99b76839 100644 --- a/src/MNH/richardson.f90 +++ b/src/MNH/richardson.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -119,7 +119,7 @@ END MODULE MODI_RICHARDSON !! !! AUTHOR !! ------ -!! P. HÅreil and J. Stein * Meteo France * +!! P. H�reil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/series_cloud_elec.f90 b/src/MNH/series_cloud_elec.f90 index e92875be3..260a17bbb 100644 --- a/src/MNH/series_cloud_elec.f90 +++ b/src/MNH/series_cloud_elec.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2010-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2010-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -204,7 +204,7 @@ LOGICAL, SAVE :: GFIRSTCALL = .TRUE. !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS AND SOME PARAMETERS -! ------------------------------------------- +! ------------------------------------------- ! JCOUNT_STOP = INT(NTSAVE_SERIES/PTSTEP) ! @@ -278,7 +278,7 @@ DEALLOCATE(ZLAMBDAG) !------------------------------------------------------------------------------- ! !* 2. INITIALIZE THE VARIABLES -! ------------------------ +! ------------------------ ! IF (GFIRSTCALL) THEN GFIRSTCALL = .FALSE. diff --git a/src/MNH/set_advfrc.f90 b/src/MNH/set_advfrc.f90 index b2d3a3891..358ca83cb 100644 --- a/src/MNH/set_advfrc.f90 +++ b/src/MNH/set_advfrc.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2013-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2013-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -135,20 +135,20 @@ REAL, DIMENSION(:), ALLOCATABLE:: ZLAT_FRC CHARACTER(LEN=6) :: YADV ! choice of zfrc or pfrc !------------------------------------------------------------------------------- ! -print*,"!* 1. PROLOGUE : RETRIEVE LOGICAL UNIT NUMBERS " -! ---------------------------------------- +print*,"!* 1. PROLOGUE : RETRIEVE LOGICAL UNIT NUMBERS " +! ---------------------------------------- ! ILUPRE = TPEXPREFILE%NLU ILUOUT = TLUOUT%NLU ! !------------------------------------------------------------------------------- ! -print*,"!* 2. COMPUTE FORCING FIELDS PROFILES" -! ------------------------------- +print*,"!* 2. COMPUTE FORCING FIELDS PROFILES" +! ------------------------------- ZRVSRD = XRV/XRD ! ! -! 2.1 Compute array size and allocate memory +! 2.1 Compute array size and allocate memory ! READ(ILUPRE,*) NADVFRC ! Number of time-dependent forcing soundings READ(ILUPRE,*) YADV ! type of advection file (PADV, or ZADV) @@ -201,7 +201,7 @@ XDTHFRC(:,:,:,:) = 0. ! ! print*,"! 3. READ ASCII FILES FOR ADVECTIVE FORCING " -! ------------------------------- +! ------------------------------- DO JKT = 1,NADVFRC ! diff --git a/src/MNH/set_bogus_vortex.f90 b/src/MNH/set_bogus_vortex.f90 index b0a881e28..db429e837 100644 --- a/src/MNH/set_bogus_vortex.f90 +++ b/src/MNH/set_bogus_vortex.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2001-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2001-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -57,7 +57,7 @@ END MODULE MODI_SET_BOGUS_VORTEX !! !! AUTHOR !! ------ -!! O. Nuissier * L.A * +!! O. Nuissier * L.A * !! R. Rogers * NOAA/AOML/HRD * !! !! MODIFICATIONS @@ -80,7 +80,7 @@ USE MODE_MSG ! USE MODD_HURR_CONF, ONLY: XLATBOG,XLONBOG,XVTMAXSURF,XRADWINDSURF, & XANGCONV0,XANGCONV1000,XANGCONV2000, & - XB_0, XMAX + XB_0, XMAX USE MODD_PARAMETERS, ONLY: XUNDEF,JPVEXT USE MODD_LUNIT, ONLY: TLUOUT0 USE MODD_CST, ONLY: XPI,XOMEGA @@ -114,7 +114,7 @@ REAL,DIMENSION(:,:,:), ALLOCATABLE :: ZZHAT3D,ZZHATM ! altitude of mass points REAL,DIMENSION(:) , ALLOCATABLE :: ZZ_REF,ZTH_REF,ZZETA REAL,DIMENSION(:) , ALLOCATABLE :: ZVT_GRID,ZVR_GRID,ZTH_GRID REAL,DIMENSION(:) , ALLOCATABLE :: ZANGCONV ! Angle de convergence - ! en fonction de l altitude + ! en fonction de l altitude ! REAL :: ZRADBOGMAX ! Maximum for the bogus vortex REAL :: ZXK,ZYK @@ -195,7 +195,7 @@ END IF ! !------------------------------------------------------------------------------- ! -!* 3. DETERMINATION OF RADIAL EXTENSION OF THE VORTEX +!* 3. DETERMINATION OF RADIAL EXTENSION OF THE VORTEX ! ----------------------------------------------- ! In order to assume a coherent representation of the vortex ! in the different domains, we select a criterion on Vt which @@ -241,7 +241,7 @@ DEALLOCATE(ZZHAT3D) ! ! Definition de l angle de convergence ! Forme lineaire de 0-1km puis 1-2km puis angle constant (nul) -! d'après litterature +! d'apr�s litterature ALLOCATE(ZANGCONV(IKU)) ZANGCONV(:)=0. DO JK = 1, IKU @@ -306,24 +306,24 @@ DO JJ = 1, IJU ! a) Vt obeys to the Holland's formulation ! integration en ZETA CALL HOLLAND_VT(ZZETA(IREF_MAX),ZZETA,ZR,ZCORIO,ZVT_GRID) - IF (ZR < XRADWINDSURF*1000.) THEN + IF (ZR < XRADWINDSURF*1000.) THEN ! Vr exist only for R>XRADWINDSURF - ZVR_GRID(1:IREF_MAX) = 0. + ZVR_GRID(1:IREF_MAX) = 0. ELSE ZVR_GRID(1:IREF_MAX) = ZVT_GRID(1:IREF_MAX) * & TAN( ZANGCONV(1:IREF_MAX) ) END IF ! Reverse the signe of tangentiel wind when it is in southern hemisphere IF (XLATBOG<0.) THEN - ZVT_GRID = -ZVT_GRID + ZVT_GRID = -ZVT_GRID END IF ! ! Compute u and v from Vt ZU_BOG(JI,JJ,1:IREF_MAX) = - ZVT_GRID(1:IREF_MAX) * SIN(ZPHI) - & - ZVR_GRID(1:IREF_MAX) * COS(ZPHI) + ZVR_GRID(1:IREF_MAX) * COS(ZPHI) ZV_BOG(JI,JJ,1:IREF_MAX) = ZVT_GRID(1:IREF_MAX) * COS(ZPHI) - & - ZVR_GRID(1:IREF_MAX) * SIN(ZPHI) + ZVR_GRID(1:IREF_MAX) * SIN(ZPHI) ENDIF ! diff --git a/src/MNH/set_cstn.f90 b/src/MNH/set_cstn.f90 index 31f00cb4d..74a21e00b 100644 --- a/src/MNH/set_cstn.f90 +++ b/src/MNH/set_cstn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -148,7 +148,7 @@ END MODULE MODI_SET_CSTN !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -254,9 +254,9 @@ LOGICAL :: GPROFILE_IN_PROC ! T : initialization profile is in current ! !------------------------------------------------------------------------------- ! -!* 1. PROLOGUE : RETRIEVE LOGICAL UNIT NUMBERS AND INITIALIZE SOME +!* 1. PROLOGUE : RETRIEVE LOGICAL UNIT NUMBERS AND INITIALIZE SOME ! CONSTANTS -! ------------------------------------------------------------ +! ------------------------------------------------------------ ! ILUPRE = TPEXPREFILE%NLU ! @@ -266,8 +266,8 @@ CALL GET_OR_ll('B',IXOR_ll,IYOR_ll) ZRDSCPD = XRD / XCPD !------------------------------------------------------------------------------- ! -!* 2. READ DATA -! --------- +!* 2. READ DATA +! --------- ! !* 2.1 Read levels number of and allocate memory ! @@ -289,8 +289,8 @@ READ(ILUPRE,*) ZNV ! !------------------------------------------------------------------------------- ! -!* 3. COMPUTE THETAV -! -------------- +!* 3. COMPUTE THETAV +! -------------- ! DO JK = 2,ILEVEL ZTHV(JK) = ZTHV(JK-1) * EXP((ZNV(JK-1)**2) * (ZHEIGHT(JK)-ZHEIGHT(JK-1))/XG) @@ -299,8 +299,8 @@ END DO ! !------------------------------------------------------------------------------- ! -!* 4. INTERPOLATE ON THE VERTICAL MIXED MODEL GRID -! --------------------------------------------------------- +!* 4. INTERPOLATE ON THE VERTICAL MIXED MODEL GRID +! --------------------------------------------------------- ! IKU=SIZE(XZHAT) ! @@ -408,8 +408,8 @@ ZMRM(:) = SM_PMR_HU(ZPM(:),ZTVM(:),ZHUM(:), & ! mixing ratio !------------------------------------------------------------------------------- ! -!* 5. COMPUTE FIELDS ON THE MODEL GRID (WITH OROGRAPHY) -! ------------------------------------------------- +!* 5. COMPUTE FIELDS ON THE MODEL GRID (WITH OROGRAPHY) +! ------------------------------------------------- ! IF (PRESENT(PCORIOZ)) THEN CALL SET_MASS(TPFILE,GPROFILE_IN_PROC, ZZFLUX_PROFILE, & diff --git a/src/MNH/set_mask.f90 b/src/MNH/set_mask.f90 index 36300b07e..aad05fced 100644 --- a/src/MNH/set_mask.f90 +++ b/src/MNH/set_mask.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -43,7 +43,7 @@ !! !! AUTHOR !! ------ -!! J. Nicolau * Meteo France * +!! J. Nicolau * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -79,7 +79,7 @@ INTEGER :: IIE,IJE ! Upper bounds of the physical ! CALL GET_INDICE_ll(IIB,IJB,IIE,IJE) ! -!* 2. DEFINITION OF THE MASK +!* 2. DEFINITION OF THE MASK ! ---------------------- ! initialization to FALSE on the extended subdomain LBU_MASK(:,:,:)=.FALSE. @@ -97,7 +97,7 @@ IF (NBUMASK>=2) & ! !============================================================================== ! -!* 3. INCREASE IN SURFACE ARRAY +!* 3. INCREASE IN SURFACE ARRAY ! ------------------------- ! WHERE (LBU_MASK(:,:,:)) diff --git a/src/MNH/set_mass.f90 b/src/MNH/set_mass.f90 index b3402a0e3..924e34ee5 100644 --- a/src/MNH/set_mass.f90 +++ b/src/MNH/set_mass.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2010-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2010-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -244,7 +244,7 @@ TYPE(LIST_ll), POINTER :: TZFIELDS_ll=>NULL() ! list of fields to exchange !------------------------------------------------------------------------------- ! !------------------------------------------------------------------------------- -!* 1. PROLOGUE : INITIALIZE SOME CONSTANTS +!* 1. PROLOGUE : INITIALIZE SOME CONSTANTS !------------------------------------------------------------------------------- ! IIU=SIZE(XXHAT) diff --git a/src/MNH/set_msk.f90 b/src/MNH/set_msk.f90 index ba4da88bf..295f93e75 100644 --- a/src/MNH/set_msk.f90 +++ b/src/MNH/set_msk.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -55,7 +55,7 @@ END MODULE MODI_SET_MSK !! !! AUTHOR !! ------ -!! J. Nicolau * Meteo France * +!! J. Nicolau * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -137,7 +137,7 @@ ALLOCATE(ZMEANX_MY(IIU,IJU),ZMEANX_PY(IIU,IJU),ZMEANXY(IIU,IJU)) ALLOCATE( ZCONVECT(IIU,IJU) ) ALLOCATE( ZMAXWATER(IIU,IJU) ) ! -!* 2. DEFINITION OF THE MASK +!* 2. DEFINITION OF THE MASK ! ---------------------- ! initialization to FALSE on the extended subdomain OBU_MSK(:,:,:)=.FALSE. @@ -271,7 +271,7 @@ OBU_MSK(IIB:IIE,IJB:IJE,:)=ZMASK(IIB:IIE,IJB:IJE,:)>0.8 ! -!* 2. INCREASE IN SURFACE ARRAY +!* 2. INCREASE IN SURFACE ARRAY ! ------------------------- ! DEALLOCATE( ZMASK ) diff --git a/src/MNH/set_perturb.f90 b/src/MNH/set_perturb.f90 index c35565007..d6c20cf4a 100644 --- a/src/MNH/set_perturb.f90 +++ b/src/MNH/set_perturb.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -77,7 +77,7 @@ END MODULE MODI_SET_PERTURB !! !! AUTHOR !! ------ -!! J.Stein * Meteo France * +!! J.Stein * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -203,7 +203,7 @@ NAMELIST/NAM_PERT_PRE/CPERT_KIND,XAMPLITH, &! Perturbation parameters XAMPLIUV,XAMPLIWH,NKWH,LWH_LBXU,LWH_LBYV !------------------------------------------------------------------------------- ! -!* 1. PROLOGUE : +!* 1. PROLOGUE : ! ---------- ! !* 1.1 Retrieve unit numbers and read namelist @@ -255,7 +255,7 @@ ELSE ENDIF !------------------------------------------------------------------------------- ! -!* 2. COMPUTE THE PERTURBATION ON THETA : +!* 2. COMPUTE THE PERTURBATION ON THETA : ! ----------------------------------- ! SELECT CASE(CPERT_KIND) @@ -317,7 +317,7 @@ SELECT CASE(CPERT_KIND) ! !------------------------------------------------------------------------------- ! -!* 3. COMPUTE THE PERTURBATION ON THE WIND : +!* 3. COMPUTE THE PERTURBATION ON THE WIND : ! -------------------------------------- ! CASE('UV') @@ -496,9 +496,9 @@ SELECT CASE(CPERT_KIND) !------------------------------------------------------------------------------- ! -!* 4. LATERAL BOUNDARY CONDITIONS : +!* 4. LATERAL BOUNDARY CONDITIONS : ! ----------------------------- -! +! ! IF (CPERT_KIND=='WH') THEN ! white noise on theta IF (LWEST_ll() .AND. CLBCX(1)/='CYCL') & diff --git a/src/MNH/set_ref.f90 b/src/MNH/set_ref.f90 index 02496e920..94fb1f809 100644 --- a/src/MNH/set_ref.f90 +++ b/src/MNH/set_ref.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -122,7 +122,7 @@ END MODULE MODI_SET_REF !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -445,7 +445,7 @@ IF ( SIZE(PRVREF,1) /= 0 ) CALL MPPDB_CHECK3D(PRVREF,"SET_REF::PRVREF",PRECISION CALL MPPDB_CHECK3D(PRHODJ,"SET_REF::PRHODJ",PRECISION) ! !* 6. COMPUTES THE TOTAL MASS OF REFERENCE ATMOSPHERE -! ----------------------------------------------- +! ----------------------------------------------- ! IF (CEQNSYS == "LHE" ) THEN ZCVD_O_RDCPD = ZCVD_O_RD / XCPD diff --git a/src/MNH/set_refz.f90 b/src/MNH/set_refz.f90 index 7822c7e60..d071a8d15 100644 --- a/src/MNH/set_refz.f90 +++ b/src/MNH/set_refz.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -105,7 +105,7 @@ END MODULE MODI_SET_REFZ !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/set_relfrc.f90 b/src/MNH/set_relfrc.f90 index 8c25690dd..35ded2496 100644 --- a/src/MNH/set_relfrc.f90 +++ b/src/MNH/set_relfrc.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2013-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2013-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -136,20 +136,20 @@ REAL, DIMENSION(:), ALLOCATABLE:: ZLAT_FRC CHARACTER(LEN=6) :: YREL ! choice of zfrc or pfrc !------------------------------------------------------------------------------- ! -print*,"!* 1. PROLOGUE : RETRIEVE LOGICAL UNIT NUMBERS" -! ---------------------------------------- +print*,"!* 1. PROLOGUE : RETRIEVE LOGICAL UNIT NUMBERS" +! ---------------------------------------- ! ILUPRE = TPEXPREFILE%NLU ILUOUT = TLUOUT%NLU ! !------------------------------------------------------------------------------- ! -print*,"!* 2. COMPUTE FORCING FIELDS PROFILES" -! ------------------------------- +print*,"!* 2. COMPUTE FORCING FIELDS PROFILES" +! ------------------------------- ZRVSRD = XRV/XRD ! ! -print*,"! 2.1 Compute array size and allocate memory" +print*,"! 2.1 Compute array size and allocate memory" ! READ(ILUPRE,*) NRELFRC ! Number of time-dependent forcing soundings READ(ILUPRE,*) YREL ! type of relaxation file (PREL, or ZREL) @@ -207,7 +207,7 @@ XRVREL(:,:,:,:) = 0. ! ! ! 3. READ ASCII FILES FOR RELAXTAION FORCING -! ------------------------------- +! ------------------------------- DO JKT = 1,NRELFRC diff --git a/src/MNH/set_rsou.f90 b/src/MNH/set_rsou.f90 index e9a4dc78f..f4941b406 100644 --- a/src/MNH/set_rsou.f90 +++ b/src/MNH/set_rsou.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -229,7 +229,7 @@ END MODULE MODI_SET_RSOU !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -405,9 +405,9 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZOC_TAUX,ZOC_TAUY REAL :: ZJZTIME ! TIME(HOUR) READ in PRE_IDEA1.NAM !-------------------------------------------------------------------------------- ! -!* 1. PROLOGUE : INITIALIZE SOME CONSTANTS, RETRIEVE LOGICAL +!* 1. PROLOGUE : INITIALIZE SOME CONSTANTS, RETRIEVE LOGICAL ! UNIT NUMBERS AND READ KIND OF DATA IN EXPRE FILE -! ------------------------------------------------------- +! ------------------------------------------------------- ! CALL GET_INDICE_ll(IIB,IJB,IIE,IJE) CALL GET_OR_ll('B',IXOR_ll,IYOR_ll) @@ -442,8 +442,8 @@ GUSERC=.FALSE. IF(LUSERC .AND. (YKIND == 'PUVTHDMR' .OR. YKIND == 'ZUVTHDMR')) GUSERC=.TRUE. !------------------------------------------------------------------------------- ! -!* 2. READ DATA AND CONVERT IN (height,U,V), (height,Thetav,r) -! -------------------------------------------------------- +!* 2. READ DATA AND CONVERT IN (height,U,V), (height,Thetav,r) +! -------------------------------------------------------- ! SELECT CASE(YKIND) ! @@ -1474,8 +1474,8 @@ END SELECT ! !------------------------------------------------------------------------------- ! -!* 3. INTERPOLATE ON THE VERTICAL MIXED MODEL GRID -! --------------------------------------------------------- +!* 3. INTERPOLATE ON THE VERTICAL MIXED MODEL GRID +! --------------------------------------------------------- ! ! ! diff --git a/src/MNH/set_subdomain.f90 b/src/MNH/set_subdomain.f90 index 6eb29a07a..b4f604794 100644 --- a/src/MNH/set_subdomain.f90 +++ b/src/MNH/set_subdomain.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -66,7 +66,7 @@ END MODULE MODI_SET_SUBDOMAIN !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/shuman.f90 b/src/MNH/shuman.f90 index 96aa554f6..bad737268 100644 --- a/src/MNH/shuman.f90 +++ b/src/MNH/shuman.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -155,7 +155,7 @@ END MODULE MODI_SHUMAN !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -258,7 +258,7 @@ END FUNCTION MXF !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -359,7 +359,7 @@ END FUNCTION MXM !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -459,7 +459,7 @@ END FUNCTION MYF !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -552,7 +552,7 @@ END FUNCTION MYM !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -648,7 +648,7 @@ END FUNCTION MZF !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -745,7 +745,7 @@ END FUNCTION MZM !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -848,7 +848,7 @@ END FUNCTION DXF !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -949,7 +949,7 @@ END FUNCTION DXM !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -1048,7 +1048,7 @@ END FUNCTION DYF !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -1145,7 +1145,7 @@ END FUNCTION DYM !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -1241,7 +1241,7 @@ END FUNCTION DZF !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/slow_terms.f90 b/src/MNH/slow_terms.f90 index 7e76852bd..d0ae6b4ee 100644 --- a/src/MNH/slow_terms.f90 +++ b/src/MNH/slow_terms.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -219,7 +219,7 @@ INTEGER :: JI,JJ,IC,JL ! loop control for packed ar !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS AND EXNER FUNCTION -! ------------------------------------------ +! ------------------------------------------ ! IKB=1+JPVEXT IKE=SIZE(PZZ,3) - JPVEXT @@ -232,7 +232,7 @@ END DO !------------------------------------------------------------------------------- ! !* 2. COMPUTE THE SEDIMENTATION (RS) SOURCE -! ------------------------------------- +! ------------------------------------- ! if ( lbudget_rr ) call Budget_store_init( tbudgets(NBUDGET_RR), 'SEDI', prrs(:, :, :) * prhodj(:, :, :) ) ! @@ -333,7 +333,7 @@ if ( lbudget_rr ) call Budget_store_end( tbudgets(NBUDGET_RR), 'SEDI', prrs(:, : ! ! !* 3. COMPUTES THE ACCRETION SOURCE -! ----------------------------- +! ----------------------------- ! if ( lbudget_rc ) call Budget_store_init( tbudgets(NBUDGET_RC), 'ACCR', prcs(:, :, :) * prhodj(:, :, :) ) if ( lbudget_rr ) call Budget_store_init( tbudgets(NBUDGET_RR), 'ACCR', prrs(:, :, :) * prhodj(:, :, :) ) @@ -392,7 +392,7 @@ if ( lbudget_rr ) call Budget_store_end( tbudgets(NBUDGET_RR), 'AUTO', prrs(:, : !------------------------------------------------------------------------------- ! !* 5. COMPUTES THE RAIN EVAPORATION (RE) SOURCE -! ----------------------------------------- +! ----------------------------------------- ! if ( lbudget_th ) call Budget_store_init( tbudgets(NBUDGET_TH), 'REVA', pths(:, :, :) * prhodj(:, :, :) ) if ( lbudget_rv ) call Budget_store_init( tbudgets(NBUDGET_RV), 'REVA', prvs(:, :, :) * prhodj(:, :, :) ) @@ -454,7 +454,7 @@ if ( lbudget_rr ) call Budget_store_end( tbudgets(NBUDGET_RR), 'REVA', prrs(:, : !------------------------------------------------------------------------------- ! !* 6. REMOVES NON-PHYSICAL LOW VALUES -! ------------------------------- +! ------------------------------- ! WHERE (PRRS(:,:,:)<1.E-16) PRRS(:,:,:)=0. diff --git a/src/MNH/spawn_model2.f90 b/src/MNH/spawn_model2.f90 index ceddaa533..2ca1a0171 100644 --- a/src/MNH/spawn_model2.f90 +++ b/src/MNH/spawn_model2.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -434,7 +434,7 @@ CALL SECOND_MNH(ZSTART) ! ZTIME1 = ZSTART ! -!* 1.2 deallocates not used model 1 variables : +!* 1.2 deallocates not used model 1 variables : ! -------------------------------------- ! CALL DEALLOCATE_MODEL1(1) @@ -703,7 +703,7 @@ IF (NSV_LIMA > 0) LHORELAX_SVLIMA = .TRUE. !------------------------------------------------------------------------------- ! !* 4. ALLOCATE MEMORY FOR ARRAYS : -! ----------------------------- +! ----------------------------- ! !* 4.1 Global variables absent from the modules : ! @@ -1039,7 +1039,7 @@ END IF !------------------------------------------------------------------------------- ! !* 5. INITIALIZE ALL THE MODEL VARIABLES -! ---------------------------------- +! ---------------------------------- ! !* 5.1 Bikhardt interpolation coefficients computation : ! @@ -1446,8 +1446,8 @@ ZANEL = ZTIME2 - ZTIME1 ! !------------------------------------------------------------------------------- ! -!* 6. WRITE THE FMFILE -! ---------------- +!* 6. WRITE THE FMFILE +! ---------------- ! CALL SECOND_MNH(ZTIME1) ! @@ -1514,8 +1514,8 @@ ZSURF2 = ZTIME2 - ZTIME1 ! !------------------------------------------------------------------------------- ! -!* 8. CLOSES THE FMFILE -! ----------------- +!* 8. CLOSES THE FMFILE +! ----------------- ! CALL IO_File_close(TZFILE) IF (ASSOCIATED(TZSONFILE)) THEN diff --git a/src/MNH/split_grid_parameter_mnh.f90 b/src/MNH/split_grid_parameter_mnh.f90 index e04ff2ea5..e6b5a97f0 100644 --- a/src/MNH/split_grid_parameter_mnh.f90 +++ b/src/MNH/split_grid_parameter_mnh.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2011-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2011-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -13,7 +13,7 @@ ! !!**** * - routine to split a real array on the split grid ! -! Modifications +! Modifications ! M.Moge 10/02/2015 Using local subdomain for parallel execution ! M.Moge 01/03/2015 Using KIMAX_ll,KJMAX_ll,KHALO for the call to SPLIT_GRID in subroutine PGD_GRID ! diff --git a/src/MNH/subl_blowsnow.f90 b/src/MNH/subl_blowsnow.f90 index 96c6b9be4..a6a91b525 100644 --- a/src/MNH/subl_blowsnow.f90 +++ b/src/MNH/subl_blowsnow.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2018-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2018-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -193,7 +193,7 @@ ZT(:,:,:) = PTHT(:,:,:) * ( PPABST(:,:,:) / XP00 ) ** (XRD/XCPD) !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS -! ----------------------- +! ----------------------- ! IIB=1+JPHEXT IIE=SIZE(PZZ,1) - JPHEXT diff --git a/src/MNH/sum_on_all_procs_mnh.f90 b/src/MNH/sum_on_all_procs_mnh.f90 index 2f053f344..ef405d5d5 100644 --- a/src/MNH/sum_on_all_procs_mnh.f90 +++ b/src/MNH/sum_on_all_procs_mnh.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2011-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2011-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -29,7 +29,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/sum_on_all_procs_mnh_hal.f90 b/src/MNH/sum_on_all_procs_mnh_hal.f90 index 6e85cd6b5..4c7ec1213 100644 --- a/src/MNH/sum_on_all_procs_mnh_hal.f90 +++ b/src/MNH/sum_on_all_procs_mnh_hal.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2011-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2011-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -29,7 +29,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/sunposn.f90 b/src/MNH/sunposn.f90 index 6a3172abe..1174524df 100644 --- a/src/MNH/sunposn.f90 +++ b/src/MNH/sunposn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -59,7 +59,7 @@ END MODULE MODI_SUNPOS_n !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Pinty * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/surf_rad_modif.f90 b/src/MNH/surf_rad_modif.f90 index 1cb4f085d..a495b3517 100644 --- a/src/MNH/surf_rad_modif.f90 +++ b/src/MNH/surf_rad_modif.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -80,7 +80,7 @@ END MODULE MODI_SURF_RAD_MODIF !! !! AUTHOR !! ------ -!! J.-P. Pinty * Laboratoire d'Aerologie* +!! J.-P. Pinty * Laboratoire d'Aerologie* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/surf_solar_geom.f90 b/src/MNH/surf_solar_geom.f90 index eb8d998c6..4388dc8ff 100644 --- a/src/MNH/surf_solar_geom.f90 +++ b/src/MNH/surf_solar_geom.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -55,7 +55,7 @@ END MODULE MODI_SURF_SOLAR_GEOM !! !! AUTHOR !! ------ -!! V. Masson * Meteo-France * +!! V. Masson * Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/surf_solar_shadows.f90 b/src/MNH/surf_solar_shadows.f90 index ff167776a..0ad68edbc 100644 --- a/src/MNH/surf_solar_shadows.f90 +++ b/src/MNH/surf_solar_shadows.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -63,7 +63,7 @@ END MODULE MODI_SURF_SOLAR_SHADOWS !! !! AUTHOR !! ------ -!! V. Masson * Meteo-France * +!! V. Masson * Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/surf_solar_slopes.f90 b/src/MNH/surf_solar_slopes.f90 index 0ffcf81e3..1aae842c7 100644 --- a/src/MNH/surf_solar_slopes.f90 +++ b/src/MNH/surf_solar_slopes.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -63,7 +63,7 @@ END MODULE MODI_SURF_SOLAR_SLOPES !! !! AUTHOR !! ------ -!! V. Masson * Meteo-France * +!! V. Masson * Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/surf_solar_sum.f90 b/src/MNH/surf_solar_sum.f90 index 11295f83a..17661b3c0 100644 --- a/src/MNH/surf_solar_sum.f90 +++ b/src/MNH/surf_solar_sum.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -52,7 +52,7 @@ END MODULE MODI_SURF_SOLAR_SUM !! !! AUTHOR !! ------ -!! V. Masson * Meteo-France * +!! V. Masson * Meteo-France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/switch_sbg_lesn.f90 b/src/MNH/switch_sbg_lesn.f90 index 2920680fa..1f8cd5d26 100644 --- a/src/MNH/switch_sbg_lesn.f90 +++ b/src/MNH/switch_sbg_lesn.f90 @@ -1,13 +1,8 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------- -!--------------- special set of characters for RCS information -!----------------------------------------------------------------- -! $Source$ $Revision$ $Date$ -!----------------------------------------------------------------- -!----------------------------------------------------------------- ! ########################## SUBROUTINE SWITCH_SBG_LES_n ! ########################## @@ -28,7 +23,7 @@ !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/therm_wind_bal.f90 b/src/MNH/therm_wind_bal.f90 index 1f7b6b13b..b72ad2dc4 100644 --- a/src/MNH/therm_wind_bal.f90 +++ b/src/MNH/therm_wind_bal.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -73,7 +73,7 @@ END MODULE MODI_THERM_WIND_BAL !! !! AUTHOR !! ------ -!! O. Nuissier * L.A. * +!! O. Nuissier * L.A. * !! F. Roux * L.A * !! !! MODIFICATIONS diff --git a/src/MNH/thetavpu_thetavpm.f90 b/src/MNH/thetavpu_thetavpm.f90 index fd5fa41a6..d4df6fc7e 100644 --- a/src/MNH/thetavpu_thetavpm.f90 +++ b/src/MNH/thetavpu_thetavpm.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -72,7 +72,7 @@ END MODULE MODI_THETAVPU_THETAVPM !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -102,8 +102,8 @@ REAL :: ZDPSDPM,ZDP1SDPM,ZDP2SDPM ! working variables INTEGER :: JK,JKM ! loop indexes !------------------------------------------------------------------------------- ! -!* 1. COMPUTE THETAV AT WIND LEVELS -! ------------------------------ +!* 1. COMPUTE THETAV AT WIND LEVELS +! ------------------------------ ! ILEVELU=SIZE(PPU) ! Retrieve number of wind levels ILEVELM=SIZE(PPM) ! Retrieve number of mass levels diff --git a/src/MNH/to_elec_fieldn.f90 b/src/MNH/to_elec_fieldn.f90 index a6822298d..a25da4d48 100644 --- a/src/MNH/to_elec_fieldn.f90 +++ b/src/MNH/to_elec_fieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2002-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2002-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -119,7 +119,7 @@ TYPE(LIST_ll), POINTER :: TZFIELDS_ll ! list of fields to exchange !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE LOOP BOUNDS -! ----------------------- +! ----------------------- ! NULLIFY(TZFIELDS_ll) ! @@ -141,7 +141,7 @@ ZW(:,:,:) = 0. !------------------------------------------------------------------------------- ! !* 2. TRANSFORM PSVT from C/kg INTO C/m3 and SUM -! ---------------------------------- +! ---------------------------------- ! DO II = 1, KRR+1 ZW(:,:,:) = ZW(:,:,:) + PSVT(:,:,:,II) * XRHODREF(:,:,:) @@ -150,7 +150,7 @@ END DO !------------------------------------------------------------------------------- ! !* 3. BOUNDARY CONDITIONS -! ------------------- +! ------------------- ! ZW(:,:,1:IKB-1) = 0.0 ! Setup to neutralize the computation on the ! first ligne of the tridiagonal system starting @@ -165,7 +165,7 @@ CALL CLEANLIST_ll(TZFIELDS_ll) !------------------------------------------------------------------------------- ! !* 4. COMPUTE THE ELECTRIC FIELD -! -------------------------- +! -------------------------- ! IF (PRESENT(PPHIT)) THEN CALL ELEC_FIELD_n (ZW, KTCOUNT, XRELAX_ELEC, PRHODJ, & diff --git a/src/MNH/total_dmass.f90 b/src/MNH/total_dmass.f90 index 84fbd8515..3f9ad22a2 100644 --- a/src/MNH/total_dmass.f90 +++ b/src/MNH/total_dmass.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -69,7 +69,7 @@ END MODULE MODI_TOTAL_DMASS !! !! AUTHOR !! ------ -!! J.P. Lafore * Meteo France * +!! J.P. Lafore * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -102,7 +102,7 @@ INTEGER :: IINFO_ll ! Return code of parallel routine !------------------------------------------------------------------------------- ! !* 1. COMPUTE THE TOTAL MASS OF DRY AIR -! ---------------------------------- +! ---------------------------------- ! PDRYMASS=SUM3D_ll(PJ(:,:,:)*PRHOD(:,:,:),IINFO_ll) ! diff --git a/src/MNH/tridz.f90 b/src/MNH/tridz.f90 index e5a6b7429..449add92b 100644 --- a/src/MNH/tridz.f90 +++ b/src/MNH/tridz.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -151,7 +151,7 @@ END MODULE MODI_TRIDZ !! !! AUTHOR !! ------ -!! P. HÃ…reil and J. Stein * Meteo France * +!! P. HÃ…reil and J. Stein * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/unpack_1d_2d.f90 b/src/MNH/unpack_1d_2d.f90 index ebfd7e213..2d336152c 100644 --- a/src/MNH/unpack_1d_2d.f90 +++ b/src/MNH/unpack_1d_2d.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -81,7 +81,7 @@ END MODULE MODI_UNPACK_1D_2D !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -152,7 +152,7 @@ END SUBROUTINE UNPACK_1D_2D_FROMI2D !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -223,7 +223,7 @@ END SUBROUTINE UNPACK_1D_2D_FROML2D !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -294,7 +294,7 @@ END SUBROUTINE UNPACK_1D_2D_FROM2D !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -365,7 +365,7 @@ END SUBROUTINE UNPACK_1D_2D_FROM3D !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/update_metrics.f90 b/src/MNH/update_metrics.f90 index a16ba2caf..9f4bf0185 100644 --- a/src/MNH/update_metrics.f90 +++ b/src/MNH/update_metrics.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2006-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2006-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -50,7 +50,7 @@ END MODULE MODI_UPDATE_METRICS !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/update_welford.f90 b/src/MNH/update_welford.f90 index 8aa8e869b..6f3d2928b 100644 --- a/src/MNH/update_welford.f90 +++ b/src/MNH/update_welford.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2022-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2022-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -37,7 +37,7 @@ SUBROUTINE UPDATE_WELFORD(KCOUNT,PMEAN,PM2,PVALUE) !! !! AUTHOR !! ------ -!! E. Jezequel +!! E. Jezequel !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/upstream_z.f90 b/src/MNH/upstream_z.f90 index 027d8f30e..0ca8a990a 100644 --- a/src/MNH/upstream_z.f90 +++ b/src/MNH/upstream_z.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -66,7 +66,7 @@ END MODULE MODI_UPSTREAM_Z !! !! AUTHOR !! ------ -!! J.-P. Pinty * LA * +!! J.-P. Pinty * LA * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/ver_interp_lin.f90 b/src/MNH/ver_interp_lin.f90 index 83c057def..6b9b80b65 100644 --- a/src/MNH/ver_interp_lin.f90 +++ b/src/MNH/ver_interp_lin.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -112,7 +112,7 @@ END MODULE MODI_VER_INTERP_LIN3D !! !! AUTHOR !! ------ -!! +!! ! V.Masson Meteo-France !! !! MODIFICATIONS @@ -187,7 +187,7 @@ END FUNCTION VER_INTERP_LIN3D !! !! AUTHOR !! ------ -!! +!! ! V.Masson Meteo-France !! !! MODIFICATIONS @@ -269,7 +269,7 @@ END FUNCTION VER_INTERP_LIN2D !! !! AUTHOR !! ------ -!! +!! ! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/ver_shift.f90 b/src/MNH/ver_shift.f90 index 8d1985a98..41fc798f5 100644 --- a/src/MNH/ver_shift.f90 +++ b/src/MNH/ver_shift.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -77,7 +77,7 @@ END MODULE MODI_VER_SHIFT !! !! AUTHOR !! ------ -!! +!! ! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/vert_coord.f90 b/src/MNH/vert_coord.f90 index 4838d7fc9..8a73e7cb6 100644 --- a/src/MNH/vert_coord.f90 +++ b/src/MNH/vert_coord.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -56,7 +56,7 @@ END MODULE MODI_VERT_COORD !! !! AUTHOR !! ------ -!! V. Masson * Meteo-France * +!! V. Masson * Meteo-France * !! !! MODIFICATIONS !! ------------- @@ -122,7 +122,7 @@ CONTAINS !! !! AUTHOR !! ------ -!! G. Zangler * LA * +!! G. Zangler * LA * !! !! MODIFICATIONS !! ------------- @@ -233,7 +233,7 @@ END SUBROUTINE SLEVE_COORD !! !! AUTHOR !! ------ -!! G. Zangler * LA * +!! G. Zangler * LA * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/viscosity.f90 b/src/MNH/viscosity.f90 index c909bd9b0..ff16f59c4 100644 --- a/src/MNH/viscosity.f90 +++ b/src/MNH/viscosity.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -206,7 +206,7 @@ if ( lbudget_sv .and. ovisc_sv ) then end if !* 1. Viscous forcing for potential temperature -! ----------------------------------------- +! ----------------------------------------- ! ! IF (OVISC_TH) THEN @@ -221,7 +221,7 @@ END IF !------------------------------------------------------------------------------- ! !* 2. Viscous forcing for moisture -! ---------------------------- +! ---------------------------- ! IF (OVISC_R .AND. (SIZE(PRT,1) > 0)) THEN ! @@ -237,7 +237,7 @@ END IF !------------------------------------------------------------------------------- ! !* 3. Viscous forcing for passive scalars -! ----------------------------------- +! ----------------------------------- ! IF (OVISC_SV .AND. (SIZE(PSVT,1) > 0)) THEN ! @@ -252,7 +252,7 @@ END IF !------------------------------------------------------------------------------- ! !* 4. Viscous forcing for momentum -! ---------------------------- +! ---------------------------- ! IF (OVISC_UVW) THEN ! diff --git a/src/MNH/vqzcolx.f90 b/src/MNH/vqzcolx.f90 index dc5c3e759..0ae2a17fd 100644 --- a/src/MNH/vqzcolx.f90 +++ b/src/MNH/vqzcolx.f90 @@ -1,11 +1,11 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. !----------------------------------------------------------------- -! ################### +! ################### MODULE MODI_VQZCOLX -! ################### +! ################### ! INTERFACE ! diff --git a/src/MNH/water_sum.f90 b/src/MNH/water_sum.f90 index 46a899cda..480627317 100644 --- a/src/MNH/water_sum.f90 +++ b/src/MNH/water_sum.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1998-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1998-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -35,7 +35,7 @@ END MODULE MODI_WATER_SUM !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/windcalc.f90 b/src/MNH/windcalc.f90 index 79c5c683a..09f810c31 100644 --- a/src/MNH/windcalc.f90 +++ b/src/MNH/windcalc.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -64,7 +64,7 @@ END MODULE MODI_WINDCALC !! !! AUTHOR !! ------ -!! O. Nuissier * L.A. * +!! O. Nuissier * L.A. * !! R. Rogers * NOAA/AOML/HRD * !! !! MODIFICATIONS @@ -100,7 +100,7 @@ REAL :: ZR2,ZR,ZPHI ! !------------------------------------------------------------------------------- ! -!* 1. COMPUTATION OF THE FIELD +!* 1. COMPUTATION OF THE FIELD ! ------------------------ ! IX=SIZE(PUIN,1) diff --git a/src/MNH/write_balloonn.f90 b/src/MNH/write_balloonn.f90 index e519c2b99..dfec06da0 100644 --- a/src/MNH/write_balloonn.f90 +++ b/src/MNH/write_balloonn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2001-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2001-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -44,7 +44,7 @@ CONTAINS !! !! AUTHOR !! ------ -!! G.Jaubert *Meteo France* +!! G.Jaubert *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/write_desfmn.f90 b/src/MNH/write_desfmn.f90 index f03405a24..eec1edb24 100644 --- a/src/MNH/write_desfmn.f90 +++ b/src/MNH/write_desfmn.f90 @@ -105,7 +105,7 @@ END MODULE MODI_WRITE_DESFM_n !! !! AUTHOR !! ------ -!! V. Ducrocq * Meteo France * +!! V. Ducrocq * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/write_dummy_gr_fieldn.f90 b/src/MNH/write_dummy_gr_fieldn.f90 index c3e6096e0..b78f33412 100644 --- a/src/MNH/write_dummy_gr_fieldn.f90 +++ b/src/MNH/write_dummy_gr_fieldn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -48,7 +48,7 @@ END MODULE MODI_WRITE_DUMMY_GR_FIELD_n !! !! AUTHOR !! ------ -!! V. Masson *Meteo France* +!! V. Masson *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -92,7 +92,7 @@ TYPE(TFIELDMETADATA) :: TZFIELD !------------------------------------------------------------------------------- ! !* 1. WRITES IN THE LFI FILE -! ----------------------- +! ----------------------- ! !* 2. Physiographic data fields: ! ------------------------- diff --git a/src/MNH/write_hgrid.f90 b/src/MNH/write_hgrid.f90 index 27b0c7d1a..5d13f402e 100644 --- a/src/MNH/write_hgrid.f90 +++ b/src/MNH/write_hgrid.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -44,7 +44,7 @@ END MODULE MODI_WRITE_HGRID !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- @@ -80,7 +80,7 @@ TYPE(TFILEDATA), INTENT(IN) :: TPFILE ! File to write !------------------------------------------------------------------------------- ! !* 1. TEST ON MODEL INDEX -! ------------------- +! ------------------- ! KMI may be 0 IF (KMI<0 .OR. KMI>JPMODELMAX) CALL PRINT_MSG(NVERB_FATAL,'GEN','WRITE_HGRID','KMI<0 .OR. KMI>JPMODELMAX') IF (KMI/=0) THEN @@ -91,7 +91,7 @@ END IF !------------------------------------------------------------------------------- ! !* 2. WRITING FROM MODD_PGD... -! ---------------------- +! ---------------------- ! CALL IO_Field_write(TPFILE,'LAT0', XLAT0) CALL IO_Field_write(TPFILE,'LON0', XLON0) diff --git a/src/MNH/write_hgridn.f90 b/src/MNH/write_hgridn.f90 index 4e134e365..661454ddb 100644 --- a/src/MNH/write_hgridn.f90 +++ b/src/MNH/write_hgridn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1996-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -57,7 +57,7 @@ END MODULE MODI_WRITE_HGRIDn !! !! AUTHOR !! ------ -!! V. Masson * Meteo France * +!! V. Masson * Meteo France * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/write_lbn.f90 b/src/MNH/write_lbn.f90 index c7cd8db0a..3a600e2ba 100644 --- a/src/MNH/write_lbn.f90 +++ b/src/MNH/write_lbn.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1998-2022 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1998-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -60,7 +60,7 @@ END MODULE MODI_WRITE_LB_n !! !! AUTHOR !! ------ -!! P Jabouille *Meteo France* +!! P Jabouille *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/write_lfifm1_for_diag.f90 b/src/MNH/write_lfifm1_for_diag.f90 index dcb367276..aea3f0491 100644 --- a/src/MNH/write_lfifm1_for_diag.f90 +++ b/src/MNH/write_lfifm1_for_diag.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -76,7 +76,7 @@ END MODULE MODI_WRITE_LFIFM1_FOR_DIAG !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/write_lfifm1_for_diag_supp.f90 b/src/MNH/write_lfifm1_for_diag_supp.f90 index 0dd9d393c..86dd93540 100644 --- a/src/MNH/write_lfifm1_for_diag_supp.f90 +++ b/src/MNH/write_lfifm1_for_diag_supp.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2000-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2000-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -59,7 +59,7 @@ END MODULE MODI_WRITE_LFIFM1_FOR_DIAG_SUPP !! !! AUTHOR !! ------ -!! J. Stein *Meteo France* +!! J. Stein *Meteo France* !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90 index 3cc62a7b6..f655aea8f 100644 --- a/src/MNH/write_lfin.f90 +++ b/src/MNH/write_lfin.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -87,7 +87,7 @@ END MODULE MODI_WRITE_LFIFM_n !! !! AUTHOR !! ------ -!! V. Ducrocq *Meteo France* +!! V. Ducrocq *Meteo France* !! !! MODIFICATIONS !! ------------- @@ -320,7 +320,7 @@ INTEGER :: IID TYPE(TFIELDMETADATA) :: TZFIELD !------------------------------------------------------------------------------- ! -!* 0. Initialization +!* 0. Initialization ! IMI = GET_CURRENT_MODEL_INDEX() ! diff --git a/src/MNH/xytolatlon.f90 b/src/MNH/xytolatlon.f90 index d4ff3b6a5..607cb0480 100644 --- a/src/MNH/xytolatlon.f90 +++ b/src/MNH/xytolatlon.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -126,12 +126,12 @@ INTEGER, INTENT(IN) :: KNY REAL, INTENT(IN) :: PLATOR ! Latitude of the origine point REAL, INTENT(IN) :: PLONOR ! Longitude of the origine point REAL, DIMENSION(KNX,KNY), INTENT(IN) :: PXA,PYA - ! given conformal coordinates of the - ! processed points (meters); + ! given conformal coordinates of the + ! processed points (meters); REAL, DIMENSION(KNX,KNY), INTENT(OUT):: PLAT,PLON - ! returned geographic latitudes and - ! longitudes of the processed points - ! (degrees). + ! returned geographic latitudes and + ! longitudes of the processed points + ! (degrees). REAL, INTENT(IN) :: PLAT0 ! Latitude of the origine point REAL, INTENT(IN) :: PLON0 ! Longitude of the origine point REAL, INTENT(IN) :: PRPK ! Longitude of the origine point diff --git a/src/MNH/zdiffusetup.f90 b/src/MNH/zdiffusetup.f90 index 955853512..e11c49f4b 100644 --- a/src/MNH/zdiffusetup.f90 +++ b/src/MNH/zdiffusetup.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2006-2020 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2006-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -41,14 +41,14 @@ END MODULE MODI_ZDIFFUSETUP !! REFERENCE !! --------- !! -!! Zängl, G., 2002: An improved method for computing horizontal diffusion in a +!! Z�ngl, G., 2002: An improved method for computing horizontal diffusion in a !! sigma-coordinate model and its application to simulations !! over mountainous topography. Mon. Wea. Rev. 130, 1423-1432. !! !! AUTHOR !! ------ !! -!! G. Zängl * University of Munich* +!! G. Z�ngl * University of Munich* ! ! Modifications: ! J. Escobar 07/10/2015: remove print @@ -348,7 +348,7 @@ DO JI = II1,II2 GOTO 20 ENDIF ENDDO - 20 CONTINUE + 20 CONTINUE ELSE ! local point lower than remote point; search downward IF (ZHGT.LT.PZMASS(JIR,JJR,IKB)) THEN PKIND(JI,JJ,JK) = IKB diff --git a/src/MNH/zs_boundary.f90 b/src/MNH/zs_boundary.f90 index d312dc446..e60939344 100644 --- a/src/MNH/zs_boundary.f90 +++ b/src/MNH/zs_boundary.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -53,7 +53,7 @@ END MODULE MODI_ZS_BOUNDARY !! !! AUTHOR !! ------ -!! +!! !! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/zsect.f90 b/src/MNH/zsect.f90 index 80abddd43..c7d40a370 100644 --- a/src/MNH/zsect.f90 +++ b/src/MNH/zsect.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -51,7 +51,7 @@ END MODULE MODI_ZSECT !! !! AUTHOR !! ------ -!! +!! ! V.Masson Meteo-France !! !! MODIFICATIONS diff --git a/src/MNH/zsmt_pgd.f90 b/src/MNH/zsmt_pgd.f90 index 37b88613b..8d9456bed 100644 --- a/src/MNH/zsmt_pgd.f90 +++ b/src/MNH/zsmt_pgd.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2005-2021 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2005-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -54,7 +54,7 @@ END MODULE MODI_ZSMT_PGD !! !! AUTHOR !! ------ -!! G. Zangler * LA * +!! G. Zangler * LA * !! !! MODIFICATIONS !! ------------- diff --git a/src/MNH/zsmt_pic.f90 b/src/MNH/zsmt_pic.f90 index 7bb4c89c7..516121cf8 100644 --- a/src/MNH/zsmt_pic.f90 +++ b/src/MNH/zsmt_pic.f90 @@ -1,4 +1,4 @@ -!MNH_LIC Copyright 2005-2019 CNRS, Meteo-France and Universite Paul Sabatier +!MNH_LIC Copyright 2005-2024 CNRS, Meteo-France and Universite Paul Sabatier !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !MNH_LIC for details. version 1. @@ -47,7 +47,7 @@ END MODULE MODI_ZSMT_PIC !! !! AUTHOR !! ------ -!! G. Zangler * LA * +!! G. Zangler * LA * !! !! MODIFICATIONS !! ------------- -- GitLab