Skip to content
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.

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

A few fixes and extend mksurfdata to set PFT/CFT fractions but use veg-cover from dataset #814

Merged
merged 71 commits into from
Nov 15, 2019

Commits on Sep 13, 2019

  1. Configuration menu
    Copy the full SHA
    c40e1ef View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2019

  1. Add mkpftMod.F90 to the list of subroutines to compile, which also re…

    …quires other subroutines to the list as well as some additional functons to mkncdio.F90
    ekluzek committed Sep 15, 2019
    Configuration menu
    Copy the full SHA
    ed821fa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3c04ffa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6698b81 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. Add a abort subroutine for unit testing, and add a test that uses it,…

    … also add the unit test build to the git ignore
    ekluzek committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    77e06f6 View commit details
    Browse the repository at this point in the history
  2. Add some more exception tests

    ekluzek committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    29a169a View commit details
    Browse the repository at this point in the history
  3. Add more exception tests, fix two issues in mkpft one to do test on n…

    …umpft outside of if, and handle case when all PFTs are set
    ekluzek committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    e13c35c View commit details
    Browse the repository at this point in the history
  4. Add a test to set all the PFT's. This test detects a problem in the e…

    …arlier mkpftMod.F90 version
    ekluzek committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    cda9280 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    43dbdac View commit details
    Browse the repository at this point in the history
  6. Add a method to set domain for unit-testing, and call mkpft for the z…

    …ero-out and pft unit tests, also zero-out doesn't need to read in datasets in mkpft and tgridmap doesn't need to be cleaned at the end of mkpft for these two cases
    ekluzek committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    a31ffe6 View commit details
    Browse the repository at this point in the history
  7. Start checking more things

    ekluzek committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    a62d4d8 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2019

  1. Configuration menu
    Copy the full SHA
    09e98c7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    32c394c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    162c393 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f57efe3 View commit details
    Browse the repository at this point in the history
  5. Remove the oldformat option from the reading section, now will die if…

    … oldformat is flagged
    ekluzek committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    4a64e18 View commit details
    Browse the repository at this point in the history
  6. Start adding a pft override object to handle the overriding the PFT f…

    …rom both zeroout and index provided methods
    ekluzek committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    b01ff1d View commit details
    Browse the repository at this point in the history
  7. Add pft_oride constructor and Clean methods as well as a simple test …

    …for the zero out option
    ekluzek committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    2d2a3cd View commit details
    Browse the repository at this point in the history
  8. Implement the InitAllPFTIndex method, and add some tests for it, also…

    … start using stored indices for some values
    ekluzek committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    b0e7f80 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    6f25e79 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2019

  1. Configuration menu
    Copy the full SHA
    303e233 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a82183b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    27df3e2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d9d52cc View commit details
    Browse the repository at this point in the history
  5. Remove global zero_out, and use PFT oride settings to set PFT's as a …

    …special case of use_input_pft, make all_veg a local input to mkpftInit and create a global one that is set in mkpftInit, also add it to the namelist
    ekluzek committed Sep 18, 2019
    Configuration menu
    Copy the full SHA
    cee61f5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a75bb78 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2019

  1. Allow PFT's to be prescribed but use overall veg cover from dataset

    Remove global all_veg and add in presc_cover in it's place. all_veg
    now comes as input to mkpftInit and helps set presc_cover. Unit
    tests updated and working.
    ekluzek committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    be671e4 View commit details
    Browse the repository at this point in the history
  2. Remove an unneeded else

    ekluzek committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    af31c18 View commit details
    Browse the repository at this point in the history
  3. Have mkharv listen to all_veg rather than pft_frc>0, so harvesting wi…

    …ll be set for prescribed PFT cases that use dataset PCT_NAT_VEG and PCT_CROP
    ekluzek committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    e5e67aa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b79a6ef View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    43529b6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a297c0b View commit details
    Browse the repository at this point in the history
  7. Move lai_interp and SoilMoistureStreamsInterp outside of OMP loops so…

    … can run with threading on fixing ESCOMP#791
    ekluzek committed Oct 4, 2019
    Configuration menu
    Copy the full SHA
    9b71ec6 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2019

  1. Configuration menu
    Copy the full SHA
    1993926 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    626c038 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2019

  1. Point ndep SSP files to ones that have historical period 1849-2013 ad…

    …ded to the front of them
    ekluzek committed Oct 7, 2019
    Configuration menu
    Copy the full SHA
    d54d51c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8d9b26a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fcb4b0c View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. Configuration menu
    Copy the full SHA
    892bb90 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2019

  1. Fix wallclock for a test

    ekluzek committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    06f9611 View commit details
    Browse the repository at this point in the history
  2. Remove the update of pointing clm4_5 for 1850_control to the 1850-PI …

    …control fndep file, continue to use the historical fndep file so that answers don't change
    ekluzek committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    8e4a2c3 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2019

  1. Revert "Set stream_year_*_urbantv for clm4_5 to fix issue ESCOMP#175"

    This reverts commit 43529b6:
    
    Revert the change in urbantv for clm4_5 as it changes answers in
    some cases.
    ekluzek committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    709bd85 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    11efa7c View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2019

  1. Seperate out PrescribedSoilMoistureAdvance to different subroutine to…

    … seperate part of driver can be called from. Also add some SHR_ASSERT calls for checking it, add a new diagonstic history variable for H2OSOI as read from streams so can compare to input, make the calls to new subroutine in the original place which shouldn't change answers, but it does unexpectedly
    ekluzek committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    6173fe4 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2019

  1. Correct arguments to setup_logic_soilm_streams

    Properly send $opts down to it, and use it in calls inside.
    Also add a check that this isn't a transient use case for soil
    streams with linear time-interpolation as that will likely cause
    an error going from a vegetated point that is missing to not, or
    vice versa. Also add a check for that. And fix the soilm test which
    had phys in place of conopts.
    ekluzek committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    391722e View commit details
    Browse the repository at this point in the history
  2. Change H2OSOI_PRESRIBED to be gridcell only

    Change h2osoi_prs to be on gridcell. Do some checking for spval
    in soil moisture streams. Added a check that prints a warning
    and a commented out endrun (until we have a dataset in full agreement).
    ekluzek committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    31ed384 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ef35f63 View commit details
    Browse the repository at this point in the history
  4. Add in soilm_offset

    ekluzek committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    0710e29 View commit details
    Browse the repository at this point in the history
  5. Fix write of soilm_offset

    ekluzek committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    9bd6929 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b2e8f7d View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2019

  1. Configuration menu
    Copy the full SHA
    c8a0ccb View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2019

  1. Add soilm_ignore_data_if_missing

    Add new namelist item soilm_ignore_data_if_missing and react to it.
    Also use old way for the indexing in an attempt to reproduce the
    previous results. If soilm_ignore_data_if_missing is true and find
    a missing point expected continue calculation as before. If not
    abort when that point is found. Also comment out the section
    where values greater than 10 were set to spval as that changes
    answers.
    ekluzek committed Nov 6, 2019
    Configuration menu
    Copy the full SHA
    c8b4127 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2019

  1. Checkin version that is identical to release-clm5.0.27

    OK, this is a version that is identical to release-clm5.0.27. Found out
    the issue was that lai_interp can't be moved the way I did. It needs
    to be divided into the streams part and non-streams part like is
    being done in SoilMoistureStreams.
    
    So this replicates answers for SMS_P720x1_D_Ld3.f09_g17.I2000Clm50SpGs.cheyenne_intel.clm-prescribed
    ekluzek committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    46a146c View commit details
    Browse the repository at this point in the history
  2. OK now separate out the calls to SoilMoistureAdvance to the processor…

    … level and SoilMoistureInterp to the OMP clump level
    ekluzek committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    8f85fe0 View commit details
    Browse the repository at this point in the history
  3. Divide LAI into lai_advance for streams to be in a non-OpenMP area, a…

    …nd lai_interp called from within an OpenMP threading loop
    ekluzek committed Nov 7, 2019
    Configuration menu
    Copy the full SHA
    6b9c698 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2019

  1. Get working with threading

    ekluzek committed Nov 10, 2019
    Configuration menu
    Copy the full SHA
    beabec6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ec59232 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e803762 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. Add tintalgo for: lai, lightning, pop-dens, urbantv, and ndep

    Add tintalgo settings for most of the streams. Also
    change the buildnml fatal-error for soilm_tintalgo='linear'
    for transient to a warning that can be overridden if desired.
    Also fix the build-namelist unit test for warnings, so it
    verifies that warnings die, but will run if -ignore_warnings
    is set. Also get maxpatch_pft to normally die if the two
    valid settings are used (79 or 17).
    ekluzek committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    dbc5ac9 View commit details
    Browse the repository at this point in the history
  2. Point to cime5.6.25

    ekluzek committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    4591d1f View commit details
    Browse the repository at this point in the history
  3. Change threaded prescribed test to f09 and present-day (as required f…

    …or soil moisture streams)
    ekluzek committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    e71b025 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f3d9807 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2019

  1. Configuration menu
    Copy the full SHA
    4d492dd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b9023af View commit details
    Browse the repository at this point in the history
  3. Mark PGI tests as failing on izumi as well (until we get a fix for ci…

    …me that gets them to work)
    ekluzek committed Nov 13, 2019
    Configuration menu
    Copy the full SHA
    790a61d View commit details
    Browse the repository at this point in the history
  4. all_veg if was backwards

    ekluzek committed Nov 13, 2019
    Configuration menu
    Copy the full SHA
    0467225 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c2bddc9 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2019

  1. Fix CPRNC version to point to

    ekluzek committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    bc69725 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3d968d6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ad95aef View commit details
    Browse the repository at this point in the history
  4. Update Change files

    ekluzek committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    93444b3 View commit details
    Browse the repository at this point in the history