Skip to content

Commit

Permalink
Merge branch 'fna-rebase_2-testing_fixes' into fates_main_api
Browse files Browse the repository at this point in the history
  • Loading branch information
glemieux committed Aug 5, 2020
2 parents e7f9d59 + d6ef097 commit a88a0e8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 11 deletions.
3 changes: 1 addition & 2 deletions bld/CLMBuildNamelist.pm
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,6 @@ sub setup_cmdl_fire_light_res {
$nl_flags->{$var} = ".false.";
}
}
}

#-------------------------------------------------------------------------------

Expand Down Expand Up @@ -2561,7 +2560,7 @@ sub setup_logic_do_harvest {
# cannot_be_true will be set to a non-empty string in any case where
# do_harvest should not be true; if it turns out that do_harvest IS true
# in any of these cases, a fatal error will be generated
my $cannot_be_true = ""
my $cannot_be_true = "";

if (string_is_undef_or_empty($nl->get_value('flanduse_timeseries'))) {
$cannot_be_true = "$var can only be set to true when running a transient case (flanduse_timeseries non-blank)";
Expand Down
2 changes: 1 addition & 1 deletion src/main/clm_driver.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,7 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
call clm_fates%dynamics_driv( nc, bounds_clump, &
atm2lnd_inst, soilstate_inst, temperature_inst, active_layer_inst, &
water_inst%waterstatebulk_inst, water_inst%waterdiagnosticbulk_inst, &
water_inst%wateratm2lndbulk_inst, canopystate_inst, soilbiogeochem_carbonflux_inst &
water_inst%wateratm2lndbulk_inst, canopystate_inst, soilbiogeochem_carbonflux_inst, &
frictionvel_inst)

! TODO(wjs, 2016-04-01) I think this setFilters call should be replaced by a
Expand Down
2 changes: 1 addition & 1 deletion src/main/clm_instMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ end subroutine clm_instReadNML
subroutine clm_instInit(bounds)
!
! !USES:
use clm_varpar , only : nlevsno, numpft
use clm_varpar , only : nlevsno
use controlMod , only : nlfilename, fsurdat
use domainMod , only : ldomain
use SoilBiogeochemDecompCascadeBGCMod , only : init_decompcascade_bgc
Expand Down
8 changes: 1 addition & 7 deletions src/utils/clmfates_interfaceMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ module CLMFatesInterfaceMod
use SolarAbsorbedType , only : solarabs_type
use SoilBiogeochemCarbonFluxType, only : soilbiogeochem_carbonflux_type
use SoilBiogeochemCarbonStateType, only : soilbiogeochem_carbonstate_type
use FrictionVelocityMod , only : frictionvel_type
use clm_time_manager , only : is_restart
use ncdio_pio , only : file_desc_t, ncd_int, ncd_double
use restUtilMod, only : restartvar
Expand Down Expand Up @@ -305,13 +306,6 @@ subroutine CLMFatesGlobals()
end if
call set_fates_ctrlparms('use_vertsoilc',ival=pass_vertsoilc)

if(use_fates_spitfire) then
pass_spitfire = 1
else
pass_spitfire = 0
end if
call set_fates_ctrlparms('use_spitfire',ival=pass_spitfire)

if(use_fates_fixed_biogeog)then
pass_biogeog = 1
else
Expand Down

0 comments on commit a88a0e8

Please sign in to comment.