Merge pull request #1767 from ESMCI/mvertens/refactored_datamodels

refactored datamodels
refactored datamodels for new modularity

This PR contains a refactorization of the data models in order to separate out the driver specfic parts of dxxx_comp_mod.F90 (which now contains datatypes such as cdata, infodata, etc. that are specific to the current mct cpl7 driver) and permit new driver implementations (e.g. nuopc) to use the core parts of the data models. In addition, a new directory data_comps/dshare now contains data model share code that was previously in share/utils.

Test suite: scripts_regressions_tests
The following tests had baselines generated without the refactor and tests were
run to verify that the data model refactor maintained bfb answers

- ERI.f09_g17.ETEST.cheyenne_intel.cice-default
- ERI.f09_g17.ETEST.cheyenne_intel.cice-default
- ERI.f09_g17.ETEST.cheyenne_intel.cice-default
- ERI.T62_g16.C1850ECO.cheyenne_intel.pop-ecosys
- ERI.T62_g16.C.cheyenne_intel.pop-default
- ERI.T62_g16.CIAF.cheyenne_intel.pop-default
- ERI.T62_g16.GIAF.cheyenne_intel.pop-default
- ERI.T62_g17.DTEST.cheyenne_intel.cice-default
- ERI.T62_g17.G.cheyenne_gnu.pop-cice
- ERP_D_Ln9.f19_f19_mg17.QPC6.cheyenne_intel.cam-outfrq9s
- ERP_D_Ln9.f19_f19_mg17.QSC6.cheyenne_intel.cam-outfrq9s
- ERP_Ln9.f09_f09_mg17.F1850_DONOTUSE.cheyenne_intel.cam-outfrq9s
- ERP_Ln9.f09_f09_mg17.FHIST_DEV.cheyenne_intel.cam-outfrq9s
- ERP_Ln9.f19_f19_mg17.F2000_DEV.cheyenne_gnu.cam-outfrq9s
- ERR.f45_g37_rx1.A.cheyenne_intel
- ERS.f09_g16.ADLND.cheyenne_intel
- ERS_Ld3.f45_g37_rx1.A.cheyenne_intel
- ERS_Lm3.T62_g16.AIAF.cheyenne_intel
- ERS_Ly20_N2_P2.f09_g16_gl20.T1850G1.cheyenne_intel
- ERS_Ly3.f09_g16_gl4.T1850G.cheyenne_intel
- PEM.f19_g16_rx1.A.cheyenne_intel
- PEM.f19_g16_rx1.A.cheyenne_intel
- SMS.f09_g16.ADWAV.cheyenne_intel
Also ran most aux_clm5 tests and verified bfb with clm4_5_1_r251
Test baseline: see above
Test namelist changes:
Test status: none

Fixes #1713

User interface changes?: None

Update gh-pages html (Y/N)?: N

Code review: jedwards, rjacob

scripts/lib/CIME/buildlib.py

@@ -41,6 +41,7 @@ def build_cime_component_lib(case, compname, libroot, bldroot):
         out.write(os.path.join(case.get_value('CASEROOT'), "SourceMods",
                                "src.{}\n".format(compname)) + "\n")
         if compname.startswith('d'):
+            out.write(os.path.join(cimeroot, "src", "components", "data_comps", compname, "mct") + "\n")
             out.write(os.path.join(cimeroot, "src", "components", "data_comps", compname) + "\n")
         elif compname.startswith('x'):
             out.write(os.path.join(cimeroot, "src", "components", "xcpl_comps", "xshare") + "\n")

src/build_scripts/buildlib.csm_share

@@ -44,6 +44,7 @@ chdir($libdir) or die "Could not cd to $libdir: $!\n";
 my @filepath = ( "$CASEROOT/SourceMods/src.share",
 		 "$CIMEROOT/src/drivers/mct/shr",
 		 "$CIMEROOT/src/components/xcpl_models/xshare",
+		 "$CIMEROOT/src/components/data_comps/dshare",
 		 "$CIMEROOT/src/share/util",
 		 "$CIMEROOT/src/share/RandNum/src",
 		 "$CIMEROOT/src/share/RandNum/src/dsfmt_f03",