Changeset 10449

Timestamp:

2019-01-02T10:38:04+01:00 (6 years ago)

Author:

andmirek

Message:

GMED ticket 425 changes for INTEL compiler

Location:

utils/build

Files:

• arch/arch-linux_ifort.fcm (modified) (2 diffs)
• mk/Fcheck_archfile.sh (modified) (1 diff)

utils/build/arch/arch-linux_ifort.fcm

@@ -31 +31 @@
 #  - fcm variables are starting with a % (and not a $)
 #
-%NCDF_HOME           /usr/local/netcdf
-%HDF5_HOME           /usr/local/hdf5
-%XIOS_HOME           $HOME/xios-2.5
+%NCDF_HOME           $NETCDF_DIR
+%HDF5_HOME           $HDF5_DIR
+%XIOS_HOME           $xios_path
 %OASIS_HOME          /not/defiled
 
@@ -44 +44 @@
 
 %CPP               cpp
-%FC                  mpif90 -c -cpp
+%FC                  ftn -c -cpp
 %FCFLAGS             -i4 -r8 -O3 -fp-model precise -fno-alias
 %FFLAGS              %FCFLAGS
-%LD                  mpif90
+%LD                  ftn
 %LDFLAGS             
 %FPPFLAGS            -P -C -traditional

utils/build/mk/Fcheck_archfile.sh

@@ -200 +200 @@
     use_oasis=0
 fi
+#ignore use_oasis if XIOS_OASIS is set  (doesn't matter to what value) 
+if [[ ! -z "$XIOS_OASIS" ]]; then 
+    use_oasis=1 
+fi 
 for liboa in psmile.MPI1 mct mpeu scrip mpp_io
 do