Skip to content

Update FATES hydro test mod to remove temporary test failure workaround #2882

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

Merged
merged 11 commits into from
Jan 8, 2025
Merged

Update FATES hydro test mod to remove temporary test failure workaround #2882

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f147be3
Revert "fix typo in fates hydro user_nl_clm"
glemieux Nov 15, 2024
ea475c1
Revert "add shell call to generate fates hydro parameter file on the …
glemieux Nov 15, 2024
ac5a615
update fates tag to sci.1.80.1_api.37.0.0
glemieux Nov 18, 2024
7413167
update fates tag to sci.1.80.4_api.37.0.0
glemieux Dec 13, 2024
8f15029
Merge tag 'ctsm5.3.016' into test-update-fateshydro
glemieux Jan 2, 2025
6142b68
Merge remote-tracking branch 'escomp/tmp-241219' into test-update-fat…
glemieux Jan 2, 2025
6603ed2
add PVT test issue #2919 to expected failures
glemieux Jan 2, 2025
c67acd5
update changelog
glemieux Jan 7, 2025
136970d
Update change files to point to the tags of the two tmp branch tags t…
ekluzek Jan 7, 2025
3196de7
Merge commit '136970d9f' into test-update-fateshydro
ekluzek Jan 7, 2025
e58aab5
Update timestamp in change files
ekluzek Jan 8, 2025
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[submodule "fates"]
path = src/fates
url = https://github.com/NGEET/fates
fxtag = sci.1.79.3_api.37.0.0
fxtag = sci.1.80.4_api.37.0.0
fxrequired = AlwaysRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/NCAR/fates-release
Expand Down
7 changes: 7 additions & 0 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,13 @@
</phase>
</test>

<test name="PVT_Lm3.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesLUPFT">
<phase name="RUN">
<status>FAIL</status>
<issue>#2919</issue>
</phase>
</test>

<!-- Other submodule test list failures (MOSART, RTM, etc. -->

<test name="SMS_Lh3.f10_f10_mg37.I2000Clm60Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
Expand Down
8 changes: 0 additions & 8 deletions cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/shell_commands
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdHydro/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ hist_mfilt = 365
hist_nhtfrq = -24
hist_empty_htapes = .true.
use_fates_planthydro= .true.
fates_paramfile = '$CASEROOT/fates_params_hydrograsstempfix.nc'
hist_fincl1 = 'FATES_ERRH2O_SZPF', 'FATES_TRAN_SZPF',
'FATES_SAPFLOW_SZPF', 'FATES_ITERH1_SZPF','FATES_ABSROOT_H2O_SZPF',
'FATES_TRANSROOT_H2O_SZPF','FATES_STEM_H2O_SZPF','FATES_LEAF_H2O_SZPF',
Expand Down
2 changes: 1 addition & 1 deletion src/fates
Open in desktop
Submodule fates updated 14 files
+11 −7 biogeochem/EDCohortDynamicsMod.F90
+21 −24 biogeochem/EDLoggingMortalityMod.F90
+42 −0 biogeochem/FatesAllometryMod.F90
+36 −37 biogeochem/FatesCohortMod.F90
+3 −5 biogeochem/FatesSoilBGCFluxMod.F90
+2 −11 biogeophys/EDAccumulateFluxesMod.F90
+12 −36 biogeophys/FatesPlantRespPhotosynthMod.F90
+74 −21 main/EDMainMod.F90
+5 −0 main/FatesConstantsMod.F90
+64 −104 main/FatesHistoryInterfaceMod.F90
+11 −4 main/FatesInventoryInitMod.F90
+36 −26 main/FatesRestartInterfaceMod.F90
+6 −1 parteh/PRTAllometricCNPMod.F90
+59 −27 radiation/TwoStreamMLPEMod.F90
Loading