Changeset 3225 for branches/2011/dev_NEMO_MERGE_2011

Timestamp:

2011-12-15T17:06:19+01:00 (12 years ago)

Author:

acc

Message:

Branch 2011/dev_NEMO_MERGE_2011. Tidy up NOC arch files and move to NOC subdirectory. Small change to Flist_archfile.sh to make members ARCH subdirectories visible when using makenemo -h

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM

Files:

• ARCH/NOC (added)
• ARCH/NOC/arch-ALTIX_NAUTILUS.fcm (moved) (moved from branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS.fcm) (1 diff)
• ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm (copied) (copied from branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm)
• ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm (moved) (moved from branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm) (3 diffs)
• TOOLS/COMPILE/Flist_archfile.sh (modified) (2 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS.fcm

@@ -1 @@
-# ifort compiler options for NOCS ALTIX cluster nautilus
+# ifort (mpif90) compiler options for NOCS ALTIX cluster nautilus
 # NCDF_INC    netcdf include file
 # NCDF_LIB    netcdf library

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_SETTE.fcm

@@ -1 @@
-# ifort compiler options for NOCS ALTIX cluster nautilus using NetCDF4 libraries
+# ifort compiler options for NOCS ALTIX cluster nautilus using NetCDF4 libraries and minimal optimisation for the purposes of SETTE testing
 # NCDF_HOME   root directory containing lib and include subdirectories for netcdf4
 # HDF5_HOME   root directory containing lib and include subdirectories for HDF5
@@ -23 +23 @@
 %NCDF_LIB            -L%HDF5_HOME/lib -L%NCDF_HOME/lib -Bstatic -lnetcdf -lhdf5_fortran -lhdf5_hl -lhdf5 -Bdynamic -lz
 %FC                  ifort
-%FCFLAGS             -r8 -O3 -xT -ip -vec-report0
-%FFLAGS              -r8 -O3 -xT -ip -vec-report0
+%FCFLAGS             -r8 -O0
+%FFLAGS              -r8 -O0
 %LD                  ifort
 %FPPFLAGS            -P -C -traditional
@@ -33 +33 @@
 %USER_INC            %NCDF_INC
 %USER_LIB            %NCDF_LIB
-
-# - if debugging use these flags
-#FCFLAGS             -g -traceback -r8 -O0 -xT -ip -vec-report0
-#FFLAGS              -g -traceback -r8 -O0 -xT -ip -vec-report0

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/COMPILE/Flist_archfile.sh

@@ -82 +82 @@
       done
    done
-else
-   if [ -d ${MAIN_DIR}/ARCH/${1} ]; then
+elif [ -d ${MAIN_DIR}/ARCH/${1} ]; then
       echo "Available compilers at $1 :"
       for file in  $(ls ${MAIN_DIR}/ARCH/$1 | grep fcm )
@@ -92 +91 @@
       printf "%-20s %s %-s\n" "${zvar1%.fcm}" : "${zvar2#\#}"
       done
-   fi
+else
+      echo "Available consortium member sub-directories :"
+      for dir  in  $(ls ${MAIN_DIR}/ARCH | grep -v fcm )
+      do
+         echo ${dir}
+      done
+      echo "use \"makenemo -h all\" or \"makenemo -m help\" to see compilers available in member's sub-directories"
 fi