diff --git a/build/source/dshare/popMetadat.f90 b/build/source/dshare/popMetadat.f90 index 7d023e40f4936a20e113312544e43e3fe22c1f0b..95bfa80ed13fe76dd7c3c414cb3d788368904afd 100755 --- a/build/source/dshare/popMetadat.f90 +++ b/build/source/dshare/popMetadat.f90 @@ -323,7 +323,7 @@ subroutine popMetadat(err,message) prog_meta(iLookPROG%scalarSurfaceTemp) = var_info('scalarSurfaceTemp' , 'surface temperature (just a copy of the upper-layer temperature)' , 'K' , get_ixVarType('scalarv'), iMissVec, iMissVec, .false.) ! define coordinate variables prog_meta(iLookPROG%mLayerDepth) = var_info('mLayerDepth' , 'depth of each layer' , 'm' , get_ixVarType('midToto'), iMissVec, iMissVec, .false.) - prog_meta(iLookPROG%mLayerHeight) = var_info('mLayerHeight' , 'height of the layer mid-point (top of soil = 0)' , 'm' , get_ixVarType('midToto'), iMissVec, iMissVec, .false.) + prog_meta(iLookPROG%mLayerHeight) = var_info('mLayerHeight' , 'height of the layer mid-point (top of soil = 0)' , 'm' , get_ixVarType('ifcToto'), iMissVec, iMissVec, .false.) prog_meta(iLookPROG%iLayerHeight) = var_info('iLayerHeight' , 'height of the layer interface (top of soil = 0)' , 'm' , get_ixVarType('ifcToto'), iMissVec, iMissVec, .false.) ! ----- diff --git a/build/source/engine/coupled_em.f90 b/build/source/engine/coupled_em.f90 index d7dd3d7d51a40cb053327e61af63fe1b8962b702..76f05fe29ad340c2d84126a4295cbb1d767b8141 100755 --- a/build/source/engine/coupled_em.f90 +++ b/build/source/engine/coupled_em.f90 @@ -252,15 +252,6 @@ subroutine coupled_em(& ! ---------------------------------------------------------------------------------------------------------------------------------------------- ! initialize error control err=0; message="coupled_em/" - print*, "*******" - print*, "*******" - print*, "*******" - print*, "Sundials = ", sundials - print*, "*******" - print*, "*******" - print*, "*******" - - ! This is the start of a data step for a local HRU ! check that the decision is supported if(model_decisions(iLookDECISIONS%groundwatr)%iDecision==bigBucket .and. & diff --git a/build/source/engine/opSplittin.f90 b/build/source/engine/opSplittin.f90 index 0a3b113558520a805be22a78dda305292a6f1768..c22a32ecf3b0ac97a5c2aeba998fa71a05f4d736 100755 --- a/build/source/engine/opSplittin.f90 +++ b/build/source/engine/opSplittin.f90 @@ -1103,9 +1103,7 @@ subroutine opSplittin(& ! use step halving if unable to complete the fully coupled solution in one substep if(ixCoupling/=fullyCoupled .or. nSubsteps>1) dtMultiplier=0.5_dp - - print*, "size = ", size(mLayerMeltFreeze) - print*, "nLayers = ",nLayers + ! compute the melt in each snow and soil layer if(nSnow>0) mLayerMeltFreeze( 1:nSnow ) = -(mLayerVolFracIce( 1:nSnow ) - mLayerVolFracIceInit( 1:nSnow ))*iden_ice mLayerMeltFreeze(nSnow+1:nLayers) = -(mLayerVolFracIce(nSnow+1:nLayers) - mLayerVolFracIceInit(nSnow+1:nLayers))*iden_water diff --git a/utils/laugh_tests/celia1990/verification_data/runinfo.txt b/utils/laugh_tests/celia1990/verification_data/runinfo.txt index 59a09d01e358c67afcbefe5a6742c457823e3a88..25d398f9cfc44609989125b16d3833c10831c27f 100644 --- a/utils/laugh_tests/celia1990/verification_data/runinfo.txt +++ b/utils/laugh_tests/celia1990/verification_data/runinfo.txt @@ -1 +1 @@ - Run start time on system: ccyy=2022 - mm=09 - dd=07 - hh=23 - mi=07 - ss=43.265 + Run start time on system: ccyy=2022 - mm=09 - dd=08 - hh=15 - mi=40 - ss=22.423 diff --git a/utils/laugh_tests/celia1990/verification_data/summa_celia1990_G1-1_timestep_notsundials.nc b/utils/laugh_tests/celia1990/verification_data/summa_celia1990_G1-1_timestep_notsundials.nc new file mode 100644 index 0000000000000000000000000000000000000000..695cf77a7ee2763be1bc3480935ac379f8e68675 Binary files /dev/null and b/utils/laugh_tests/celia1990/verification_data/summa_celia1990_G1-1_timestep_notsundials.nc differ diff --git a/utils/laugh_tests/colbeck1976/run_test_summa.sh b/utils/laugh_tests/colbeck1976/run_test_summa.sh index f4ed0cce1905d174b2e7642ff4a20f24c8d04444..4b56489e34e4b2eb0b717c8bb33a4acb9c2a0173 100755 --- a/utils/laugh_tests/colbeck1976/run_test_summa.sh +++ b/utils/laugh_tests/colbeck1976/run_test_summa.sh @@ -1,5 +1,5 @@ #! /bin/bash -/SUMMA/bin/summa.exe -g 1 1 -m /Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp1.txt -/SUMMA/bin/summa.exe -g 1 1 -m /Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp2.txt -/SUMMA/bin/summa.exe -g 1 1 -m /Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp3.txt \ No newline at end of file +/SUMMA/bin/summa_sundials.exe -g 1 1 -m /Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp1.txt +/SUMMA/bin/summa_sundials.exe -g 1 1 -m /Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp2.txt +/SUMMA/bin/summa_sundials.exe -g 1 1 -m /Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp3.txt \ No newline at end of file diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zDecisions_colbeck1976.txt b/utils/laugh_tests/colbeck1976/settings/summa_zDecisions_colbeck1976.txt index 60f645f2c9f1463c3a4ce38bdda62d05f3405007..00d44fad76fdd310ad7121dde52ea97bd09bf55f 100644 --- a/utils/laugh_tests/colbeck1976/settings/summa_zDecisions_colbeck1976.txt +++ b/utils/laugh_tests/colbeck1976/settings/summa_zDecisions_colbeck1976.txt @@ -37,7 +37,7 @@ thCondSoil mixConstit ! (27) choice of thermal conduct spatial_gw localColumn ! (28) choice of method for the spatial representation of groundwater subRouting timeDlay ! (29) choice of method for sub-grid routing howHeatCap enthalpyFD -diffEqSolv backwEuler +diffEqSolv sundialIDA ! *********************************************************************************************** ! ***** description of the options available -- nothing below this point is read **************** ! *********************************************************************************************** diff --git a/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp2_G1-1_timestep.nc b/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp2_G1-1_timestep.nc index fbfcc80186ef1b1a3a3ed88542dfe8e85c07f865..27e99c3dc1da709bf1e3e307406e1804486f4feb 100644 Binary files a/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp2_G1-1_timestep.nc and b/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp2_G1-1_timestep.nc differ diff --git a/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp3_G1-1_timestep.nc b/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp3_G1-1_timestep.nc index 5244415ba0820a75a87db973f9ef0b05bc6c6627..96eef89531f15d3d7649199e9d5dceedb46a74ae 100644 Binary files a/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp3_G1-1_timestep.nc and b/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp3_G1-1_timestep.nc differ diff --git a/utils/laugh_tests/colbeck1976/verification_data/runinfo.txt b/utils/laugh_tests/colbeck1976/verification_data/runinfo.txt index 6ffb0dd15662a7bbe474e0cf29bcc9d66997b6c7..9ec6f2ad3e6b7c139f46cd38ed5365d905e58f52 100644 --- a/utils/laugh_tests/colbeck1976/verification_data/runinfo.txt +++ b/utils/laugh_tests/colbeck1976/verification_data/runinfo.txt @@ -1 +1 @@ - Run start time on system: ccyy=2022 - mm=08 - dd=15 - hh=21 - mi=53 - ss=23.550 + Run start time on system: ccyy=2022 - mm=09 - dd=08 - hh=15 - mi=27 - ss=10.981