data_override_3d

c_data_override/Makefile.am

@@ -31,10 +31,12 @@ noinst_LTLIBRARIES = lib_c_data_override.la
 
 # Each convenience library depends on its source.
 lib_c_data_override_la_SOURCES = c_data_override.F90 \
-                                 include/c_data_override_0d.fh \
+                                 include/c_data_override_0d.fh  \
                                  include/c_data_override_0d.inc \
-                                 include/c_data_override_2d.fh \
-                                 include/c_data_override_2d.inc
+                                 include/c_data_override_2d.fh  \
+                                 include/c_data_override_2d.inc \
+                                 include/c_data_override_3d.fh  \
+                                 include/c_data_override_3d.inc
 
 c_data_override_mod.mod : c_data_override.F90
 

c_data_override/c_data_override.F90

@@ -17,6 +17,8 @@ module c_data_override_mod
   public :: cFMS_data_override_0d_cdouble  
   public :: cFMS_data_override_2d_cfloat
   public :: cFMS_data_override_2d_cdouble
+  public :: cFMS_data_override_3d_cfloat
+  public :: cFMS_data_override_3d_cdouble
   public :: cFMS_data_override_init
   public :: cFMS_data_override_set_time
 
@@ -98,5 +100,6 @@ end subroutine cFMS_data_override_set_time
 
 #include "c_data_override_0d.fh"
 #include "c_data_override_2d.fh"
+#include "c_data_override_3d.fh"
 
 end module c_data_override_mod

c_data_override/c_data_override.h

