Merge pull request #3156 from meetagrawal09/dev-fix-#3142

Updated `write.configs.ed` to throw an error if `revision` not specified

Makefile.depends

@@ -28,7 +28,7 @@ $(call depends,models/cable): | .install/base/logger .install/base/utils
 $(call depends,models/clm45): | .install/base/logger .install/base/utils
 $(call depends,models/dalec): | .install/base/logger .install/base/remote .install/base/utils
 $(call depends,models/dvmdostem): | .install/base/logger .install/base/utils
-$(call depends,models/ed): | .install/modules/data.atmosphere .install/modules/data.land .install/base/db .install/base/logger .install/base/remote .install/base/settings .install/base/utils
+$(call depends,models/ed): | .install/modules/data.atmosphere .install/modules/data.land .install/base/logger .install/base/remote .install/base/settings .install/base/utils
 $(call depends,models/fates): | .install/base/logger .install/base/remote .install/base/utils
 $(call depends,models/gday): | .install/base/utils .install/base/logger .install/base/remote
 $(call depends,models/jules): | .install/modules/data.atmosphere .install/base/logger .install/base/remote .install/base/utils

models/ed/DESCRIPTION

@@ -44,7 +44,6 @@ Imports:
     ncdf4 (>= 1.15),
     PEcAn.data.atmosphere,
     PEcAn.data.land,
-    PEcAn.DB,
     PEcAn.logger,
     PEcAn.remote,
     PEcAn.settings,

models/ed/R/write.configs.ed.R

@@ -137,8 +137,7 @@ write.config.ED2 <- function(trait.values, settings, run.id, defaults = settings
   ## Edit ED2IN file for runs
   revision <- settings$model$revision
   if (is.null(revision)) {
-    model <- PEcAn.DB::db.query(paste("SELECT * FROM models WHERE id =", settings$model$id), params = settings$database$bety)
-    revision <- model$revision
+    PEcAn.logger::logger.severe("ED2 model `revision` not specified in PEcAn settings file.")
   }
   revision <- gsub("^r", "", revision)