RUC LSM update

.gitignore

@@ -3,7 +3,7 @@
 *.pyc
 
 *.sw[a-p]
-~
+*~
 
 build/
 install/

.gitmodules

@@ -8,8 +8,8 @@
   branch = main
 [submodule "ccpp/physics"]
   path = ccpp/physics
-  url = https://github.com/NCAR/ccpp-physics
-  branch = main
+  url = https://github.com/tanyasmirnova/ccpp-physics
+  branch = ruclsm_lai
 [submodule "upp"]
   path = upp
   url = https://github.com/NOAA-EMC/UPP

CMakeLists.txt

@@ -14,6 +14,9 @@ set(use_WRTCOMP ON)
 set(GFS_PHYS    ON)
 set(GFS_TYPES   ON)
 set(USE_GFSL63  ON)
+if(MOVING_NEST)
+  set(MOVING_NEST ON)
+endif()
 add_subdirectory(atmos_cubed_sphere)
 
 ###############################################################################
@@ -22,16 +25,57 @@ add_subdirectory(atmos_cubed_sphere)
 if(INLINE_POST)
   set(BUILD_POSTEXEC OFF)
   add_subdirectory(upp)
-  set(POST_SRC io/inline_post.F90 io/post_nems_routines.F90 io/post_gfs.F90 io/post_regional.F90)
+  set(POST_SRC io/post_nems_routines.F90 io/post_fv3.F90)
+  list(APPEND _fv3atm_defs_private INLINE_POST)
+endif()
+
+if(CCPP_32BIT)
+  add_definitions(-DCCPP_32BIT)
 else()
-  set(POST_SRC io/inline_post_stub.F90)
-  list(APPEND _fv3atm_defs_private NO_INLINE_POST)
+  remove_definitions(-DCCPP_32BIT)
 endif()
 
 if(NOT PARALLEL_NETCDF)
   list(APPEND _fv3atm_defs_private NO_PARALLEL_NETCDF)
 endif()
 
+if(MOVING_NEST)
+  list(APPEND _fv3atm_defs_private MOVING_NEST MOIST_CAPPA USE_COND)
+  if(DEBUG)
+    list(APPEND _fv3atm_defs_private DEBUG)
+  endif()
+  if(GFS_PHYS)
+    list(APPEND _fv3atm_defs_private GFS_PHYS)
+  endif()
+  if(GFS_TYPES)
+    list(APPEND _fv3atm_defs_private GFS_TYPES)
+  endif()
+  if(USE_GFSL63)
+    list(APPEND _fv3atm_defs_private USE_GFSL63)
+  endif()
+  if(INTERNAL_FILE_NML)
+    list(APPEND _fv3atm_defs_private INTERNAL_FILE_NML)
+  endif()
+  if(ENABLE_QUAD_PRECISION)
+    list(APPEND _fv3atm_defs_private ENABLE_QUAD_PRECISION)
+  endif()
+  if(32BIT)
+    list(APPEND _fv3atm_defs_private OVERLOAD_R4 OVERLOAD_R8)
+  endif()
+
+  list(APPEND moving_nest_srcs
+    moving_nest/bounding_box.F90
+    moving_nest/fv_tracker.F90
+    moving_nest/fv_moving_nest.F90
+    moving_nest/fv_moving_nest_main.F90
+    moving_nest/fv_moving_nest_physics.F90
+    moving_nest/fv_moving_nest_types.F90
+    moving_nest/fv_moving_nest_utils.F90
+  )
+else()
+   list(APPEND moving_nest_srcs "")
+endif()
+
 add_library(fv3atm
   atmos_model.F90
   fv3_cap.F90
@@ -41,12 +85,19 @@ add_library(fv3atm
   cpl/module_block_data.F90
   cpl/module_cplfields.F90
   cpl/module_cap_cpl.F90
-  io/FV3GFS_io.F90
+  io/fv3atm_common_io.F90
+  io/fv3atm_clm_lake_io.F90
+  io/fv3atm_rrfs_sd_io.F90
+  io/fv3atm_sfc_io.F90
+  io/fv3atm_oro_io.F90
+  io/fv3atm_history_io.F90
+  io/fv3atm_restart_io.F90
   io/module_write_netcdf.F90
-  io/module_write_netcdf_parallel.F90
+  io/module_write_restart_netcdf.F90
   io/module_fv3_io_def.F90
   io/module_write_internal_state.F90
   io/module_wrt_grid_comp.F90
+  ${moving_nest_srcs}
   ${POST_SRC}
 )
 
@@ -71,7 +122,7 @@ target_link_libraries(fv3atm PUBLIC fv3
                                     stochastic_physics
                                     fms)
 
-target_link_libraries(fv3atm PUBLIC w3nco::w3nco_d
+target_link_libraries(fv3atm PUBLIC w3emc::w3emc_d
                                     sp::sp_d
                                     bacio::bacio_4
                                     esmf)

README.md

@@ -26,7 +26,6 @@ Laboratory](https://www.gfdl.noaa.gov/).
 
 This package requires the following
 [NCEPLIBS](https://github.com/NOAA-EMC/NCEPLIBS) packages:
- - [NCEPLIBS-w3nco](https://github.com/NOAA-EMC/NCEPLIBS-w3nco)
  - [NCEPLIBS-w3emc](https://github.com/NOAA-EMC/NCEPLIBS-w3emc)
  - [NCEPLIBS-bacio](https://github.com/NOAA-EMC/NCEPLIBS-bacio)
  - [NCEPLIBS-nemsio](https://github.com/NOAA-EMC/NCEPLIBS-nemsio)