--- MITgcm/pkg/exf/exf_getffields.F	2006/03/02 15:30:10	1.31
+++ MITgcm/pkg/exf/exf_getffields.F	2006/10/27 05:16:54	1.33
@@ -1,5 +1,5 @@
 C
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exf/exf_getffields.F,v 1.31 2006/03/02 15:30:10 heimbach Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/exf/exf_getffields.F,v 1.33 2006/10/27 05:16:54 heimbach Exp $
 C $Name:  $
 
 #include "EXF_OPTIONS.h"
@@ -86,6 +86,20 @@
      &     mytime, myiter, mythid )
 #endif /* USE_EXF_INTERPOLATION */
 
+c--   wind speed
+      call exf_set_gen( 
+     &     wspeedfile, wspeedstartdate, wspeedperiod, 
+     &     wspeedstartdate1, wspeedstartdate2,
+     &     exf_inscal_wspeed,
+     &     wspeed_exfremo_intercept, wspeed_exfremo_slope,
+     &     wspeed, wspeed0, wspeed1, wspeedmask, 
+#ifdef USE_EXF_INTERPOLATION
+     &     wspeed_lon0, wspeed_lon_inc, 
+     &     wspeed_lat0, wspeed_lat_inc,
+     &     wspeed_nlon, wspeed_nlat, xC, yC, interp_method,
+#endif
+     &     mytime, myiter, mythid )
+
 #ifdef ALLOW_ATM_WIND
 
 c     Zonal and meridional wind.
@@ -212,6 +226,20 @@
 #endif
      &     mytime, myiter, mythid )
 
+c     Snow.
+      call exf_set_gen( 
+     &     snowprecipfile, snowprecipstartdate, snowprecipperiod, 
+     &     snowprecipstartdate1, snowprecipstartdate2,
+     &     exf_inscal_snowprecip,
+     &     snowprecip_exfremo_intercept, snowprecip_exfremo_slope,
+     &     snowprecip, snowprecip0, snowprecip1, snowprecipmask, 
+#ifdef USE_EXF_INTERPOLATION
+     &     snowprecip_lon0, snowprecip_lon_inc, 
+     &     snowprecip_lat0, snowprecip_lat_inc,
+     &     snowprecip_nlon, snowprecip_nlat, xC, yC, interp_method,
+#endif
+     &     mytime, myiter, mythid )
+
 #endif /* ALLOW_ATM_TEMP */
 
 #if defined(ALLOW_ATM_TEMP) || defined(SHORTWAVE_HEATING)
@@ -332,6 +360,50 @@
      &     mytime, myiter, mythid )
 #endif
 
+#ifdef ALLOW_LWFLUX_CONTROL
+      call ctrl_get_gen ( 
+     &     xx_lwflux_file, xx_lwfluxstartdate, xx_lwfluxperiod,
+     &     maskc, lwflux, xx_lwflux0, xx_lwflux1, xx_lwflux_dummy,
+     &     xx_lwflux_remo_intercept, xx_lwflux_remo_slope,
+     &     mytime, myiter, mythid )
+#endif
+
+#ifdef ALLOW_LWDOWN_CONTROL
+      call ctrl_get_gen ( 
+     &     xx_lwdown_file, xx_lwdownstartdate, xx_lwdownperiod,
+     &     maskc, lwdown, xx_lwdown0, xx_lwdown1, xx_lwdown_dummy,
+     &     xx_lwdown_remo_intercept, xx_lwdown_remo_slope,
+     &     mytime, myiter, mythid )
+#endif
+
+#ifdef ALLOW_EVAP_CONTROL
+      call ctrl_get_gen ( 
+     &     xx_evap_file, xx_evapstartdate, xx_evapperiod,
+     &     maskc, evap, xx_evap0, xx_evap1, xx_evap_dummy,
+     &     xx_evap_remo_intercept, xx_evap_remo_slope,
+     &     mytime, myiter, mythid )
+#endif
+
+#ifdef ALLOW_SNOWPRECIP_CONTROL
+      call ctrl_get_gen ( 
+     &     xx_snowprecip_file, xx_snowprecipstartdate, 
+     &     xx_snowprecipperiod,
+     &     maskc, snowprecip, xx_snowprecip0, xx_snowprecip1, 
+     &     xx_snowprecip_dummy,
+     &     xx_snowprecip_remo_intercept, xx_snowprecip_remo_slope,
+     &     mytime, myiter, mythid )
+#endif
+
+#ifdef ALLOW_APRESSURE_CONTROL
+      call ctrl_get_gen ( 
+     &     xx_apressure_file, xx_apressurestartdate, 
+     &     xx_apressureperiod,
+     &     maskc, apressure, xx_apressure0, xx_apressure1, 
+     &     xx_apressure_dummy,
+     &     xx_apressure_remo_intercept, xx_apressure_remo_slope,
+     &     mytime, myiter, mythid )
+#endif
+
 #ifdef ALLOW_UWIND_CONTROL
       call ctrl_get_gen (
      &     xx_uwind_file, xx_uwindstartdate, xx_uwindperiod,
@@ -348,11 +420,4 @@
      &     mytime, myiter, mythid )
 #endif /* ALLOW_VWIND_CONTROL */
 
-#ifdef ALLOW_LWFLUX_CONTROL
-      call ctrl_get_gen ( 
-NOT YET IMPLEMENTED
-     &     mytime, myiter, mythid )
-#endif
-
-
       end