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 5162 for branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/NEMO/OPA_SRC – NEMO

Ignore:
Timestamp:
2015-03-23T16:57:10+01:00 (9 years ago)
Author:
davestorkey
Message:

Bug fixes for 2015/dev_r5021_UKMO1_CICE_coupling

Location:
branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/NEMO/OPA_SRC/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r5159 r5162  
    697697      !! 
    698698      LOGICAL ::    llnewtx, llnewtau      ! update wind stress components and module?? 
    699       INTEGER  ::   ji, jj, jn             ! dummy loop indices 
     699      INTEGER  ::   ji, jj, jl, jn         ! dummy loop indices 
    700700      INTEGER  ::   isec                   ! number of seconds since nit000 (assuming rdttra did not change since nit000) 
    701701      REAL(wp) ::   zcumulneg, zcumulpos   ! temporary scalars      
     
    15431543            ztmp4(:,:,1:jpl) = ht_p(:,:,1:jpl)  
    15441544         END SELECT  
    1545          IF( ssnd(jps_a_p)%laction )   CALL cpl_prism_snd( jps_a_p, isec, ztmp3, info )     
    1546          IF( ssnd(jps_ht_p)%laction )   CALL cpl_prism_snd( jps_ht_p, isec, ztmp4, info )     
     1545         IF( ssnd(jps_a_p)%laction )   CALL cpl_snd( jps_a_p, isec, ztmp3, info )     
     1546         IF( ssnd(jps_ht_p)%laction )   CALL cpl_snd( jps_ht_p, isec, ztmp4, info )     
    15471547      ENDIF 
    15481548      ! 
  • branches/2015/dev_r5021_UKMO1_CICE_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r5158 r5162  
    4545                flatn_f,fsurfn_f,fcondtopn_f,                    & 
    4646                uatm,vatm,wind,fsw,flw,Tair,potT,Qa,rhoa,zlvl,   & 
    47                 swvdr,swvdf,swidr,swidf 
     47                swvdr,swvdf,swidr,swidf,Tf 
    4848   USE ice_therm_vertical, only: calc_Tsfc 
    4949#else 
     
    5555                flatn_f,fsurfn_f,fcondtopn_f,                    & 
    5656                uatm,vatm,wind,fsw,flw,Tair,potT,Qa,rhoa,zlvl,   & 
    57                 swvdr,swvdf,swidr,swidf 
     57                swvdr,swvdf,swidr,swidf,Tf 
    5858   USE ice_therm_shared, only: calc_Tsfc 
    5959   USE ice_shortwave, only: apeffn 
     
    179179      CALL wrk_alloc( jpi,jpj,jpk, ztfrz3d )  
    180180      DO jk=1,jpk 
    181          ztfrz3d(:,:,jk) = eos_fzp( tsn(:,:,jk,jp_sal), fsdewq(:,:,jk) ) 
    182       ENDDO 
    183       sstfrz(:,:)=ztfrz(:,:,1) 
     181         ztfrz3d(:,:,jk) = eos_fzp( tsn(:,:,jk,jp_sal), fsdept_n(:,:,jk) ) 
     182      ENDDO 
     183      sstfrz(:,:)=ztfrz3d(:,:,1) 
    184184 
    185185      !Ensure that no temperature points are below freezing if not a NEMO restart 
     
    440440 
    441441! Recalculate freezing temperature and send to CICE  
    442       sstfrz(:,:)=tfreez(sss_m(:,:))  
     442      sstfrz(:,:)=eos_fzp(sss_m(:,:), fsdept_n(:,:,1))  
    443443      CALL nemo2cice(sstfrz,Tf,'T', 1. ) 
    444444 
     
    724724      DO jl = 1,ncat 
    725725         CALL cice2nemo(apeffn(:,:,jl,:),a_p(:,:,jl),'T', 1. ) 
    726          CALL cice2nemo(trcrn(:,:,jl,:),ht_p(:,:,jl),'T', 1. ) 
     726         CALL cice2nemo(trcrn(:,:,nt_hpnd,jl,:),ht_p(:,:,jl),'T', 1. ) 
    727727      ENDDO 
    728728#endif 
Note: See TracChangeset for help on using the changeset viewer.