Skip to content

Refactoring of average_utils.f90 #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mpaiao wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Refactoring of average_utils.f90 #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c8db84
This splits multiple sub-routines in average_utils.f90 into smaller c…
mpaiao Mar 13, 2026
cb99fbd
Add apt-get update to the list of instructions, CI is failing at the …
mpaiao Mar 13, 2026
f6d2a08
Another attempt to fix the "install dependencies" step.
mpaiao Mar 13, 2026
c8264bc
Fix instructions for multiple lines.
mpaiao Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install dependencies
run: sudo apt-get install -y --no-install-recommends gfortran libhdf5-openmpi-dev libopenmpi-dev libblas-dev liblapack-dev
run: |
sudo apt-get update
sudo apt-get install -y --fix-missing --no-install-recommends gfortran libhdf5-openmpi-dev libopenmpi-dev libblas-dev liblapack-dev
- name: Install ED2
run: |
cd ED/build
Expand Down Expand Up @@ -43,7 +45,9 @@ jobs:
with:
name: ed2-binary
- name: Install dependencies
run: sudo apt-get install -y --no-install-recommends gfortran libhdf5-openmpi-dev libopenmpi-dev libblas-dev liblapack-dev
run: |
sudo apt-get update
sudo apt-get install -y --fix-missing --no-install-recommends gfortran libhdf5-openmpi-dev libopenmpi-dev libblas-dev liblapack-dev
- name: Run ED2
working-directory: ./EDTS/
run: |
Expand Down
100 changes: 50 additions & 50 deletions BRAMS/src/ed2/edcp_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,51 +3,51 @@
! Model 2, when run in coupled mode. !
!------------------------------------------------------------------------------------------!
subroutine ed_coup_driver()
use grid_coms , only : ngrids & ! intent(in)
, time & ! intent(in)
, timmax ! ! intent(in)
use ed_state_vars , only : allocate_edglobals & ! subroutine
, filltab_alltypes & ! subroutine
, edgrid_g ! ! subroutine
use ed_init , only : read_obstime ! ! subroutine
use ed_misc_coms , only : fast_diagnostics & ! intent(in)
, current_time & ! intent(in)
, iyeara & ! intent(in)
, imontha & ! intent(in)
, idatea & ! intent(in)
, itimea & ! intent(in)
, runtype & ! intent(in)
, ifoutput & ! intent(in)
, idoutput & ! intent(in)
, imoutput & ! intent(in)
, iqoutput & ! intent(in)
, isoutput & ! intent(in)
, iyoutput & ! intent(in)
, iooutput & ! intent(in)
, writing_long & ! intent(in)
, writing_eorq & ! intent(in)
, writing_dcyc & ! intent(in)
, runtype ! ! intent(in)
use ed_work_vars , only : ed_dealloc_work & ! subroutine
, work_e ! ! intent(inout)
use soil_coms , only : alloc_soilgrid ! ! subroutine
use ed_node_coms , only : mynum & ! intent(in)
, nnodetot & ! intent(in)
, sendnum & ! intent(in)
, recvnum ! ! intent(in)
use io_params , only : ioutput ! ! intent(in)
use rk4_coms , only : checkbudget ! ! intent(in)
use phenology_aux , only : first_phenology ! ! subroutine
use average_utils , only : update_ed_yearly_vars & ! sub-routine
, zero_ed_fmean_vars & ! sub-routine
, zero_ed_dmean_vars & ! sub-routine
, zero_ed_qmean_vars & ! sub-routine
, zero_ed_mmean_vars ! ! sub-routine
use hrzshade_utils , only : init_cci_variables ! ! subroutine
use canopy_radiation_coms, only : ihrzrad ! ! intent(in)
use budget_utils , only : ed_init_budget ! ! sub-routine
use ed_type_init , only : ed_init_viable ! ! sub-routine
use soil_respiration , only : zero_litter_inputs ! ! sub-routine
use grid_coms , only : ngrids & ! intent(in)
, time & ! intent(in)
, timmax ! ! intent(in)
use ed_state_vars , only : allocate_edglobals & ! subroutine
, filltab_alltypes & ! subroutine
, edgrid_g ! ! subroutine
use ed_init , only : read_obstime ! ! subroutine
use ed_misc_coms , only : fast_diagnostics & ! intent(in)
, current_time & ! intent(in)
, iyeara & ! intent(in)
, imontha & ! intent(in)
, idatea & ! intent(in)
, itimea & ! intent(in)
, runtype & ! intent(in)
, ifoutput & ! intent(in)
, idoutput & ! intent(in)
, imoutput & ! intent(in)
, iqoutput & ! intent(in)
, isoutput & ! intent(in)
, iyoutput & ! intent(in)
, iooutput & ! intent(in)
, writing_long & ! intent(in)
, writing_eorq & ! intent(in)
, writing_dcyc & ! intent(in)
, runtype ! ! intent(in)
use ed_work_vars , only : ed_dealloc_work & ! subroutine
, work_e ! ! intent(inout)
use soil_coms , only : alloc_soilgrid ! ! subroutine
use ed_node_coms , only : mynum & ! intent(in)
, nnodetot & ! intent(in)
, sendnum & ! intent(in)
, recvnum ! ! intent(in)
use io_params , only : ioutput ! ! intent(in)
use rk4_coms , only : checkbudget ! ! intent(in)
use phenology_aux , only : first_phenology ! ! subroutine
use average_utils , only : update_ed_yearly_polygons & ! sub-routine
, zero_ed_fmean_polygons & ! sub-routine
, zero_ed_dmean_polygons & ! sub-routine
, zero_ed_qmean_polygons & ! sub-routine
, zero_ed_mmean_polygons ! ! sub-routine
use hrzshade_utils , only : init_cci_variables ! ! subroutine
use canopy_radiation_coms, only : ihrzrad ! ! intent(in)
use budget_utils , only : ed_init_budget ! ! sub-routine
use ed_type_init , only : ed_init_viable ! ! sub-routine
use soil_respiration , only : zero_litter_inputs ! ! sub-routine
#if defined(RAMS_MPI)
use mpi
#endif
Expand Down Expand Up @@ -371,15 +371,15 @@ subroutine ed_coup_driver()
if (trim(runtype) /= 'HISTORY') then
if (mynum == nnodetot) write(unit=*,fmt='(a)') ' [+] Reset long-term means...'
do ifm=1,ngrids
if (writing_long) call zero_ed_dmean_vars(edgrid_g(ifm))
if (writing_eorq) call zero_ed_mmean_vars(edgrid_g(ifm))
if (writing_dcyc) call zero_ed_qmean_vars(edgrid_g(ifm))
if (writing_long) call zero_ed_dmean_polygons(edgrid_g(ifm))
if (writing_eorq) call zero_ed_mmean_polygons(edgrid_g(ifm))
if (writing_dcyc) call zero_ed_qmean_polygons(edgrid_g(ifm))
end do

!----- Output Initial State. --------------------------------------------------------!
if (mynum == nnodetot) write(unit=*,fmt='(a)') ' [+] Update annual means...'
do ifm=1,ngrids
call update_ed_yearly_vars(edgrid_g(ifm))
call update_ed_yearly_polygons(edgrid_g(ifm))
end do
end if

Expand All @@ -391,7 +391,7 @@ subroutine ed_coup_driver()

if (mynum == nnodetot) write(unit=*,fmt='(a)') ' [+] Reset averaged variables...'
do ifm=1,ngrids
call zero_ed_fmean_vars(edgrid_g(ifm))
call zero_ed_fmean_polygons(edgrid_g(ifm))
end do


Expand Down
Loading
Loading