Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1012,6 +1012,18 @@ framework :
CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" TRADFLAG="$(TRADFLAG)" ESMF_IO_LIB_EXT="$(ESMF_IO_LIB_EXT)" \
LIB_LOCAL="$(LIB_LOCAL)" \
ESMF_MOD_DEPENDENCE="$(ESMF_MOD_DEPENDENCE)" AR="INTERNAL_BUILD_ERROR_SHOULD_NOT_NEED_AR"; \
cd ../io_netcdfpar ; \
$(MAKE) NETCDFPARPATH="$(NETCDFPATH)" \
FC="$(FC) $(FCBASEOPTS) $(PROMOTION) $(FCDEBUG) $(OMP)" RANLIB="$(RANLIB)" \
CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" TRADFLAG="$(TRADFLAG)" ESMF_IO_LIB_EXT="$(ESMF_IO_LIB_EXT)" \
LIB_LOCAL="$(LIB_LOCAL)" \
ESMF_MOD_DEPENDENCE="$(ESMF_MOD_DEPENDENCE)" AR="INTERNAL_BUILD_ERROR_SHOULD_NOT_NEED_AR" diffwrf; \
cd ../io_netcdfpar ; \
$(MAKE) NETCDFPARPATH="$(NETCDFPATH)" \
FC="$(SFC) $(FCBASEOPTS) $(PROMOTION) $(FCDEBUG) $(OMP)" RANLIB="$(RANLIB)" \
CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" TRADFLAG="$(TRADFLAG)" ESMF_IO_LIB_EXT="$(ESMF_IO_LIB_EXT)" \
LIB_LOCAL="$(LIB_LOCAL)" \
ESMF_MOD_DEPENDENCE="$(ESMF_MOD_DEPENDENCE)" AR="INTERNAL_BUILD_ERROR_SHOULD_NOT_NEED_AR"; \
cd ../io_pio ; \
echo SKIPPING PIO BUILD $(MAKE) NETCDFPATH="$(PNETCDFPATH)" \
FC="$(SFC) $(FCBASEOPTS) $(PROMOTION) $(FCDEBUG) $(OMP)" RANLIB="$(RANLIB)" \
Expand Down Expand Up @@ -1131,7 +1143,11 @@ fseek_test :

# rule used by configure to test if this will compile with netcdf4
nc4_test:
@cd tools ; /bin/rm -f nc4_test.{exe,nc,o} ; $(SCC) -o nc4_test.exe nc4_test.c -I$(NETCDF)/include -L$(NETCDF)/lib $(USENETCDF) ; cd ..
if [ $(USENETCDFPAR) -eq 0 ] ; then \
( cd tools ; /bin/rm -f nc4_test.{exe,nc,o} ; $(SCC) -o nc4_test.exe nc4_test.c -I$(NETCDF)/include -L$(NETCDF)/lib -lnetcdf $(NETCDF4_DEP_LIB) ; cd .. ) ; \
else \
( cd tools ; /bin/rm -f nc4_test.{exe,nc,o} ; $(DM_CC) -o nc4_test.exe nc4_test.c -I$(NETCDF)/include -L$(NETCDF)/lib -lnetcdf $(NETCDF4_DEP_LIB) ; cd .. ) ; \
fi

# rule used by configure to test if Fortran 2003 IEEE signaling is available
fortran_2003_ieee_test:
Expand Down
1 change: 1 addition & 0 deletions Registry/Registry.EM_COMMON
Original file line number Diff line number Diff line change
Expand Up @@ -3299,6 +3299,7 @@ package io_zzz io_form_restart==9 - -
package io_grib2 io_form_restart==10 - -
package io_pnetcdf io_form_restart==11 - -
package io_pio io_form_restart==12 - -
package io_netcdfpar io_form_restart==13 - -

