Changeset 5097 for branches

Timestamp:

2015-02-20T10:40:36+01:00 (9 years ago)

Author:

timgraham

Message:

Update to head of trunk (changes to makenemo and INGV arch file only)

Location:

branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM

Files:

• ARCH/INGV/arch-IBM_EKMAN_INGV.fcm (modified) (1 diff)
• CONFIG/makenemo (modified) (2 diffs)

branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/ARCH/INGV/arch-IBM_EKMAN_INGV.fcm

@@ -18 +18 @@
 %NCDF_INC            -I/srv/lib/netcdf-x/include
 %NCDF_LIB            -L/srv/lib/netcdf-x/lib -lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lcurl -lstdc++
-%XIOS_ROOT           /home/delrosso/XIOS_447/trunk
+%XIOS_ROOT           /home/delrosso/XIOS_482/XIOS
 %MPI_INTEL           -I/srv/intel/impi/4.1.0.024/include
 %CPP                 cpp
 %FC                  mpiifort
-%FCFLAGS             -r8 -O3 -g -traceback 
+%FCFLAGS             -r8 -O1 -g -traceback -fp-model precise
 %FFLAGS              %FCFLAGS
 %LD                  mpiifort
-%LDFLAGS             
+%LDFLAGS
 %FPPFLAGS            -P -C -traditional
 %AR                  ar

branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/CONFIG/makenemo

@@ -200 +200 @@
        ;;
    add_key)
-            [ ! -z $2 ] && { list_add_key=$2; export ${list_add_key}; }
+       # Checking void argument
+       [ ! -z $2 ] && { list_add_key=$2; export ${list_add_key}; }
        shift
        ;;
    del_key)
-            [ ! -z $2 ] && { list_del_key=$2; export ${list_del_key}; }
+       # Checking void argument
+       [ ! -z $2 ] && { list_del_key=$2; export ${list_del_key}; }
        shift
        ;;
@@ -314 +316 @@
 fi
 
-#- At this stage new configuration has been added,
-#- We add or remove keys
-if [ ${#list_add_key} -ne 0 ] ; then
-    . ${COMPIL_DIR}/Fadd_keys.sh ${NEW_CONF} add_key ${list_add_key}
-fi
-
-if [ ${#list_del_key} -ne 0 ] ; then
-    . ${COMPIL_DIR}/Fdel_keys.sh ${NEW_CONF} del_key ${list_del_key}
-fi
+#- At this stage new configuration has been added, we add or remove keys
+[ ! -z ${list_add_key} ] && { . ${COMPIL_DIR}/Fadd_keys.sh ${NEW_CONF} add_key ${list_add_key}; }
+[ ! -z ${list_del_key} ] && { . ${COMPIL_DIR}/Fdel_keys.sh ${NEW_CONF} del_key ${list_del_key}; }
 
 #- check that all keys are really existing...