Changeset 5744


Ignore:
Timestamp:
2015-09-14T16:46:40+02:00 (5 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/CONFIG/makenemo

    r5075 r5744  
    200200       ;; 
    201201   add_key) 
    202        test $?2 || ( list_add_key=$2 && export ${list_add_key} ) 
     202            # Checking if argument has anything other than whitespace 
     203            [[ ! "$2" =~ ^\ +$ ]] && { list_add_key=$2; export ${list_add_key}; } 
    203204       shift 
    204205       ;; 
    205206   del_key) 
    206        test $?2 || ( list_del_key=$2 && export ${list_del_key} ) 
     207            # Checking if argument has anything other than whitespace 
     208            [[ ! "$2" =~ ^\ +$ ]] && { list_del_key=$2; export ${list_del_key}; } 
    207209       shift 
    208210       ;; 
     
    314316fi 
    315317 
    316 #- At this stage new configuration has been added, 
    317 #- We add or remove keys 
    318 if [ ${#list_add_key} -ne 0 ] ; then 
    319     . ${COMPIL_DIR}/Fadd_keys.sh ${NEW_CONF} add_key ${list_add_key} 
    320 fi 
    321  
    322 if [ ${#list_del_key} -ne 0 ] ; then 
    323     . ${COMPIL_DIR}/Fdel_keys.sh ${NEW_CONF} del_key ${list_del_key} 
    324 fi 
     318#- At this stage new configuration has been added, we add or remove keys 
     319[ ! -z "${list_add_key}" ] && { . ${COMPIL_DIR}/Fadd_keys.sh ${NEW_CONF} add_key ${list_add_key}; } 
     320[ ! -z "${list_del_key}" ] && { . ${COMPIL_DIR}/Fdel_keys.sh ${NEW_CONF} del_key ${list_del_key}; } 
    325321 
    326322#- check that all keys are really existing... 
  • branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90

    r5203 r5744  
    6565         ! Temporarily set nsec_day to beginning of day. 
    6666         nsec_day_orig = nsec_day 
    67          kt_tide = kt - (nsec_day - 0.5_wp * rdttra(1))/rdttra(1) 
    68          IF ( nsec_day /= NINT(0.5_wp * rdttra(1)) THEN  
     67         IF ( nsec_day /= NINT(0.5_wp * rdttra(1)) ) THEN  
     68            kt_tide = kt - (nsec_day - 0.5_wp * rdttra(1))/rdttra(1) 
    6969            nsec_day = NINT(0.5_wp * rdttra(1)) 
     70         ELSE 
     71            kt_tide = kt  
    7072         ENDIF 
    7173         CALL tide_harmo( omega_tide, v0tide, utide, ftide, ntide, nb_harmo ) 
Note: See TracChangeset for help on using the changeset viewer.