#WRF Hydro
package no_wrfhydro wrf_hydro==0 - -
Expand Down
44 changes: 44 additions & 0 deletions arch/Config.pl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
$sw_perl_path = perl ;
$sw_netcdf_path = "" ;
$sw_pnetcdf_path = "" ;
$sw_netcdfpar_path = "" ;
$sw_hdf5_path="";
$sw_phdf5_path="";
$sw_jasperlib_path="";
Expand Down Expand Up @@ -95,6 +96,10 @@
{
$sw_pnetcdf_path = substr( $ARGV[0], 9 ) ;
}
if ( substr( $ARGV[0], 1, 10 ) eq "netcdfpar=" )
{
$sw_netcdfpar_path = substr( $ARGV[0], 11 ) ;
}
if ( substr( $ARGV[0], 1, 5 ) eq "hdf5=" )
{
$sw_hdf5_path = substr( $ARGV[0], 6 ) ;
Expand Down Expand Up @@ -459,6 +464,7 @@
$_ =~ s/CONFIGURE_PERL_PATH/$sw_perl_path/g ;
$_ =~ s/CONFIGURE_NETCDF_PATH/$sw_netcdf_path/g ;
$_ =~ s/CONFIGURE_PNETCDF_PATH/$sw_pnetcdf_path/g ;
$_ =~ s/CONFIGURE_NETCDFPAR_PATH/$sw_netcdfpar_path/g ;
$_ =~ s/CONFIGURE_HDF5_PATH/$sw_hdf5_path/g ;
$_ =~ s/CONFIGURE_PHDF5_PATH/$sw_phdf5_path/g ;
$_ =~ s/CONFIGURE_LDFLAGS/$sw_ldflags/g ;
Expand Down Expand Up @@ -496,6 +502,25 @@
$_ =~ s/#// ;
$_ =~ s/#// ;
}

# put netcdfpar ahead of netcdf so that part of the name does not get clobbered
if ( $sw_netcdfpar_path )
{ $_ =~ s/CONFIGURE_WRFIO_NFPAR/wrfio_nfpar/g ;
$_ =~ s:CONFIGURE_NETCDFPAR_FLAG:-DNETCDFPAR: ;
if ( $ENV{NETCDFPAR_LDFLAGS} ) {
$_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdfpar/libwrfio_nfpar.a $ENV{NETCDFPAR_LDFLAGS} : ;
} elsif ( $sw_os eq "Interix" ) {
$_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdfpar/libwrfio_nfpar.a -L$sw_netcdfpar_path/lib $sw_usenetcdff $sw_usenetcdf : ;
} else {
$_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdfpar -lwrfio_nfpar -L$sw_netcdfpar_path/lib $sw_usenetcdff $sw_usenetcdf : ;
}
}
else
{ $_ =~ s/CONFIGURE_WRFIO_NFPAR//g ;
$_ =~ s:CONFIGURE_NETCDFPAR_FLAG::g ;
$_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH::g ;
}

if ( $sw_netcdf_path )
{ $_ =~ s/CONFIGURE_WRFIO_NF/wrfio_nf/g ;
$_ =~ s:CONFIGURE_NETCDF_FLAG:-DNETCDF: ;
Expand Down Expand Up @@ -837,6 +862,25 @@
if ( $sw_os ne "CYGWIN_NT" ) {
$_ =~ s/#NOWIN// ;
}

if ( $sw_netcdfpar_path )
{ #print("set sw_netcdfpar_path stuff\n");
$_ =~ s/CONFIGURE_WRFIO_NFPAR/wrfio_nfpar/g ;
$_ =~ s:CONFIGURE_NETCDFPAR_FLAG:-DNETCDFPAR: ;
if ( $ENV{NETCDFPAR_LDFLAGS} ) {
$_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdfpar/libwrfio_nfpar.a $ENV{NETCDFPAR_LDFLAGS} : ;
} elsif ( $sw_os eq "Interix" ) {
$_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdfpar/libwrfio_nfpar.a -L$sw_netcdfpar_path/lib $sw_usenetcdff $sw_usenetcdf : ;
} else {
$_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdfpar -lwrfio_nfpar -L$sw_netcdfpar_path/lib $sw_usenetcdff $sw_usenetcdf : ;
}
}
else
{ $_ =~ s/CONFIGURE_WRFIO_NFPAR//g ;
$_ =~ s:CONFIGURE_NETCDFPAR_FLAG::g ;
$_ =~ s:CONFIGURE_NETCDFPAR_LIB_PATH::g ;
}

if ( $sw_netcdf_path )
{ $_ =~ s/CONFIGURE_WRFIO_NF/wrfio_nf/g ;
$_ =~ s:CONFIGURE_NETCDF_FLAG:-DNETCDF: ;
Expand Down
Loading