Rremove nems_datm related code, update CDEPS, and remove run director…

…ies that are no longer needed by other tests (#1008)
ufs-community · Jan 21, 2022 · 18cfa16 · 18cfa16
1 parent a231869
commit 18cfa16
Show file tree

Hide file tree

Showing 18 changed files with 2,737 additions and 3,084 deletions.
diff --git a/CDEPS-interface/CDEPS b/CDEPS-interface/CDEPS
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
 ###############################################################################
 
 # Valid applications and choices
-list(APPEND VALID_APPS ATM ATMAERO ATMW S2S S2SW HAFS HAFSW HAFS-ALL NG-GODAS NG-GODAS-NEMSDATM)
+list(APPEND VALID_APPS ATM ATMAERO ATMW S2S S2SW HAFS HAFSW HAFS-ALL NG-GODAS)
 set(APP NONE CACHE BOOL "Application Name")
 if(NOT (APP IN_LIST VALID_APPS))
   message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")
@@ -30,7 +30,6 @@ set(HYCOM           OFF CACHE BOOL "Enable HYCOM")
 set(CICE6           OFF CACHE BOOL "Enable CICE6")
 set(WW3             OFF CACHE BOOL "Enable WW3")
 set(STOCH_PHYS      OFF CACHE BOOL "Enable Stochastic Physics")
-set(NEMSdatm        OFF CACHE BOOL "Enable NEMSdatm")
 set(CMEPS           OFF CACHE BOOL "Enable CMEPS")
 set(CDEPS           OFF CACHE BOOL "Enable CDEPS")
 
@@ -47,7 +46,6 @@ message("HYCOM ............ ${HYCOM}")
 message("CICE6 ............ ${CICE6}")
 message("WW3 .............. ${WW3}")
 message("STOCH_PHYS ....... ${STOCH_PHYS}")
-message("NEMSdatm ......... ${NEMSdatm}")
 message("CDEPS ............ ${CDEPS}")
 message("CMEPS ............ ${CMEPS}")
 
@@ -203,12 +201,8 @@ if(CMEPS)
 endif()
 
 ###############################################################################
-### Data Components [NEMSdatm, CDEPS]
+### Data Components [CDEPS]
 ###############################################################################
-if(NEMSdatm)
-  add_subdirectory(DATM/DATM)
-endif()
-
 if(CDEPS)
   add_subdirectory(CDEPS-interface)
 endif()
@@ -245,12 +239,6 @@ if(STOCH_PHYS)
   list(APPEND _ufs_libs_public stochastic_physics)
 endif()
 
-if(NEMSdatm)
-  add_dependencies(ufs datatm)
-  list(APPEND _ufs_defs_private FRONT_NEMS_DATM=datm)
-  list(APPEND _ufs_libs_public datatm)
-endif()
-
 if(FV3)
   add_dependencies(ufs fv3atm)
   list(APPEND _ufs_defs_private FRONT_FV3=fv3gfs_cap_mod)

diff --git a/cmake/configure_apps.cmake b/cmake/configure_apps.cmake
@@ -25,19 +25,14 @@ if(APP MATCHES "^(ATM|ATMW)$")
   endif()
 endif()
 
-if(APP MATCHES "^(NG-GODAS|NG-GODAS-NEMSDATM)$")
+if(APP MATCHES "^(NG-GODAS)$")
   set(CMEPS      ON  CACHE BOOL "Enable CMEPS"               FORCE)
   set(STOCH_PHYS ON  CACHE BOOL "Enable Stochastic Physics"  FORCE)
   set(FMS        ON  CACHE BOOL "Enable FMS"                 FORCE)
   set(MOM6       ON  CACHE BOOL "Enable MOM6"                FORCE)
   set(CICE6      ON  CACHE BOOL "Enable CICE6"               FORCE)
-  if(APP MATCHES "NG-GODAS-NEMSDATM")
-    set(NEMSdatm ON  CACHE BOOL "Enable NEMS DataAtm"        FORCE)
-    message("Configuring UFS app in (NEMS) Data Atmosphere mode")
-  elseif(APP MATCHES "NG-GODAS")
-    set(CDEPS    ON  CACHE BOOL "Enable CDEPS"               FORCE)
-    message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
-  endif()
+  set(CDEPS      ON  CACHE BOOL "Enable CDEPS"               FORCE)
+  message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
 endif()
 
 if(APP MATCHES "^(S2S|S2SW)$")

diff --git a/driver/EARTH_GRID_COMP.F90 b/driver/EARTH_GRID_COMP.F90
@@ -46,9 +46,6 @@ MODULE module_EARTH_GRID_COMP
 #ifdef FRONT_FV3
       use FRONT_FV3,        only: FV3_SS   => SetServices
 #endif
-#ifdef FRONT_NEMS_DATM
-      use FRONT_NEMS_DATM,  only: DATM_SS  => SetServices
-#endif
 #ifdef FRONT_CDEPS_DATM
       use FRONT_CDEPS_DATM, only: DATM_SS  => SetServices
 #endif
@@ -344,8 +341,8 @@ subroutine SetModelServices(driver, rc)
             found_comp = .true.
           end if
 #endif
-#if defined FRONT_NEMS_DATM || defined FRONT_CDEPS_DATM
-          if (trim(model) == "nems_datm" .or. trim(model) == "datm" ) then
+#if defined FRONT_CDEPS_DATM
+          if (trim(model) == "datm" ) then
             call NUOPC_DriverAddComp(driver, trim(prefix), DATM_SS, &
               petList=petList, comp=comp, rc=rc)
             if (ChkErr(rc,__LINE__,u_FILE_u)) return
+1 −1		.github/PULL_REQUEST_TEMPLATE.md
+110 −108		cime_config/buildlib
+46 −0		cime_config/buildlib_comps
+4 −4		cime_config/stream_cdeps.py
+1 −1		datm/cime_config/buildlib
+1 −1		dice/cime_config/buildlib
+1 −1		dlnd/cime_config/buildlib
+1 −1		docn/cime_config/buildlib
+1 −1		drof/cime_config/buildlib
+1 −1		dwav/cime_config/buildlib
+1 −1		streams/dshr_strdata_mod.F90
+1 −0		streams/dshr_stream_mod.F90
+5 −14		streams/dshr_tinterp_mod.F90