diff --git a/src/testprogs/ice_adjust/getdata_ice_adjust_mod.F90 b/src/testprogs/ice_adjust/getdata_ice_adjust_mod.F90
index faf5d03f636763ebe91612b14179b1aaea28be4a..1fb0a4a02b8fa38b5c6f656665c38fe7a8dcbe13 100644
--- a/src/testprogs/ice_adjust/getdata_ice_adjust_mod.F90
+++ b/src/testprogs/ice_adjust/getdata_ice_adjust_mod.F90
@@ -107,7 +107,7 @@ KRR=6
 NGPTOT = NPROMA * NGPBLKS
 
 IBL = 1
-WRITE (CLFILE, '("data/",I3.3,".dat")') IBL
+WRITE (CLFILE, '("data/",I8.8,".dat")') IBL
 OPEN (IFILE, FILE=TRIM (CLFILE), FORM='UNFORMATTED') 
 READ (IFILE) KLON, KDUM, KLEV
 CLOSE (IFILE)
@@ -190,10 +190,12 @@ PHLC_HRC_B     = ZNAN
 
 
 IOFF = 0
-IBL = 1
+IBL = 0
+LLEXIST = .TRUE.
 
-DO IBL = 1, 296
-  WRITE (CLFILE, '("data/",I3.3,".dat")') IBL
+DO WHILE(LLEXIST)
+  IBL = IBL + 1
+  WRITE (CLFILE, '("data/",I8.8,".dat")') IBL
 
   INQUIRE (FILE=TRIM (CLFILE), EXIST=LLEXIST)
 
diff --git a/src/testprogs/rain_ice/getdata_rain_ice_mod.F90 b/src/testprogs/rain_ice/getdata_rain_ice_mod.F90
index 155ac9f3f3397f8c5da6e8b39196d0c177f2ca5c..57c28b427d7a1b776b1ffcf68894bbf84e8b9e23 100644
--- a/src/testprogs/rain_ice/getdata_rain_ice_mod.F90
+++ b/src/testprogs/rain_ice/getdata_rain_ice_mod.F90
@@ -132,7 +132,7 @@ KRR=6
 NGPTOT = NPROMA * NGPBLKS
 
 IBL = 1
-WRITE (CLFILE, '("data/",I3.3,".dat")') IBL
+WRITE (CLFILE, '("data/",I8.8,".dat")') IBL
 OPEN (IFILE, FILE=TRIM (CLFILE), FORM='UNFORMATTED') 
 READ (IFILE) IPROMA, ISIZE
 READ (IFILE) KLON, KDUM, KLEV, KRR
@@ -224,10 +224,12 @@ ZRAINFR_OUT_B =     ZNAN
 PFPR_OUT_B    =     ZNAN
 
 IOFF = 0
-IBL = 1
+IBL = 0
+LLEXIST = .TRUE.
 
-DO IBL = 1, 150
-  WRITE (CLFILE, '("data/",I3.3,".dat")') IBL
+DO WHILE(LLEXIST)
+  IBL = IBL + 1
+  WRITE (CLFILE, '("data/",I8.8,".dat")') IBL
 
   INQUIRE (FILE=TRIM (CLFILE), EXIST=LLEXIST)