Code

Groundwater irrigation#523

Code

Merged

billsacks merged 48 commits intoESCOMP:masterESCOMP/CTSM:masterfrom swensosc:groundwater_irrigationswensosc/ctsm:groundwater_irrigationCopy head branch name to clipboardDec 3, 2018

+1,470-278

Commits

Commits on Sep 24, 2018

• implement groundwater irrigation and drip/sprinkler irrigation application methods

  swensosc

  committed
  aeb6a55

  Copy full SHA for aeb6a55

Commits on Sep 27, 2018

• add namelist variables for groundwater irrigation and crop fsat = 0

  swensosc

  committed
  bb59407

  Copy full SHA for bb59407

• add default irrigation method behavior

  swensosc

  committed
  448f1e7

  Copy full SHA for 448f1e7

Commits on Oct 8, 2018

• remove 22sl_8.5m soil layer structure

  swensosc

  committed
  a784d4a

  Copy full SHA for a784d4a

• add bounds to available_gw_uncon in clm_driver

  swensosc

  committed
  952e0a6

  Copy full SHA for 952e0a6

• fix vector output of l/c/p indices

  swensosc

  committed
  0e6817d

  Copy full SHA for 0e6817d

• add irrig_method_unset, fix handling of invalid irrig_method values

  swensosc

  committed
  cfcc84d

  Copy full SHA for cfcc84d

• remove col%itype check

  swensosc

  committed
  0879727

  Copy full SHA for 0879727

• add qflx_liq_above_canopy

  swensosc

  committed
  cedea67

  Copy full SHA for cedea67

• change irrig_rate_patch to sfc_irrig_rate_patch

  swensosc

  committed
  4640cc1

  Copy full SHA for 4640cc1

• move calculation of available_gw_uncon out of thetabasedwatertable into new routine CalcAvailableUnconfinedAquifer

  swensosc

  committed
  457fc54

  Copy full SHA for 457fc54

Commits on Oct 9, 2018

• Move groundwater irrigation division to ApplyIrrigation.

  Show description for e0a16d5
  swensosc

  committed
  e0a16d5

  Copy full SHA for e0a16d5

• add validity check for use_aquifer_layer case

  swensosc

  committed
  0d5c887

  Copy full SHA for 0d5c887

Commits on Oct 10, 2018

• remove irrigation from unconfined aquifer after baseflow

  swensosc

  committed
  d7c8b8d

  Copy full SHA for d7c8b8d

Commits on Nov 8, 2018

• Merge remote-tracking branch 'escomp/master' into groundwater_irrigation

  Show description for 1fd6410
  billsacks

  committed
  1fd6410

  Copy full SHA for 1fd6410

• Remove unnecessary use statement that was causing circular dependencies

  billsacks

  committed
  e516e6e

  Copy full SHA for e516e6e

• collect and move groundwater irrigation removal

  swensosc

  committed
  5971ade

  Copy full SHA for 5971ade

• Merge branch 'groundwater_irrigation' of github.com:swensosc/ctsm into groundwater_irrigation

  Show description for 755c6fd
  swensosc

  committed
  755c6fd

  Copy full SHA for 755c6fd

Commits on Nov 9, 2018

• Reduce dependencies for the sake of the unit test build

  Show description for e77b778
  billsacks

  committed
  e77b778

  Copy full SHA for e77b778

• Remove notes that are no longer relevant

  billsacks

  committed
  cc565a0

  Copy full SHA for cc565a0

• Remove unused arguments

  billsacks

  committed
  073e067

  Copy full SHA for 073e067

• add UseGroundwaterIrrigation conditional, clean up water balance check

  swensosc

  committed
  3430e42

  Copy full SHA for 3430e42

• merge SoilHydrologyMod

  swensosc

  committed
  3db3f4a

  Copy full SHA for 3db3f4a

• a few clean up items

  swensosc

  committed
  e309a63

  Copy full SHA for e309a63

• fix histFileMod

  swensosc

  committed
  12e87b5

  Copy full SHA for 12e87b5

• Add consistency check for use_groundwater_irrigation

  

  ekluzek

  authored and

  billsacks

  committed
  2b33248

  Copy full SHA for 2b33248

Commits on Nov 12, 2018

• Get irrigation unit tests passing

  billsacks

  committed
  2e53b7f

  Copy full SHA for 2e53b7f

Commits on Nov 13, 2018

• Add unit tests covering new irrigation behavior

  Show description for b0cabac
  billsacks

  committed
  b0cabac

  Copy full SHA for b0cabac

• Add single_p, single_c and single_g variables for single-point tests

  Show description for e6942dc
  billsacks

  committed
  e6942dc

  Copy full SHA for e6942dc

• Make "single-point" tests actually include multiple points

  Show description for 3a43fbd
  billsacks

  committed
  3a43fbd

  Copy full SHA for 3a43fbd

Commits on Nov 14, 2018

• Revert "Make "single-point" tests actually include multiple points"

  Show description for 291893a
  billsacks

  committed
  291893a

  Copy full SHA for 291893a

• Revert "Add single_p, single_c and single_g variables for single-point tests"

  Show description for 9aa547c
  billsacks

  committed
  9aa547c

  Copy full SHA for 9aa547c

• Add an irrig_method_default namelist option

  Show description for 31c56da
  billsacks

  committed
  31c56da

  Copy full SHA for 31c56da

• Add more error checking on use_groundwater_irrigation

  Show description for b90d854
  billsacks

  committed
  b90d854

  Copy full SHA for b90d854

• Add tests covering the new irrigation options

  billsacks

  committed
  68eb76c

  Copy full SHA for 68eb76c

• Tweak test output for new qirrig fields

  billsacks

  committed
  454cedf

  Copy full SHA for 454cedf

Commits on Nov 15, 2018

• correct indices in histfileMod

  swensosc

  committed
  09cb145

  Copy full SHA for 09cb145

• Merge branch 'groundwater_irrigation' of github.com:swensosc/ctsm into groundwater_irrigation

  swensosc

  committed
  ec8c38b

  Copy full SHA for ec8c38b

• Extract routine calling three related routines for irrigation withdrawal

  Show description for b6f60d1
  billsacks

  committed
  b6f60d1

  Copy full SHA for b6f60d1

• Only do some irrigation calls if needed

  Show description for 0c9c875
  billsacks

  committed
  0c9c875

  Copy full SHA for 0c9c875

• Restore accidentally-deleted line

  billsacks

  committed
  dc72f0e

  Copy full SHA for dc72f0e

• Fix history field name in usermod

  billsacks

  committed
  23645cb

  Copy full SHA for 23645cb

• Only try to access irrig_method for CFTs

  Show description for 21616fc
  billsacks

  committed
  21616fc

  Copy full SHA for 21616fc

• Better method for only accessing irrig_method for CFTs

  Show description for 1074092
  billsacks

  committed
  1074092

  Copy full SHA for 1074092

Commits on Nov 16, 2018

• Minor cleanup

  billsacks

  committed
  6a7b0a1

  Copy full SHA for 6a7b0a1

Commits on Nov 30, 2018

• Merge tag 'ctsm1.0.dev017' into groundwater_irrigation

  Show description for 5521656
  billsacks

  committed
  5521656

  Copy full SHA for 5521656

• Merge tag 'ctsm1.0.dev018' into groundwater_irrigation

  Show description for a2d0e53
  billsacks

  committed
  a2d0e53

  Copy full SHA for a2d0e53

• Merge branch 'master' into groundwater_irrigation

  billsacks

  committed
  6fd47d7

  Copy full SHA for 6fd47d7