Changeset 21525

Timestamp:

02/06/17 20:47:20 (8 years ago)

Author:

seroussi

Message:

NEW: starting to work on ocean coupling

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (2 diffs)
• src/c/main/issm_ocean.cpp (added)

issm/trunk-jpl/m4/issm_options.m4

@@ -1895 +1895 @@
         AC_MSG_RESULT($HAVE_BAMG)
         dnl }}}
+        dnl with-ocean{{{
+        AC_ARG_WITH([ocean],
+                AS_HELP_STRING([--with-ocean = YES],[compile with ice/ocean coupling (default is no)]),
+                [OCEAN=$withval],[OCEAN=no]) 
+        AC_MSG_CHECKING(for ice/ocean capability compilation)
+
+        HAVE_OCEAN=no
+        if test "x$OCEAN" = "xyes"; then
+                HAVE_OCEAN=yes
+                AC_DEFINE([_HAVE_OCEAN_],[1],[with ice/ocean coupling capability])
+        fi
+        AM_CONDITIONAL([OCEAN], [test x$HAVE_OCEAN = xyes])
+        AC_MSG_RESULT($HAVE_OCEAN)
+        dnl }}}
         dnl with-kml{{{
         AC_ARG_WITH([kml],

issm/trunk-jpl/src/c/Makefile.am

@@ -264 +264 @@
                                         ./modules/ConstraintsStatex/RiftConstraintsState.cpp\
                                         ./modules/ModelProcessorx/CreateOutputDefinitions.cpp\
-                                        ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp\    
+                                        ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp\
                                         ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\
                                         ./classes/Inputs/PentaInput.cpp\
@@ -694 +694 @@
 issm_slr_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
 
+if OCEAN
+bin_PROGRAMS += issm_ocean
+issm_ocean_SOURCES = main/issm_ocean.cpp
+issm_ocean_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
+endif
 
 if KRIGING