New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 6459 – NEMO

Changeset 6459


Ignore:
Timestamp:
2016-04-08T18:00:11+02:00 (6 years ago)
Author:
lovato
Message:

Move runoff fields time swap in sbcmod (#1703) and change SETTE path definition of MAIN_DIR (#1655)

Location:
branches/2015/nemo_v3_6_STABLE/NEMOGCM
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r6348 r6459  
    340340         emp_b(:,:) = emp(:,:) 
    341341         sfx_b(:,:) = sfx(:,:) 
     342         IF ( ln_rnf ) THEN 
     343            rnf_b    (:,:  ) = rnf    (:,:  ) 
     344            rnf_tsc_b(:,:,:) = rnf_tsc(:,:,:) 
     345         ENDIF 
    342346      ENDIF 
    343347      !                                            ! ---------------------------------------- ! 
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

    r6232 r6459  
    109109      ! 
    110110      CALL wrk_alloc( jpi,jpj, ztfrz) 
    111  
    112       !                                            ! ---------------------------------------- ! 
    113       IF( kt /= nit000 ) THEN                      !          Swap of forcing fields          ! 
    114          !                                         ! ---------------------------------------- ! 
    115          rnf_b    (:,:  ) = rnf    (:,:  )               ! Swap the ocean forcing fields except at nit000 
    116          rnf_tsc_b(:,:,:) = rnf_tsc(:,:,:)               ! where before fields are set at the end of the routine 
    117          ! 
    118       ENDIF 
    119  
     111      ! 
    120112      !                                            !-------------------! 
    121113      !                                            !   Update runoff   ! 
  • branches/2015/nemo_v3_6_STABLE/NEMOGCM/SETTE/sette.sh

    r5588 r6459  
    123123# Directory to run the tests 
    124124SETTE_DIR=$(cd $(dirname "$0"); pwd) 
    125 MAIN_DIR=${SETTE_DIR%/SETTE} 
     125MAIN_DIR=$(dirname $SETTE_DIR) 
    126126CONFIG_DIR=${MAIN_DIR}/CONFIG 
    127127TOOLS_DIR=${MAIN_DIR}/TOOLS 
Note: See TracChangeset for help on using the changeset viewer.