Finish updating infer-aerosol so it can be compiled

Author: ktras

demo/app/infer-aerosol.f90

@@ -5,7 +5,7 @@ program infer_aerosol
 
   ! External dependencies:
   use fiats_m, only : unmapped_network_t, tensor_t, double_precision, double_precision_file_t
-  use julienne_m, only : string_t, command_line_t, csv, call_julienne_assert_, operator(.all.), operator(.equalsExpected.)
+  use julienne_m, only : string_t, command_line_t, csv, julienne_assert, operator(.all.), operator(.equalsExpected.)
   use omp_lib
   use iso_fortran_env, only : int64, real64
 
@@ -44,7 +44,8 @@ subroutine read_stats_and_perform_inference(path)
     character(len=*), parameter :: branch_file_name = "model_branch.json", trunk_file_name = "model_trunk.json"
     character(len=*), parameter :: saved_data_file_name = "saved_data.nc"
     double precision, allocatable, dimension(:) :: longitude, latitude, level, ymean, mean_X, std_X, mean_y, std_y
-    double precision, allocatable, dimension(:,:) :: basis, X_test, branch_inputs, trunk_inputs
+    double precision, allocatable, dimension(:,:) :: X_test, branch_inputs, trunk_inputs
+    double precision, allocatable, dimension(:,:), target :: basis
     double precision, allocatable, dimension(:,:) :: cldfr_idx, slice
     type(unmapped_network_t(double_precision)) branch_network, trunk_network
     integer(selected_int_kind(18)) t_start, t_finish, clock_rate
@@ -141,7 +142,7 @@ subroutine read_stats_and_perform_inference(path)
               raw_trunk_outputs(s,:) = trunk_outputs(s)%values()
             end do
 
-            call_julienne_assert(size(basis_3d)*size(raw_trunk_outputs) .equalsExpected. m*n*(n+1))
+            call julienne_assert(size(basis_3d)*size(raw_trunk_outputs) .equalsExpected. m*n*(n+1))
 
             aug_trunk = reshape([basis_3d, raw_trunk_outputs], [m,n,n+1])
           end associate
@@ -215,4 +216,4 @@ end program infer_aerosol
     !        output_components(i,j) = (output_stats%standard_deviation(j)*output_slice(j)+output_stats%mean(j))**3
     !     end do
     !  end do post_process
-    !  !$omp end parallel do
+    !  !$omp end parallel do

demo/test/netCDF_file_test_m.f90

@@ -93,25 +93,25 @@ subroutine output_2D_64_bit_integer(file_name, data_out)
     integer ncid, varid, x_dimid, y_dimid
 
     associate(nf_status => nf90_create(file_name, nf90_clobber, ncid)) ! create or ovewrite file
-      call_assert_diagnose(nf_status == nf90_noerr, "nf90_create(file_name, nf90_clobber, ncid) succeeds",trim(nf90_strerror(nf_status)))
+      call julienne_assert((nf_status .equalsExpected. nf90_noerr) // ", " // trim(nf90_strerror(nf_status)))
     end associate
     associate(nf_status => nf90_def_dim(ncid, "x", size(data_out,2), x_dimid)) ! define x dimension & get its ID
-      call_assert_diagnose(nf_status == nf90_noerr,'nf90_def_dim(ncid,"x",size(data_out,2),x_dimid) succeeds',trim(nf90_strerror(nf_status)))
+      call julienne_assert((nf_status .equalsExpected. nf90_noerr) // ",  " // trim(nf90_strerror(nf_status)))
     end associate
     associate(nf_status => nf90_def_dim(ncid, "y", size(data_out,1), y_dimid)) ! define y dimension & get its ID
-      call_assert_diagnose(nf_status==nf90_noerr, 'nf90_def_dim(ncid,"y",size(data_out,2),y_dimid) succeeds', trim(nf90_strerror(nf_status)))
+      call julienne_assert((nf_status .equalsExpected. nf90_noerr) // ", " // trim(nf90_strerror(nf_status)))
     end associate
     associate(nf_status => nf90_def_var(ncid, "data", nf90_int, [y_dimid, x_dimid], varid))!define integer 'data' variable & get ID
-      call_assert_diagnose(nf_status == nf90_noerr, 'nf90_def_var(ncid,"data",nf90_int,[y_dimid,x_dimid],varid) succeds', trim(nf90_strerror(nf_status)))
+      call julienne_assert((nf_status .equalsExpected. nf90_noerr) // ", " // trim(nf90_strerror(nf_status)))
     end associate
     associate(nf_status => nf90_enddef(ncid)) ! exit define mode: tell NetCDF we are done defining metadata
-      call_assert_diagnose(nf_status == nf90_noerr, 'nff90_noerr == nf90_enddef(ncid)', trim(nf90_strerror(nf_status)))
+      call julienne_assert((nf_status .equalsExpected. nf90_noerr) // ", " // trim(nf90_strerror(nf_status)))
     end associate
     associate(nf_status => nf90_put_var(ncid, varid, data_out)) ! write all data to file
-      call_assert_diagnose(nf_status == nf90_noerr, 'nff90_noerr == nf90_put_var(ncid, varid, data_out)', trim(nf90_strerror(nf_status)))
+      call julienne_assert((nf_status .equalsExpected. nf90_noerr) // ", " // trim(nf90_strerror(nf_status)))
     end associate
     associate(nf_status => nf90_close(ncid)) ! close file to free associated NetCDF resources and flush buffers
-      call_assert_diagnose(nf_status == nf90_noerr, 'nff90_noerr == nf90_close(ncid)', trim(nf90_strerror(nf_status)))
+      call julienne_assert((nf_status .equalsExpected. nf90_noerr) // ", " // trim(nf90_strerror(nf_status)))
     end associate
   end subroutine