Merge pull request #57 from COSIMA/sync_components

Sync OM3 codebase and build system with CESM

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "MOM6/MOM6"]
 	path = MOM6/MOM6
-	url = https://github.com/mom-ocean/MOM6
+	url = https://github.com/NCAR/MOM6.git
 [submodule "CICE6/CICE6"]
 	path = CICE/CICE
 	url = https://github.com/ESCOMP/CICE

CDEPS/CMakeLists.txt

@@ -1,16 +1,3 @@
-# CDEPS compiler flags
-if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
-  set(fortran_compile_flags -ffree-line-length-none)
-  if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
-    list(APPEND fortran_compile_flags -fallow-argument-mismatch -fallow-invalid-boz)
-  endif()
-  set(fortran_compile_flags_debug -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow)
-elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
-  set(fortran_compile_flags -O -assume realloc_lhs)
-  set(fortran_compile_flags_release -fp-model precise)
-  set(fortran_compile_flags_debug -check "SHELL:-check noarg_temp_created" "SHELL:-check nopointer" -fpe0 -ftrapuv -init=snan,arrays)
-endif()
-
 add_subdirectory(fox)
 
 list(APPEND cdeps_common_src_files
@@ -22,7 +9,13 @@ list(APPEND cdeps_common_src_files
   CDEPS/dshr/dshr_dfield_mod.F90
   CDEPS/dshr/dshr_fldlist_mod.F90
   CDEPS/dshr/dshr_mod.F90
+)
 
+list(APPEND cdeps_drof_src_files
+  CDEPS/drof/rof_comp_nuopc.F90
+)
+
+list(APPEND cdeps_datm_src_files
   CDEPS/datm/atm_comp_nuopc.F90
   CDEPS/datm/datm_datamode_cfsr_mod.F90
   CDEPS/datm/datm_datamode_clmncep_mod.F90
@@ -31,12 +24,9 @@ list(APPEND cdeps_common_src_files
   CDEPS/datm/datm_datamode_era5_mod.F90
   CDEPS/datm/datm_datamode_gefs_mod.F90
   CDEPS/datm/datm_datamode_jra_mod.F90
-
-  CDEPS/dlnd/lnd_comp_nuopc.F90
-
-  CDEPS/drof/rof_comp_nuopc.F90
 )
 
+
 list(APPEND cdeps_docn_src_files
   CDEPS/docn/docn_datamode_aquaplanet_mod.F90
   CDEPS/docn/docn_datamode_copyall_mod.F90
@@ -57,16 +47,10 @@ list(APPEND cdeps_dwav_src_files
 
 add_fortran_library(cdeps_common mod STATIC ${cdeps_common_src_files})
 target_include_directories(cdeps_common PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
-target_compile_options(cdeps_common PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:${fortran_compile_flags}>")
-target_compile_options(cdeps_common PRIVATE "$<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:Fortran>>:${fortran_compile_flags_debug}>")
-target_compile_options(cdeps_common PRIVATE "$<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:Fortran>>:${fortran_compile_flags_release}>")
 target_link_libraries(cdeps_common PUBLIC share cmeps esmf PIO::PIO_Fortran FoX_dom)
 
-foreach(LIB cdeps_docn cdeps_dice cdeps_dwav)
+foreach(LIB cdeps_docn cdeps_dice cdeps_dwav cdeps_drof cdeps_datm)
   add_fortran_library(${LIB} ${LIB}/mod STATIC ${${LIB}_src_files})
   target_include_directories(${LIB} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
-  target_compile_options(${LIB} PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:${fortran_compile_flags}>")
-  target_compile_options(${LIB} PRIVATE "$<$<AND:$<CONFIG:Debug>,$<COMPILE_LANGUAGE:Fortran>>:${fortran_compile_flags_debug}>")
-  target_compile_options(${LIB} PRIVATE "$<$<AND:$<CONFIG:Release>,$<COMPILE_LANGUAGE:Fortran>>:${fortran_compile_flags_release}>")
   target_link_libraries(${LIB} PUBLIC share cmeps esmf PIO::PIO_Fortran FoX_dom cdeps_common)
 endforeach()