diff --git a/hrldas/HRLDAS_forcing/lib/Makefile b/hrldas/HRLDAS_forcing/lib/Makefile index e8eece8..e90d1ec 100644 --- a/hrldas/HRLDAS_forcing/lib/Makefile +++ b/hrldas/HRLDAS_forcing/lib/Makefile @@ -58,8 +58,12 @@ decode_jpeg2000.o: decode_jpeg2000.c clean: $(RM) $(OBJS) $(CMD) *.mod *.f90 *~ -# + +# dependencies: module_grib2.o: module_grib2.F module_grib2_tables.o module_grib1.o module_mapinfo.o kwm_date_utilities.o module_grib_common.o module_grib1.o: module_grib1.F module_mapinfo.o kwm_date_utilities.o module_grib_common.o module_grib.o: module_grib.F module_grib1.o module_grib2.o module_input_data_structure.o: module_llxy.o +module_geo_em.o: module_llxy.o + + diff --git a/hrldas/IO_code/Makefile b/hrldas/IO_code/Makefile index 86b0c67..ce60cc7 100644 --- a/hrldas/IO_code/Makefile +++ b/hrldas/IO_code/Makefile @@ -29,7 +29,7 @@ main_hrldas_driver.o: main_hrldas_driver.F @echo "" $(RM) $(*).f90 $(CPP) $(CPPFLAGS) $(CPPHRLDAS) $(*).F > $(*).f90 - $(COMPILERF90) -o $(@) -c $(F90FLAGS) $(FREESOURCE) -I ../MPP -I. \ + $(COMPILERF90) -o $(@) -c $(F90FLAGS) $(FREESOURCE) -I../MPP -I. \ -I../../noahmp/src -I../../noahmp/utility -I../../noahmp/drivers/hrldas -I../../urban/wrf -I../Utility_routines $(NETCDFMOD) $(*).f90 @echo "" @@ -37,7 +37,7 @@ module_hrldas_netcdf_io.o: module_hrldas_netcdf_io.F @echo "" $(RM) $(*).f90 $(CPP) $(CPPFLAGS) $(CPPHRLDAS) $(NETCDFMOD) $(*).F > $(*).f90 - $(COMPILERF90) -o $(@) -c $(F90FLAGS) $(FREESOURCE) -I ../MPP -I../Utility_routines $(NETCDFMOD) $(*).f90 + $(COMPILERF90) -o $(@) -c $(F90FLAGS) $(FREESOURCE) -I../MPP -I../Utility_routines $(NETCDFMOD) $(*).f90 @echo "" .F.o: diff --git a/noahmp b/noahmp index 37df39e..c09481b 160000 --- a/noahmp +++ b/noahmp @@ -1 +1 @@ -Subproject commit 37df39e0baf514946806a866312486f39775003f +Subproject commit c09481b2ace9dad82cb5e8651a41b8fae7c13216 diff --git a/urban/wrf/Makefile b/urban/wrf/Makefile index 2b96f57..deaf652 100644 --- a/urban/wrf/Makefile +++ b/urban/wrf/Makefile @@ -17,12 +17,20 @@ CPPHRLDAS = -D_HRLDAS_OFFLINE_ all: $(OBJS) +NoahmpUrbanDriverMainMod.o: NoahmpUrbanDriverMainMod.F + @echo "" + $(RM) NoahmpUrbanDriverMainMod.f90 + $(CPP) $(CPPFLAGS) $(*).F > $(*).f90 + $(COMPILERF90) -c -I../../noahmp/drivers/hrldas -I. -I../../hrldas/Utility_routines \ + -I../../noahmp/utility $(F90FLAGS) $(FREESOURCE) $(NETCDFMOD) $(*).f90 + @echo "" + .F.o: @echo "" $(RM) $(*).f90 $(CPP) $(CPPFLAGS) $(CPPHRLDAS) $(*).F > $(*).f90 - $(COMPILERF90) -o $(@) -c -I../../hrldas/Utility_routines -I../../noahmp/drivers/hrldas -I. -I../../hrldas/Utility_routines \ - -I../../noahmp/utility $(F90FLAGS) $(FREESOURCE) $(*).f90 + $(COMPILERF90) -c -I. -I../../hrldas/Utility_routines \ + $(F90FLAGS) $(FREESOURCE) $(NETCDFMOD) $(*).f90 @echo "" #