Changeset 5744

Timestamp:

2015-09-14T16:46:40+02:00 (9 years ago)

Author:

timgraham

Message:

Minor bugfixes missed from last commit:
1) makenemo updated as in r5092 of trunk
2) Missed changes in sbctide.F90

Location:

branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM

Files:

• CONFIG/makenemo (modified) (2 diffs)
• NEMO/OPA_SRC/SBC/sbctide.F90 (modified) (1 diff)

branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/CONFIG/makenemo

@@ -200 +200 @@
        ;;
    add_key)
-       test $?2 || ( list_add_key=$2 && export ${list_add_key} )
+            # Checking if argument has anything other than whitespace
+            [[ ! "$2" =~ ^\ +$ ]] && { list_add_key=$2; export ${list_add_key}; }
        shift
        ;;
    del_key)
-       test $?2 || ( list_del_key=$2 && export ${list_del_key} )
+            # Checking if argument has anything other than whitespace
+            [[ ! "$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...

branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90

@@ -65 +65 @@
          ! Temporarily set nsec_day to beginning of day.
          nsec_day_orig = nsec_day
-         kt_tide = kt - (nsec_day - 0.5_wp * rdttra(1))/rdttra(1)
-         IF ( nsec_day /= NINT(0.5_wp * rdttra(1)) THEN 
+         IF ( nsec_day /= NINT(0.5_wp * rdttra(1)) ) THEN 
+            kt_tide = kt - (nsec_day - 0.5_wp * rdttra(1))/rdttra(1)
             nsec_day = NINT(0.5_wp * rdttra(1))
+         ELSE
+            kt_tide = kt 
          ENDIF
          CALL tide_harmo( omega_tide, v0tide, utide, ftide, ntide, nb_harmo )