[Dart-dev] DART/branches Revision: 11819

[dart at ucar.edu]

thoar at ucar.edu
2017-07-17 17:20:10 -0600 (Mon, 17 Jul 2017)
224
Patching things after the rma_trunk merge.
The 'R' files are files that are 'replaced' (local add and remote add, for example)

The only thing new is that the model_mod.f90 writes the dtg to 
output netcdf files we create.




Deleted: DART/branches/coamps/assimilation_code/location/threed_cartesian/xyz_location_mod.nml
===================================================================
--- DART/branches/coamps/assimilation_code/location/threed_cartesian/xyz_location_mod.nml	2017-07-17 22:41:46 UTC (rev 11818)
+++ DART/branches/coamps/assimilation_code/location/threed_cartesian/xyz_location_mod.nml	2017-07-17 23:20:10 UTC (rev 11819)
@@ -1,8 +0,0 @@
-&xyz_location_nml
-   filled     = 10
-   use_octree = .false.
-   nx         = 20
-   ny         = 20
-   nz         = 20
-  /
-

Copied: DART/branches/coamps/assimilation_code/location/threed_cartesian/xyz_location_mod.nml (from rev 11813, DART/branches/rma_trunk/assimilation_code/location/threed_cartesian/xyz_location_mod.nml)
===================================================================
--- DART/branches/coamps/assimilation_code/location/threed_cartesian/xyz_location_mod.nml	                        (rev 0)
+++ DART/branches/coamps/assimilation_code/location/threed_cartesian/xyz_location_mod.nml	2017-07-17 23:20:10 UTC (rev 11819)
@@ -0,0 +1,8 @@
+&xyz_location_nml
+   filled     = 10
+   use_octree = .false.
+   nx         = 20
+   ny         = 20
+   nz         = 20
+  /
+

Deleted: DART/branches/coamps/models/cam-fv/shell_scripts/cesm2_0_beta05/case_run.py
===================================================================
--- DART/branches/coamps/models/cam-fv/shell_scripts/cesm2_0_beta05/case_run.py	2017-07-17 22:41:46 UTC (rev 11818)
+++ DART/branches/coamps/models/cam-fv/shell_scripts/cesm2_0_beta05/case_run.py	2017-07-17 23:20:10 UTC (rev 11819)
@@ -1,242 +0,0 @@
-
-# This code may (or may not) be part of the CESM distribution,
-# So it is not protected by the DART copyright agreement. 
-
-# DART $Id$
-
-from CIME.XML.standard_module_setup import *
-from CIME.case_submit               import submit
-from CIME.utils                     import append_status, gzip_existing_file, new_lid
-from CIME.check_lockedfiles         import check_lockedfiles
-from CIME.get_timing                import get_timing
-from CIME.provenance                import save_prerun_provenance, save_postrun_provenance
-from CIME.preview_namelists         import create_namelists
-
-import shutil, time, sys, os, glob
-
-logger = logging.getLogger(__name__)
-
-###############################################################################
-def pre_run_check(case):
-###############################################################################
-
-    # Pre run initialization code..
-    caseroot = case.get_value("CASEROOT")
-    din_loc_root = case.get_value("DIN_LOC_ROOT")
-    batchsubmit = case.get_value("BATCHSUBMIT")
-    mpilib = case.get_value("MPILIB")
-    rundir = case.get_value("RUNDIR")
-    build_complete = case.get_value("BUILD_COMPLETE")
-
-    # check for locked files.
-    check_lockedfiles(case.get_value("CASEROOT"))
-    logger.debug("check_lockedfiles OK")
-
-    # check that build is done
-    expect(build_complete,
-           "BUILD_COMPLETE is not true\nPlease rebuild the model interactively")
-    logger.debug("build complete is %s " %build_complete)
-
-    # load the module environment...
-    case.load_env()
-
-    # set environment variables
-    # This is a requirement for yellowstone only
-    if mpilib == "mpi-serial" and "MP_MPILIB" in os.environ:
-        del os.environ["MP_MPILIB"]
-    else:
-        os.environ["MPILIB"] = mpilib
-
-    if batchsubmit is None or len(batchsubmit) == 0:
-        os.environ["LBQUERY"] = "FALSE"
-        os.environ["BATCHQUERY"] = "undefined"
-    elif batchsubmit == 'UNSET':
-        os.environ["LBQUERY"] = "FALSE"
-        os.environ["BATCHQUERY"] = "undefined"
-    else:
-        os.environ["LBQUERY"] = "TRUE"
-
-    # create the timing directories, optionally cleaning them if needed.
-    if not os.path.isdir(rundir):
-        os.mkdir(rundir)
-
-    if os.path.isdir(os.path.join(rundir, "timing")):
-        shutil.rmtree(os.path.join(rundir, "timing"))
-
-    os.makedirs(os.path.join(rundir, "timing", "checkpoints"))
-
-    # This needs to be done everytime the LID changes in order for log files to be set up correctly