tests

mlee03 · Sep 29, 2023 · 379fbb4 · 379fbb4
1 parent 1d6301a
commit 379fbb4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/test_fms/interpolator/test_interpolator2.F90 b/test_fms/interpolator/test_interpolator2.F90
@@ -178,9 +178,12 @@ subroutine test_interpolator(clim_type, model_time)
     do itime=2, ntime-1
 
        answer=real(itime,TEST_INTP_KIND_)-0.5_lkind
+       !answer=real(itime,TEST_INTP_KIND_)
 
-       !> test interpolator_4D_r4/8
        tmp_time=model_time(itime-1)+ (model_time(itime)-model_time(itime-1))/2
+       !tmp_time=model_time(itime)
+
+       !> test interpolator_4D_r4/8
        call interpolator(clim_type, tmp_time, phalf, interp_data, 'ozone')
        do i=1, npfull
           do j=1, nlonlat_mod

diff --git a/test_fms/interpolator/test_interpolator2.sh b/test_fms/interpolator/test_interpolator2.sh
@@ -65,7 +65,7 @@ test_yearly_julian=.false.
 /
 EOF
 mkdir -p INPUT
-#test_expect_success "test_interpolator2 daily r4 julian  unit tests" 'mpirun -n 1 ./test_interpolator2_r4'
+test_expect_success "test_interpolator2 daily r4 julian  unit tests" 'mpirun -n 1 ./test_interpolator2_r4'
 test_expect_success "test_interpolator2 daily r8 julian unit tests" 'mpirun -n 1 ./test_interpolator2_r8'
 #rm -rf INPUT *.nc test_interpolator.nml
 
@@ -79,7 +79,7 @@ test_yearly_julian=.false.
 /
 EOF
 mkdir -p INPUT
-#test_expect_success "test_interpolator2 daily r4 noleap unit tests" 'mpirun -n 1 ./test_interpolator2_r4'
+test_expect_success "test_interpolator2 daily r4 noleap unit tests" 'mpirun -n 1 ./test_interpolator2_r4'
 test_expect_success "test_interpolator2 daily r8 noleap unit tests" 'mpirun -n 1 ./test_interpolator2_r8'
 #rm -rf INPUT *.nc test_interpolator.nml
 
@@ -93,7 +93,7 @@ test_yearly_julian=.false.
 /
 EOF
 mkdir -p INPUT
-#test_expect_success "test_interpolator2 yearly noleap r4 unit tests" 'mpirun -n 1 ./test_interpolator2_r4'
+test_expect_success "test_interpolator2 yearly noleap r4 unit tests" 'mpirun -n 1 ./test_interpolator2_r4'
 test_expect_success "test_interpolator2 yearly noleap r8 unit tests" 'mpirun -n 1 ./test_interpolator2_r8'
 #rm -rf INPUT *.nc test_interpolator.nml
 
@@ -107,7 +107,7 @@ test_yearly_julian=.true.
 /
 EOF
 mkdir -p INPUT
-#test_expect_success "test_interpolator2 yearly julian r4 unit tests" 'mpirun -n 1 ./test_interpolator2_r4'
+test_expect_success "test_interpolator2 yearly julian r4 unit tests" 'mpirun -n 1 ./test_interpolator2_r4'
 test_expect_success "test_interpolator2 yearly julian r8 unit tests" 'mpirun -n 1 ./test_interpolator2_r8'
 #rm -rf INPUT *.nc test_interpolator.nml
 

diff --git a/test_fms/interpolator/test_interpolator_write_climatology.inc b/test_fms/interpolator/test_interpolator_write_climatology.inc
@@ -252,7 +252,8 @@ subroutine set_clim_time()
            case(4,6,9,11) ; clim_time(i) = clim_time(i) + 30.0_lkind/real(365+l,lkind)
            end select
         end do
-        !clim_time(i) = clim_time(i) + real(dy-1)/real(365+l,lkind)
+        clim_time(i) = clim_time(i) + real(dy-1)/real(365+l,lkind)
+        !call print_time(model_time_julian(i))
      end do
      call set_calendar_type(0)
   end if