Changeset 3082 for trunk/LMDZ.COMMON/libf/evolution
- Timestamp:
- Oct 11, 2023, 1:40:58 PM (15 months ago)
- Location:
- trunk/LMDZ.COMMON/libf/evolution
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.COMMON/libf/evolution/adsorption_mod.F90
r2985 r3082 1 module adsorption_mod 1 module adsorption_mod 2 2 3 implicit none 4 3 5 LOGICAL adsorption_pem ! True by default, to compute adsorption/desorption. Read in pem.def 4 6 real, save, allocatable :: co2_adsorbded_phys(:,:,:) ! co2 that is in the regolith [kg/m^2] 5 7 real, save, allocatable :: h2o_adsorbded_phys(:,:,:) ! h2o that is in the regolith [kg/m^2] 8 6 9 contains 7 10 … … 86 89 87 90 use comsoil_h_PEM, only: layer_PEM, mlayer_PEM,index_breccia,index_bedrock 88 USE comconst_mod, only: pi89 91 use comslope_mod, only : subslope_dist,def_slope_mean 90 92 use vertical_layers_mod, ONLY: ap,bp … … 92 94 m_h2o,m_co2,m_noco2, & 93 95 rho_regolith 94 96 #ifndef CPP_STD 97 use comcstfi_h, only: pi 98 #else 99 use comcstfi_mod, only: pi 100 #endif 95 101 96 102 implicit none … … 243 249 244 250 use comsoil_h_PEM, only: layer_PEM, mlayer_PEM,index_breccia,index_bedrock,index_breccia 245 USE comconst_mod, only: pi246 251 use comslope_mod, only : subslope_dist,def_slope_mean 247 252 use vertical_layers_mod, ONLY: ap,bp 248 253 use constants_marspem_mod, only: m_co2, m_noco2,rho_regolith 254 #ifndef CPP_STD 255 use comcstfi_h, only: pi 256 #else 257 use comcstfi_mod, only: pi 258 #endif 249 259 250 260 IMPLICIT NONE -
trunk/LMDZ.COMMON/libf/evolution/changelog.txt
r3076 r3082 97 97 - Correction of a bug in "pem.F90" when calling 'recomp_tend_co2_slope'. The arguments were given in disorder and emissivity was missing; 98 98 - Update of "launch_pem.sh" in deftank. 99 100 == 11/10/2023 == JBC 101 - Correction of a bug in the initialization of constants. The correct modules are now used: 'comcstfi_h' (and no longer 'comconst_mod'!) in the general case and 'comcstfi_mod' in the case of generic model; 102 - Addition of the variable 'ecritpem' in "run_PEM.def" to set the frequency of outputs in the "diagfi.nc". By default, 'ecritpem = 1' which means there is one output at each PEM year. -
trunk/LMDZ.COMMON/libf/evolution/conf_pem.F90
r3076 r3082 23 23 #endif 24 24 25 use time_evol_mod, only: year_bp_ini, dt_pem, water_ice_criterion, co2_ice_criterion, ps_criterion, Max_iter_pem, &25 use time_evol_mod, only: year_bp_ini, dt_pem, water_ice_criterion, co2_ice_criterion, ps_criterion, Max_iter_pem, & 26 26 evol_orbit_pem, var_obl, var_ecc, var_lsp, convert_years 27 use comsoil_h_pem, only: soil_pem, fluxgeo, water_reservoir_nom, depth_breccia, depth_bedrock, reg_thprop_dependp 28 use adsorption_mod, only: adsorption_pem 29 use glaciers_mod, only: co2glaciersflow, h2oglaciersflow 30 use ice_table_mod, only: icetable_equilibrium, icetable_dynamic 27 use comsoil_h_pem, only: soil_pem, fluxgeo, water_reservoir_nom, depth_breccia, depth_bedrock, reg_thprop_dependp 28 use adsorption_mod, only: adsorption_pem 29 use glaciers_mod, only: co2glaciersflow, h2oglaciersflow 30 use ice_table_mod, only: icetable_equilibrium, icetable_dynamic 31 use time_phylmdz_mod, only: ecritphy 31 32 32 33 implicit none … … 50 51 endif 51 52 close(100) 53 54 ! #---------- Output parameters 55 ! Frequency of outputs for the PEM 56 ecritphy = 1 ! Default value: every year 57 call getin('ecritpem',ecritphy) 52 58 53 59 ! #---------- Orbital parameters -
trunk/LMDZ.COMMON/libf/evolution/evol_h2o_ice_s_mod.F90
r3050 r3082 10 10 use comslope_mod, only: subslope_dist, def_slope_mean 11 11 use criterion_pem_stop_mod, only: criterion_waterice_stop 12 use comconst_mod, only: pi 12 #ifndef CPP_STD 13 use comcstfi_h, only: pi 14 #else 15 use comcstfi_mod, only: pi 16 #endif 13 17 14 18 IMPLICIT NONE -
trunk/LMDZ.COMMON/libf/evolution/glaciers_mod.F90
r3076 r3082 13 13 14 14 contains 15 16 15 17 16 subroutine co2glaciers_evol(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,vmr_co2_PEM,ps_GCM,global_ave_ps_GCM,global_ave_ps_PEM,co2ice,flag_co2flow,flag_co2flow_mesh) … … 101 100 102 101 103 104 102 subroutine compute_hmaxglaciers(ngrid,nslope,iflat,def_slope_mean,Tice,name_ice,hmax) 105 103 106 use comconst_mod, only: pi,g107 104 use abort_pem_mod, only: abort_pem 105 #ifndef CPP_STD 106 use comcstfi_h, only: pi, g 107 #else 108 use comcstfi_mod, only: pi, g 109 #endif 108 110 109 111 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 181 183 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 182 184 183 use comconst_mod, only: pi184 185 use abort_pem_mod, only: abort_pem 185 186 #ifndef CPP_STD 187 use comcstfi_h, only: pi 188 #else 189 use comcstfi_mod, only: pi 190 #endif 186 191 187 192 implicit none -
trunk/LMDZ.COMMON/libf/evolution/ice_table_mod.F90
r3032 r3082 146 146 !!! 147 147 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 148 use comsoil_h_PEM, only: mlayer_PEM 149 use comslope_mod, only: subslope_dist,def_slope_mean 150 use comconst_mod,only: pi 148 use comsoil_h_PEM, only: mlayer_PEM 149 use comslope_mod, only: subslope_dist,def_slope_mean 151 150 use constants_marspem_mod,only:porosity 151 #ifndef CPP_STD 152 use comcstfi_h, only: pi 153 #else 154 use comcstfi_mod, only: pi 155 #endif 156 152 157 implicit none 153 158 ! inputs -
trunk/LMDZ.COMMON/libf/evolution/orbit_param_criterion_mod.F90
r3076 r3082 24 24 #endif 25 25 #ifndef CPP_STD 26 use planete_h, only: e_elips, obliquit, lsperi 26 use planete_h, only: e_elips, obliquit, lsperi 27 use comcstfi_h, only: pi 27 28 #else 28 use planete_mod, only: e_elips, obliquit, lsperi 29 use planete_mod, only: e_elips, obliquit, lsperi 30 use comcstfi_mod, only: pi 29 31 #endif 30 32 use time_evol_mod, only: year_bp_ini, var_obl, var_ecc, var_lsp, convert_years 31 use comconst_mod, only: pi32 33 use lask_param_mod, only: yearlask, obllask, ecclask, lsplask, ini_lask_param_mod, last_ilask 33 34 -
trunk/LMDZ.COMMON/libf/evolution/pem.F90
r3076 r3082 82 82 use mod_phys_lmdz_para, only: is_parallel, is_sequential, is_mpi_root, is_omp_root, is_master 83 83 use planete_h, only: aphelie, periheli, year_day, peri_day, obliquit 84 use comcstfi_h, only: r, mugaz85 84 use paleoclimate_mod, only: albedo_perenialco2 85 use comcstfi_h, only: pi, rad, g, cpp, mugaz, r 86 86 #else 87 87 use tracer_h, only: noms, igcm_h2o_ice, igcm_co2 ! Tracer names … … 91 91 use aerosol_mod, only: iniaerosol 92 92 use planete_mod, only: apoastr, periastr, year_day, peri_day, obliquit 93 use comcstfi_mod, only: r, mugaz93 use comcstfi_mod, only: pi, rad, g, cpp, mugaz, r 94 94 #endif 95 95 … … 97 97 use iniphysiq_mod, only: iniphysiq 98 98 use control_mod, only: iphysiq, day_step, nsplit_phys 99 use comconst_mod, only: rad, g, cpp, pi100 99 #else 101 100 use time_phylmdz_mod, only: iphysiq, day_step 102 use comcstfi_h, only: pi, rad, g, cpp103 101 use regular_lonlat_mod, only: init_regular_lonlat 104 102 use physics_distribution_mod, only: init_physics_distribution -
trunk/LMDZ.COMMON/libf/evolution/pemetat0.F90
r3076 r3082 155 155 enddo ! islope 156 156 157 write(*,*) 'PEMETAT0: THERMAL INERTIA do NE'157 write(*,*) 'PEMETAT0: THERMAL INERTIA done' 158 158 159 159 ! b. Special case for inertiedat, inertiedat_PEM … … 254 254 enddo ! islope 255 255 256 write(*,*) 'PEMETAT0: SOIL TEMP doNE'256 write(*,*) 'PEMETAT0: SOIL TEMP done' 257 257 258 258 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 269 269 endif 270 270 271 write(*,*) 'PEMETAT0: ICE TABLE doNE'271 write(*,*) 'PEMETAT0: ICE TABLE done' 272 272 273 273 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 303 303 deltam_h2o_regolith_phys(:) = 0. 304 304 endif 305 write(*,*) 'PEMETAT0: CO2 & H2O adsorption do NE'305 write(*,*) 'PEMETAT0: CO2 & H2O adsorption done' 306 306 endif 307 307 endif ! soil_pem … … 402 402 enddo 403 403 404 write(*,*) 'PEMETAT0: TI do NE'404 write(*,*) 'PEMETAT0: TI done' 405 405 406 406 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 441 441 enddo 442 442 enddo !islope 443 write(*,*) 'PEMETAT0: TSOIL do NE'443 write(*,*) 'PEMETAT0: TSOIL done' 444 444 445 445 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 450 450 call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_ave_yr2(:,islope),tsoil_PEM(:,:,islope)) 451 451 enddo 452 write(*,*) 'PEMETAT0: Ice table do NE'452 write(*,*) 'PEMETAT0: Ice table done' 453 453 454 454 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 465 465 endif 466 466 467 write(*,*) 'PEMETAT0: CO2 adsorption do NE'467 write(*,*) 'PEMETAT0: CO2 adsorption done' 468 468 endif !soil_pem 469 469 -
trunk/LMDZ.COMMON/libf/evolution/pemredem.F90
r3039 r3082 24 24 #else 25 25 use planete_mod, only: apoastr, emin_turb, lmixmin, obliquit, peri_day, periastr, year_day 26 use comconst_mod, only: g, omeg, rad 27 use comcstfi_mod, only: mugaz, rcp 26 use comcstfi_mod, only: g, mugaz, omeg, rad, rcp 28 27 #endif 29 28 -
trunk/LMDZ.COMMON/libf/evolution/recomp_orb_param_mod.F90
r3076 r3082 18 18 use lask_param_mod, only: yearlask, obllask, ecclask, lsplask, end_lask_param_mod, last_ilask 19 19 #ifndef CPP_STD 20 use comc onst_mod,only: pi20 use comcstfi_h, only: pi 21 21 use planete_h, only: e_elips, obliquit, lsperi, periheli, aphelie, p_elips, peri_day, year_day 22 22 #else 23 use comcstfi_mod, only: pi 23 24 use planete_mod, only: e_elips, obliquit, lsperi, periastr, apoastr, p_elips, peri_day, year_day 24 use comcstfi_mod, only: pi25 25 #endif 26 26
Note: See TracChangeset
for help on using the changeset viewer.