Ignore:
Timestamp:
Jan 17, 2024, 5:58:11 PM (11 months ago)
Author:
llange
Message:

PEM
Cleaning of the several subroutine regarding soil temperatures: they are now
gathered in an unique Tsoil module.
(cosmetic commit)
LL

Location:
trunk/LMDZ.COMMON/libf/evolution
Files:
1 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LMDZ.COMMON/libf/evolution/changelog.txt

    r3173 r3178  
    199199- Correction of script "launch_orb_1Dchained.sh" which read orbital parameters missing one interval of years in two.
    200200- Addition of the Martian date in "info_PEM.txt" for post-processing.
     201
     202== 17/01/2023 == LL
     203Cleaning of the several subroutine regarding soil temperatures: they are now
     204gathered in an unique Tsoil module.
     205(cosmetic commit)
  • trunk/LMDZ.COMMON/libf/evolution/pem.F90

    r3172 r3178  
    6767use read_data_PCM_mod,          only: read_data_PCM
    6868use recomp_tend_co2_slope_mod,  only: recomp_tend_co2_slope
    69 use soil_pem_compute_mod,       only: soil_pem_compute
     69use compute_soiltemp_mod,       only: compute_tsoil_pem
    7070use writediagpem_mod,           only: writediagfipem, writediagsoilpem
    7171
     
    819819                Tsoil_locslope = tsoil_phys_PEM_timeseries(:,:,islope,t)
    820820                Tsurf_locslope = tsurf_PCM_timeseries(:,islope,t)
    821                 call soil_pem_compute(ngrid,nsoilmx_PEM,.true.,TI_locslope,timestep/timelen,Tsurf_locslope,Tsoil_locslope)
    822                 call soil_pem_compute(ngrid,nsoilmx_PEM,.false.,TI_locslope,timestep/timelen,Tsurf_locslope,Tsoil_locslope)
     821                call compute_tsoil_pem(ngrid,nsoilmx_PEM,.true.,TI_locslope,timestep/timelen,Tsurf_locslope,Tsoil_locslope)
     822                call compute_tsoil_pem(ngrid,nsoilmx_PEM,.false.,TI_locslope,timestep/timelen,Tsurf_locslope,Tsoil_locslope)
    823823                tsoil_phys_PEM_timeseries(:,:,islope,t) = Tsoil_locslope
    824824                do ig = 1,ngrid
  • trunk/LMDZ.COMMON/libf/evolution/pemetat0.F90

    r3170 r3178  
    2121use tracer_mod,                 only: mmol, igcm_h2o_vap ! tracer names and molar masses
    2222use abort_pem_mod,              only: abort_pem
    23 use soil_pem_compute_mod,       only: soil_pem_compute
    24 use soil_pem_ini_mod,           only: soil_pem_ini
     23use compute_soiltemp_mod,       only: ini_tsoil_pem, compute_tsoil_pem
    2524use comslope_mod,               only: def_slope_mean, subslope_dist
    2625
     
    244243!                    enddo
    245244!                enddo
    246                 call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
    247                 call soil_pem_compute(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
     245                call ini_tsoil_pem(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
     246                call compute_tsoil_pem(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
    248247            else
    249248! predictor corrector: restart from year 1 of the PCM and build the evolution of
    250249! tsoil at depth
    251250                tsoil_tmp_yr1(:,:,islope) = tsoil_startPEM(:,:,islope)
    252                 call soil_pem_compute(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr1(:,islope),tsoil_tmp_yr1(:,:,islope))
    253                 call soil_pem_compute(ngrid,nsoil_PEM,.false.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr1(:,islope),tsoil_tmp_yr1(:,:,islope))
     251                call compute_tsoil_pem(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr1(:,islope),tsoil_tmp_yr1(:,:,islope))
     252                call compute_tsoil_pem(ngrid,nsoil_PEM,.false.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr1(:,islope),tsoil_tmp_yr1(:,:,islope))
    254253                tsoil_tmp_yr2(:,:,islope) = tsoil_tmp_yr1(:,:,islope)
    255                 call soil_pem_compute(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_tmp_yr2(:,:,islope))
     254                call compute_tsoil_pem(ngrid,nsoil_PEM,.false.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_tmp_yr2(:,:,islope))
    256255
    257256                do iloop = nsoil_PCM+1,nsoil_PEM
     
    283282                call update_soil_thermalproperties(ngrid,nslope,nsoil_PEM,tend_h2o_ice,h2o_ice,global_avg_pressure,ice_table,ice_table_thickness,TI_PEM)
    284283                do islope = 1,nslope
    285                     call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
     284                    call ini_tsoil_pem(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
    286285                enddo
    287286            endif
     
    418417!                enddo
    419418!            enddo
    420             call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
    421             call soil_pem_compute(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
     419            call ini_tsoil_pem(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
     420            call compute_tsoil_pem(ngrid,nsoil_PEM,.true.,TI_PEM(:,:,islope),timestep,tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
    422421
    423422! First raw initialization
     
    430429            do it = 1,timelen
    431430                do isoil = nsoil_PCM + 1,nsoil_PEM
    432                     call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_inst(:,:,islope,it))
     431                    call ini_tsoil_pem(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_inst(:,:,islope,it))
    433432                enddo
    434433            enddo
     
    448447            call update_soil_thermalproperties(ngrid,nslope,nsoil_PEM,tend_h2o_ice,h2o_ice,global_avg_pressure,ice_table,ice_table_thickness,TI_PEM)
    449448            do islope = 1,nslope
    450                 call soil_pem_ini(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
     449                call ini_tsoil_pem(ngrid,nsoil_PEM,TI_PEM(:,:,islope),tsurf_avg_yr2(:,islope),tsoil_PEM(:,:,islope))
    451450            enddo
    452451            write(*,*) 'PEMETAT0: Ice table done'
Note: See TracChangeset for help on using the changeset viewer.