Skip to content

Commit

Permalink
mkmf: Updated to allow -l option
Browse files Browse the repository at this point in the history 
- list_paths now has the -l option which includes symbolic links for
  files.
- updated the scripts invoked by Travis-CI for MOM6 commits.
  • Loading branch information
@adcroft
adcroft committed Apr 25, 2018
1 parent 7339de5 commit c465130
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/mkmf
Submodule mkmf updated 30 files
+19 −0 .travis.yml
+2 −0 README.md
+168 −78 bin/list_paths
+54 −30 bin/mkmf
+0 −0 t/src/docs.html
+37 −0 t/src/file1.F90
+9 −0 t/src/file2.f90
+5 −0 t/src/file3.f
+7 −0 t/src/file4.c
+9 −0 t/src/file4.inc
+9 −0 t/src/file5.f90
+1 −0 t/src/file6.f90
+9 −0 t/src/file6.linked
+43 −0 t/t000-basic.sh
+57 −0 t/t001-list_paths.sh
+61 −0 t/t002-git-version-string.sh
+215 −0 t/t003-mkmf.sh
+4 −0 t/templates/test_gnu.mk
+133 −26 templates/linux-gnu.mk
+139 −27 templates/linux-intel.mk
+273 −0 templates/linux-ubuntu-trusty-gnu.mk
+138 −45 templates/ncrc-cray.mk
+126 −30 templates/ncrc-gnu.mk
+123 −46 templates/ncrc-intel.mk
+0 −189 templates/ncrc-pathscale.mk
+129 −44 templates/ncrc-pgi.mk
+0 −174 templates/nescc-intel.mk
+0 −175 templates/olcf-gnu.mk
+0 −192 templates/olcf-intel.mk
+157 −49 templates/theia-intel.mk
6 changes: 3 additions & 3 deletions tools/tests/Travis-MOM6/build_fms.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ echo "Building FMS library"
mkdir -p build/FMS && \
cd build/FMS && \
rm -f path_names && \
../../MOM6-examples/src/mkmf/bin/list_paths ../../MOM6-examples/src/FMS/{platform,include,memutils,constants,mpp,fms,time_manager,diag_manager,data_override,coupler/ensemble_manager.F90,axis_utils,horiz_interp,time_interp,astronomy,mosaic} && \
../../MOM6-examples/src/mkmf/bin/mkmf -t ../../MOM6-examples/src/mkmf/templates/linux-gnu.mk -p libfms.a -c '-Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -DMAXFIELDMETHODS_=500 -Duse_AM3_physics' path_names && \
make -s FC=mpif90 CC=mpicc NETCDF=3 REPRO=1 libfms.a
../../MOM6-examples/src/mkmf/bin/list_paths -l ../../MOM6-examples/src/FMS/{platform,include,memutils,constants,mpp,fms,time_manager,diag_manager,data_override,coupler/ensemble_manager.F90,axis_utils,horiz_interp,time_interp,astronomy,mosaic} && \
../../MOM6-examples/src/mkmf/bin/mkmf -t ../../MOM6-examples/src/mkmf/templates/linux-ubuntu-trusty-gnu.mk -p libfms.a -c '-Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -DMAXFIELDMETHODS_=500 -Duse_AM3_physics' path_names && \
make -s NETCDF=3 REPRO=1 libfms.a
6 changes: 3 additions & 3 deletions tools/tests/Travis-MOM6/build_ocean_only.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
echo "Compiling non-symmetric MOM6"
mkdir -p build/ocn && \
cd build/ocn && \
../../MOM6-examples/src/mkmf/bin/list_paths ../../{config_src/dynamic,config_src/solo_driver,src/{*,*/*}}/ && \
../../MOM6-examples/src/mkmf/bin/mkmf -t ../../MOM6-examples/src/mkmf/templates/linux-gnu.mk -o '-I../FMS' -p MOM6 -l '-L../FMS -lfms' -c '-Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -DMAXFIELDMETHODS_=500 -Duse_AM3_physics' path_names && \
make -s FC=mpif90 CC=mpicc LD=mpif90 NETCDF=3 REPRO=1 MOM6
../../MOM6-examples/src/mkmf/bin/list_paths -l ../../{config_src/dynamic,config_src/solo_driver,src/{*,*/*}}/ && \
../../MOM6-examples/src/mkmf/bin/mkmf -t ../../MOM6-examples/src/mkmf/templates/linux-ubuntu-trusty-gnu.mk -o '-I../FMS' -p MOM6 -l '-L../FMS -lfms' -c '-Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -DMAXFIELDMETHODS_=500 -Duse_AM3_physics' path_names && \
make -s NETCDF=3 REPRO=1 MOM6
6 changes: 3 additions & 3 deletions tools/tests/Travis-MOM6/build_symmetric_ocean_only.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
echo "Compiling symmetric MOM6"
mkdir -p build/symocn && \
cd build/symocn && \
../../MOM6-examples/src/mkmf/bin/list_paths ../../{config_src/dynamic_symmetric,config_src/solo_driver,src/{*,*/*}}/ && \
../../MOM6-examples/src/mkmf/bin/mkmf -t ../../MOM6-examples/src/mkmf/templates/linux-gnu.mk -o '-I../FMS' -p MOM6 -l '-L../FMS -lfms' -c '-Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -DMAXFIELDMETHODS_=500 -Duse_AM3_physics' path_names && \
make -s FC=mpif90 CC=mpicc LD=mpif90 NETCDF=3 REPRO=1 MOM6
../../MOM6-examples/src/mkmf/bin/list_paths -l ../../{config_src/dynamic_symmetric,config_src/solo_driver,src/{*,*/*}}/ && \
../../MOM6-examples/src/mkmf/bin/mkmf -t ../../MOM6-examples/src/mkmf/templates/linux-ubuntu-trusty-gnu.mk -o '-I../FMS' -p MOM6 -l '-L../FMS -lfms' -c '-Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -DMAXFIELDMETHODS_=500 -Duse_AM3_physics' path_names && \
make -s NETCDF=3 REPRO=1 MOM6

0 comments on commit c465130

Please sign in to comment.