Skip to content

Commit

Permalink
Merge remote-tracking branch 'escomp/b4b-dev' into PLUMBERcsv
Browse files Browse the repository at this point in the history
  • Loading branch information
@ekluzek
ekluzek committed Mar 21, 2024
2 parents a202a6a + d2dea27 commit 666ba3d
Show file tree
Hide file tree
Showing 2 changed files with 241 additions and 15 deletions.
254 changes: 240 additions & 14 deletions cime_config/config_pes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-1</ntasks_lnd>
<ntasks_rof>-1</ntasks_rof>
<ntasks_ice>-1</ntasks_ice>
<ntasks_ocn>-1</ntasks_ocn>
<ntasks_glc>-1</ntasks_glc>
<ntasks_wav>-1</ntasks_wav>
<ntasks_cpl>-1</ntasks_cpl>
<ntasks_lnd>-4</ntasks_lnd>
<ntasks_rof>-4</ntasks_rof>
<ntasks_ice>-4</ntasks_ice>
<ntasks_ocn>-4</ntasks_ocn>
<ntasks_glc>-4</ntasks_glc>
<ntasks_wav>-4</ntasks_wav>
<ntasks_cpl>-4</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand Down Expand Up @@ -631,6 +631,43 @@
</pes>
</mach>
</grid>
<grid name="l%360x720">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-21</ntasks_lnd>
<ntasks_rof>-21</ntasks_rof>
<ntasks_ice>-21</ntasks_ice>
<ntasks_ocn>-21</ntasks_ocn>
<ntasks_glc>-21</ntasks_glc>
<ntasks_wav>-21</ntasks_wav>
<ntasks_cpl>-21</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%0.47x0.63" >
<mach name="any">
<pes pesize="any" compset="any">
Expand Down Expand Up @@ -742,19 +779,56 @@
</pes>
</mach>
</grid>
<grid name="l%ne16" >
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_glc>-8</ntasks_glc>
<ntasks_wav>-8</ntasks_wav>
<ntasks_cpl>-8</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%ne30" >
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-5</ntasks_lnd>
<ntasks_rof>-5</ntasks_rof>
<ntasks_ice>-5</ntasks_ice>
<ntasks_ocn>-5</ntasks_ocn>
<ntasks_glc>-5</ntasks_glc>
<ntasks_wav>-5</ntasks_wav>
<ntasks_cpl>-5</ntasks_cpl>
<ntasks_lnd>-12</ntasks_lnd>
<ntasks_rof>-12</ntasks_rof>
<ntasks_ice>-12</ntasks_ice>
<ntasks_ocn>-12</ntasks_ocn>
<ntasks_glc>-12</ntasks_glc>
<ntasks_wav>-12</ntasks_wav>
<ntasks_cpl>-12</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
Expand Down Expand Up @@ -1560,6 +1634,158 @@
</pes>
</mach>
</grid>
<grid name="l%mpasa480">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-4</ntasks_lnd>
<ntasks_rof>-4</ntasks_rof>
<ntasks_ice>-4</ntasks_ice>
<ntasks_ocn>-4</ntasks_ocn>
<ntasks_glc>-4</ntasks_glc>
<ntasks_wav>-4</ntasks_wav>
<ntasks_cpl>-4</ntasks_cpl>
<ntasks_lnd>-4</ntasks_lnd>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%mpasa120">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-8</ntasks_lnd>
<ntasks_rof>-8</ntasks_rof>
<ntasks_ice>-8</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_glc>-8</ntasks_glc>
<ntasks_wav>-8</ntasks_wav>
<ntasks_cpl>-8</ntasks_cpl>
<ntasks_lnd>-8</ntasks_lnd>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%mpasa60">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-12</ntasks_lnd>
<ntasks_rof>-12</ntasks_rof>
<ntasks_ice>-12</ntasks_ice>
<ntasks_ocn>-12</ntasks_ocn>
<ntasks_glc>-12</ntasks_glc>
<ntasks_wav>-12</ntasks_wav>
<ntasks_cpl>-12</ntasks_cpl>
<ntasks_lnd>-12</ntasks_lnd>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%mpasa15">
<mach name="derecho">
<pes pesize="any" compset="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-36</ntasks_lnd>
<ntasks_rof>-36</ntasks_rof>
<ntasks_ice>-36</ntasks_ice>
<ntasks_ocn>-36</ntasks_ocn>
<ntasks_glc>-36</ntasks_glc>
<ntasks_wav>-36</ntasks_wav>
<ntasks_cpl>-36</ntasks_cpl>
<ntasks_lnd>-36</ntasks_lnd>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>-1</rootpe_lnd>
<rootpe_rof>-1</rootpe_rof>
<rootpe_ice>-1</rootpe_ice>
<rootpe_ocn>-1</rootpe_ocn>
<rootpe_glc>-1</rootpe_glc>
<rootpe_wav>-1</rootpe_wav>
<rootpe_cpl>-1</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="l%0.125nldas2">
<mach name="any">
<pes pesize="any" compset="any">
Expand Down
2 changes: 1 addition & 1 deletion src/biogeochem/CNDriverMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ subroutine CNDriverNoLeaching(bounds,
nvegnpool, &
num_bgc_vegp, filter_bgc_vegp, 0._r8, &
num_bgc_soilc, filter_bgc_soilc, 0._r8)
call t_stopf('CNZero-vegbgc-nflux')
end if

call t_stopf('CNZero-vegbgc-nflux')
call t_startf('CNZero-soilbgc-nflux')
call soilbiogeochem_nitrogenflux_inst%SetValues( &
num_bgc_soilc, filter_bgc_soilc, 0._r8)
Expand Down

0 comments on commit 666ba3d

Please sign in to comment.