Checks put in place before allocating pointers passed into routines

CMakeLists.txt

@@ -124,6 +124,15 @@ list(APPEND fms_fortran_src_files
   diag_manager/diag_output.F90
   diag_manager/diag_table.F90
   diag_manager/diag_util.F90
+  diag_manager/fms_diag_time_utils.F90
+  diag_manager/fms_diag_object.F90
+  diag_manager/fms_diag_yaml.F90
+  diag_manager/fms_diag_file_object.F90
+  diag_manager/fms_diag_field_object.F90
+  diag_manager/fms_diag_axis_object.F90
+  diag_manager/fms_diag_dlinked_list.F90
+  diag_manager/fms_diag_object_container.F90
+  diag_manager/fms_diag_buffer.F90
   drifters/cloud_interpolator.F90
   drifters/drifters.F90
   drifters/drifters_comm.F90

Makefile.am

@@ -45,6 +45,7 @@ SUBDIRS = \
   mosaic2 \
   fms \
   parser \
+  string_utils \
   affinity \
   mosaic \
   time_manager \

amip_interp/amip_interp.F90

@@ -277,8 +277,7 @@ module amip_interp_mod
 type amip_interp_type
    private
    type (horiz_interp_type) :: Hintrp, Hintrp2 ! add by JHC
-   real, pointer            ::    data1(:,:) =>NULL(), &
-                                  data2(:,:) =>NULL()
+   real, allocatable        ::    data1(:,:),  data2(:,:)
    type (date_type)         ::    Date1,       Date2
    logical                  :: use_climo, use_annual
    logical                  :: I_am_initialized=.false.
@@ -1003,8 +1002,8 @@ end subroutine amip_interp_init
 !! when calling get_amip_sst and get_amip_ice.
    subroutine amip_interp_del (Interp)
    type (amip_interp_type), intent(inout) :: Interp
-     if(associated(Interp%data1)) deallocate(Interp%data1)
-     if(associated(Interp%data2)) deallocate(Interp%data2)
+     if(allocated(Interp%data1)) deallocate(Interp%data1)
+     if(allocated(Interp%data2)) deallocate(Interp%data2)
      if(allocated(lon_bnd))       deallocate(lon_bnd)
      if(allocated(lat_bnd))       deallocate(lat_bnd)
      call horiz_interp_del ( Interp%Hintrp )
@@ -1536,8 +1535,9 @@ subroutine amip_interp_type_eq(amip_interp_out, amip_interp_in)
     endif
 
     amip_interp_out%Hintrp     =  amip_interp_in%Hintrp
-    amip_interp_out%data1      => amip_interp_in%data1
-    amip_interp_out%data2      => amip_interp_in%data2
+    amip_interp_out%Hintrp2    =  amip_interp_in%Hintrp2 !< missing assignment statement; added by GPP
+    amip_interp_out%data1      =  amip_interp_in%data1
+    amip_interp_out%data2      =  amip_interp_in%data2
     amip_interp_out%Date1      =  amip_interp_in%Date1
     amip_interp_out%Date2      =  amip_interp_in%Date2
     amip_interp_out%Date1      =  amip_interp_in%Date1

configure.ac

@@ -189,9 +189,9 @@ if test $with_yaml = yes; then
   #If the test pass, define use_yaml macro
   AC_DEFINE([use_yaml], [1], [This is required to use yaml parser])
 
-  AM_CONDITIONAL([SKIP_PARSER_TESTS], false )
+  AM_CONDITIONAL([USING_YAML], true)
 else
-  AM_CONDITIONAL([SKIP_PARSER_TESTS], true )
+  AM_CONDITIONAL([USING_YAML], false)
 fi
 
 # Require netCDF

diag_manager/Makefile.am

@@ -23,29 +23,53 @@
 # Ed Hartnett 2/22/19
 
 # Include .h and .mod files.
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/diag_manager
 AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libdiag_manager.la
 
 # Each convenience library depends on its source.
 libdiag_manager_la_SOURCES = \
-  diag_axis.F90 \
   diag_data.F90 \
+  diag_axis.F90 \
   diag_grid.F90 \
   diag_manager.F90 \
   diag_output.F90 \
   diag_table.F90 \
-  diag_util.F90
+  diag_util.F90 \
+  fms_diag_time_utils.F90 \
+  fms_diag_file_object.F90 \
+  fms_diag_field_object.F90 \
+  fms_diag_yaml.F90 \
+  fms_diag_object.F90 \
+  fms_diag_axis_object.F90 \
+  fms_diag_object_container.F90 \
+  fms_diag_dlinked_list.F90 \
+  fms_diag_buffer.F90
 
 # Some mods are dependant on other mods in this dir.
-diag_axis_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT)
+diag_axis_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT) fms_diag_axis_object_mod.$(FC_MODEXT) fms_diag_object_mod.$(FC_MODEXT)
 diag_output_mod.$(FC_MODEXT): diag_axis_mod.$(FC_MODEXT) diag_data_mod.$(FC_MODEXT)