@@ -18,6 +18,12 @@ extern void cFMS_data_override_2d_cfloat(char *gridname, char *fieldname, int *d
 extern void cFMS_data_override_2d_cdouble(char *gridname, char *fieldname, int *data_shape, double *data,
                                           bool *override, int *is, int *ie, int *js, int *je);
 
+extern void cFMS_data_override_3d_cfloat(char *gridname, char *fieldname, int *data_shape, float *data,
+                                         bool *override, int *data_index, int *is, int *ie, int *js, int *je);
+
+extern void cFMS_data_override_3d_cdouble(char *gridname, char *fieldname, int *data_shape, double *data,
+                                          bool *override, int *data_index, int *is, int *ie, int *js, int *je);
+
 extern void cFMS_data_override_init(int *atm_domain_id, int *ocn_domain_id, int *ice_domain_id, int *land_domain_id,
                                     int *land_domainUG_id, int *mode);
 

c_data_override/include/c_data_override_2d.inc

@@ -17,7 +17,6 @@ subroutine CFMS_DATA_OVERRIDE_2D_(gridname, fieldname, data_shape, data, overrid
   logical :: override_f
 
   CFMS_DATA_OVERRIDE_2D_TYPE_, allocatable :: data_f(:,:)
-  integer :: i, j
 
   gridname_f = fms_string_utils_c2f_string(gridname)
   fieldname_f = fms_string_utils_c2f_string(fieldname)

c_data_override/include/c_data_override_3d.fh

@@ -0,0 +1,16 @@
+#undef  CFMS_DATA_OVERRIDE_3D_
+#undef  CFMS_DATA_OVERRIDE_3D_BINDC_
+#undef  CFMS_DATA_OVERRIDE_3D_TYPE_
+#define CFMS_DATA_OVERRIDE_3D_       cFMS_data_override_3d_cfloat
+#define CFMS_DATA_OVERRIDE_3D_BINDC_ "cFMS_data_override_3d_cfloat"
+#define CFMS_DATA_OVERRIDE_3D_TYPE_  real(c_float)
+#include "c_data_override_3d.inc"
+
+#undef  CFMS_DATA_OVERRIDE_3D_
+#undef  CFMS_DATA_OVERRIDE_3D_BINDC_
+#undef  CFMS_DATA_OVERRIDE_3D_TYPE_
+#define CFMS_DATA_OVERRIDE_3D_       cFMS_data_override_3d_cdouble
+#define CFMS_DATA_OVERRIDE_3D_BINDC_ "cFMS_data_override_3d_cdouble"
+#define CFMS_DATA_OVERRIDE_3D_TYPE_  real(c_double)
+#include "c_data_override_3d.inc"
+

c_data_override/include/c_data_override_3d.inc

@@ -0,0 +1,43 @@
+subroutine CFMS_DATA_OVERRIDE_3D_(gridname, fieldname, data_shape, data, override, data_index, is, ie, js, je) &
+     bind(C, name=CFMS_DATA_OVERRIDE_3D_BINDC_)
+
+  implicit none
+  character(c_char), intent(in) :: gridname(NAME_LENGTH)
+  character(c_char), intent(in) :: fieldname(NAME_LENGTH)
+  integer,           intent(in) :: data_shape(3)
+  type(c_ptr), value,intent(in) :: data
+  logical(c_bool),   intent(out), optional :: override
+  integer, intent(in), optional :: data_index
+  integer, intent(in), optional :: is
+  integer, intent(in), optional :: ie
+  integer, intent(in), optional :: js
+  integer, intent(in), optional :: je
+
+  character(len=NAME_LENGTH-1) :: gridname_f
+  character(len=NAME_LENGTH-1) :: fieldname_f
+  logical :: override_f
+
+  CFMS_DATA_OVERRIDE_2D_TYPE_, allocatable :: data_f(:,:,:)
+
+  gridname_f = fms_string_utils_c2f_string(gridname)
+  fieldname_f = fms_string_utils_c2f_string(fieldname)
+
+  allocate(data_f(data_shape(1),data_shape(2),data_shape(3)))  
+
+  call fms_data_override(gridname = gridname_f,        &
+                         fieldname_code = fieldname_f, &
+                         return_data = data_f,      &
+                         time = data_override_time, &
+                         override = override_f,   & 
+                         data_index = data_index, &
+                         is_in = is, &
+                         js_in = js, &
+                         ie_in = ie, &
+                         je_in = je)
+
+  call cfms_array_to_pointer(data_f, data_shape, data)  
+  deallocate(data_f)
+
+  if(present(override)) override = logical(override, c_bool)
+
+end subroutine CFMS_DATA_OVERRIDE_3D_

test_cfms/c_data_override/Makefile.am

@@ -26,26 +26,27 @@ AM_CPPFLAGS = -I. -I$(MODDIR) -I${top_builddir}/c_data_override \
 LDADD = ${top_builddir}/libcFMS/libcFMS.la
 
 check_PROGRAMS = test_data_override_scalar \
-                 test_data_override_2d
+                 test_data_override_2d     \
+                 test_data_override_3d
 
 TESTS = test_data_override_scalar.sh \
-        test_data_override_2d.sh
+        test_data_override_2d.sh \
+        test_data_override_3d.sh 
 
 test_data_override_scalar_SOURCES = ../c_fms/c_mpp_domains_helper.c test_data_override_scalar.c
 test_data_override_2d_SOURCES = ../c_fms/c_mpp_domains_helper.c test_data_override_2d.c
+test_data_override_3d_SOURCES = ../c_fms/c_mpp_domains_helper.c test_data_override_3d.c
 
 test_data_override_ongrid : test_data_override_ongrid.F90
-	$(FC) $(FCFLAGS) $(LDFLAGS) -I./include test_data_override_ongrid.F90 -o test_data_override_ongrid
+	$(FC) $(FCFLAGS) $(LDFLAGS) test_data_override_ongrid.F90 -o test_data_override_ongrid
 
-test_data_override_ongrid : test_data_override_ongrid.F90
-	$(FC) $(FCFLAGS) $(LDFLAGS) -I./include test_data_override_ongrid.F90 -o test_data_override_ongrid
 
 TEST_EXTENSIONS = .sh
 SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
                   $(abs_top_srcdir)/test_cfms/tap-driver.sh
 
 # Include these files with the distribution.
-EXTRA_DIST = test_data_override_scalar.sh test_data_override_2d.sh
+EXTRA_DIST = test_data_override_scalar.sh test_data_override_2d.sh test_data_override_3d.sh
 
 # Clean up
 CLEANFILES = *.nml*  *.out *.dpi *.spi *.dyn *.spl *_table* input* *trs *.nc*