[Dart-dev] DART/branches Revision: 11753

[dart at ucar.edu]

hendric at ucar.edu
2017-06-21 12:02:14 -0600 (Wed, 21 Jun 2017)
55

updating interpolation routines for model mod check.




Modified: DART/branches/rma_mmc/models/model_mod_tools/test_interpolate_oned.f90
===================================================================
--- DART/branches/rma_mmc/models/model_mod_tools/test_interpolate_oned.f90	2017-06-21 17:16:16 UTC (rev 11752)
+++ DART/branches/rma_mmc/models/model_mod_tools/test_interpolate_oned.f90	2017-06-21 18:02:14 UTC (rev 11753)
@@ -229,9 +229,9 @@
 function test_interpolate_single( ens_handle,       &
                                   ens_size,         &
                                   vertcoord_string, &
-                                  xval,           &
-                                  yval,           &
-                                  zval,          &
+                                  xval,             &
+                                  yval,             &
+                                  zval,             &
                                   mykindindex,      &
                                   interp_vals,      &
                                   ios_out)
@@ -259,13 +259,18 @@
 
 do imem = 1, ens_size
    if (ios_out(imem) == 0 ) then
-      if ( do_output() ) &
-         write(*,*) 'member ', imem, 'model_interpolate SUCCESS with value', interp_vals(imem)
-      num_passed = num_passed + 1
+      if (do_output()) then
+         write(*,'(A)') '-------------------------------------------------------------'
+         write(*,'("member ",I3,"model_interpolate SUCCESS with value ",F10.3)') imem, interp_vals(imem)
+         write(*,'(A)') '-------------------------------------------------------------'
+         num_passed = num_passed + 1
+      endif
    else
-      if (do_output() ) &
-         write(*,*) 'member ', imem, 'model_interpolate ERROR with error code', ios_out(imem)
-   endif
+      if (do_output()) then
+         write(*,'(A)') '-------------------------------------------------------------'
+         write(*,'("member ",I3,"model_interpolate ERROR with error code",I2  )') imem, ios_out(imem)
+         write(*,'(A)') '-------------------------------------------------------------'
+      endif
 enddo
 
 test_interpolate_single = num_passed

Modified: DART/branches/rma_mmc/models/model_mod_tools/test_interpolate_threed_cartesian.f90
===================================================================
--- DART/branches/rma_mmc/models/model_mod_tools/test_interpolate_threed_cartesian.f90	2017-06-21 17:16:16 UTC (rev 11752)
+++ DART/branches/rma_mmc/models/model_mod_tools/test_interpolate_threed_cartesian.f90	2017-06-21 18:02:14 UTC (rev 11753)
@@ -297,13 +297,18 @@
 
 do imem = 1, ens_size
    if (ios_out(imem) == 0 ) then
-      if ( do_output() ) &
-         write(*,*) 'member ', imem, 'model_interpolate SUCCESS with value', interp_vals(imem)
-      num_passed = num_passed + 1
+      if (do_output()) then
+         write(*,'(A)') '-------------------------------------------------------------'
+         write(*,'("member ",I3,"model_interpolate SUCCESS with value ",F10.3)') imem, interp_vals(imem)
+         write(*,'(A)') '-------------------------------------------------------------'
+         num_passed = num_passed + 1
+      endif
    else
-      if ( do_output() ) &
-         write(*,*) 'member ', imem, 'model_interpolate ERROR with error code', ios_out(imem)
-   endif
+      if (do_output()) then
+         write(*,'(A)') '-------------------------------------------------------------'
+         write(*,'("member ",I3,"model_interpolate ERROR with error code",I2  )') imem, ios_out(imem)
+         write(*,'(A)') '-------------------------------------------------------------'
+      endif
 enddo
 
 test_interpolate_single = num_passed

Modified: DART/branches/rma_mmc/models/model_mod_tools/test_interpolate_threed_sphere.f90
===================================================================
--- DART/branches/rma_mmc/models/model_mod_tools/test_interpolate_threed_sphere.f90	2017-06-21 17:16:16 UTC (rev 11752)
+++ DART/branches/rma_mmc/models/model_mod_tools/test_interpolate_threed_sphere.f90	2017-06-21 18:02:14 UTC (rev 11753)
@@ -106,11 +106,11 @@
 
 if ((interp_test_dlon < 0.0_r8) .or. (interp_test_dlat < 0.0_r8)) then
    if ( do_output() ) then
-      write(*,*)'Skipping the rigorous interpolation test because one of'
-      write(*,*)'interp_test_dlon,interp_test_dlat are < 0.0'
-      write(*,*)'interp_test_dlon  = ',interp_test_dlon
-      write(*,*)'interp_test_dlat  = ',interp_test_dlat
-      write(*,*)'interp_test_dvert = ',interp_test_dvert
+      write(*,'(A)')    'Skipping the rigorous interpolation test because one of'
+      write(*,'(A)')    'interp_test_dlon,interp_test_dlat are < 0.0'
+      write(*,'(A,I2)') 'interp_test_dlon  = ',interp_test_dlon
+      write(*,'(A,I2)') 'interp_test_dlat  = ',interp_test_dlat
+      write(*,'(A,I2)') 'interp_test_dvert = ',interp_test_dvert
    endif
    return
 endif
@@ -171,8 +171,8 @@
 call close_file(iunit)
 
 if ( do_output() ) then
-   write(*,*) 'total interpolations  : ', nlon*nlat*nvert
-   write(*,*) 'failed interpolations : ', nfailed
+   write(*,'(A,I11)') 'total  interpolations : ', nlon*nlat*nvert