-diag_util_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT) diag_axis_mod.$(FC_MODEXT) diag_output_mod.$(FC_MODEXT) diag_grid_mod.$(FC_MODEXT)
+diag_util_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT) diag_axis_mod.$(FC_MODEXT) diag_output_mod.$(FC_MODEXT) \
+                            diag_grid_mod.$(FC_MODEXT) fms_diag_time_utils_mod.$(FC_MODEXT)
+fms_diag_time_utils_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT)
 diag_table_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT) diag_util_mod.$(FC_MODEXT)
+fms_diag_yaml_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT)
+fms_diag_object_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT) fms_diag_file_object_mod.$(FC_MODEXT) fms_diag_field_object_mod.$(FC_MODEXT) fms_diag_yaml_mod.$(FC_MODEXT) \
+                                  fms_diag_time_utils_mod.$(FC_MODEXT) \
+                                  fms_diag_buffer_mod.$(FC_MODEXT)
+fms_diag_field_object_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT) fms_diag_yaml_mod.$(FC_MODEXT) fms_diag_time_utils_mod.$(FC_MODEXT)
+fms_diag_file_object_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT) fms_diag_yaml_mod.$(FC_MODEXT) fms_diag_field_object_mod.$(FC_MODEXT) fms_diag_time_utils_mod.$(FC_MODEXT) \
+                                       fms_diag_axis_object_mod.$(FC_MODEXT)
+fms_diag_object_container_mod.$(FC_MODEXT): fms_diag_object_mod.$(FC_MODEXT) fms_diag_dlinked_list_mod.$(FC_MODEXT) fms_diag_time_utils_mod.$(FC_MODEXT)
+fms_diag_axis_object_mod.$(FC_MODEXT): diag_data_mod.$(FC_MODEXT) fms_diag_time_utils_mod.$(FC_MODEXT) fms_diag_yaml_mod.$(FC_MODEXT) \
+                                       diag_grid_mod.$(FC_MODEXT)
 diag_manager_mod.$(FC_MODEXT): diag_axis_mod.$(FC_MODEXT) diag_data_mod.$(FC_MODEXT) diag_util_mod.$(FC_MODEXT) \
-	                   diag_output_mod.$(FC_MODEXT) diag_grid_mod.$(FC_MODEXT) diag_table_mod.$(FC_MODEXT)
+                               diag_output_mod.$(FC_MODEXT) diag_grid_mod.$(FC_MODEXT) diag_table_mod.$(FC_MODEXT) \
+                               fms_diag_object_mod.$(FC_MODEXT) fms_diag_file_object_mod.$(FC_MODEXT) \
+			                         fms_diag_yaml_mod.$(FC_MODEXT) fms_diag_time_utils_mod.$(FC_MODEXT) \
+                               fms_diag_object_container_mod.$(FC_MODEXT) fms_diag_axis_object_mod.$(FC_MODEXT)
 
 # Mod files are built and then installed as headers.
 MODFILES = \
@@ -54,8 +78,18 @@ MODFILES = \
   diag_grid_mod.$(FC_MODEXT) \
   diag_output_mod.$(FC_MODEXT) \
   diag_util_mod.$(FC_MODEXT) \
+  fms_diag_time_utils_mod.$(FC_MODEXT) \
   diag_table_mod.$(FC_MODEXT) \
+  fms_diag_yaml_mod.$(FC_MODEXT) \
+  fms_diag_file_object_mod.$(FC_MODEXT) \
+  fms_diag_field_object_mod.$(FC_MODEXT) \
+  fms_diag_object_mod.$(FC_MODEXT) \
+  fms_diag_axis_object_mod.$(FC_MODEXT) \
+  fms_diag_dlinked_list_mod.$(FC_MODEXT) \
+  fms_diag_object_container_mod.$(FC_MODEXT) \
+  fms_diag_buffer_mod.$(FC_MODEXT) \
   diag_manager_mod.$(FC_MODEXT)
+
 nodist_include_HEADERS = $(MODFILES)
 BUILT_SOURCES = $(MODFILES)