Changeset 8190 for branches/UKMO/dev_r5518_GO6_package_inc_asm
- Timestamp:
- 2017-06-19T17:43:22+02:00 (7 years ago)
- Location:
- branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
r8036 r8190 85 85 INTEGER, INTENT(in) :: kt ! ocean time-step index 86 86 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdu, ztrdv 87 REAL(wp), DIMENSION(jpi,jpj,jpk) :: z_rhd_st ! tmp density storage for pressure corr88 REAL(wp), DIMENSION(jpi,jpj) :: z_gru_st ! tmp ua trends storage for pressure corr89 REAL(wp), DIMENSION(jpi,jpj) :: z_grv_st ! tmp va trends storage for pressure corr87 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: z_rhd_st ! tmp density storage for pressure corr 88 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: z_gru_st ! tmp ua trends storage for pressure corr 89 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: z_grv_st ! tmp va trends storage for pressure corr 90 90 !!---------------------------------------------------------------------- 91 91 ! … … 99 99 ! 100 100 IF ( ln_bias .AND. ln_bias_pc_app ) THEN 101 102 !Allocate space for tempory variables 103 ALLOCATE( z_rhd_st(jpi,jpj,jpk), & 104 & z_gru_st(jpi,jpj), & 105 & z_grv_st(jpi,jpj) ) 106 101 107 z_rhd_st(:,:,:) = rhd(:,:,:) ! store orig density 102 108 rhd(:,:,:) = rhd_pc(:,:,:) ! use pressure corrected density … … 105 111 z_grv_st(:,:) = grv(:,:) 106 112 grv(:,:) = grv_pc(:,:) 113 107 114 ENDIF 108 115 ! … … 130 137 gru(:,:) = z_gru_st(:,:) 131 138 grv(:,:) = z_grv_st(:,:) 139 140 !Deallocate tempory variables 141 DEALLOCATE( z_rhd_st(jpi,jpj,jpk), & 142 & z_gru_st(jpi,jpj), & 143 & z_grv_st(jpi,jpj) ) 132 144 ENDIF 133 145 ! -
branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90
r8041 r8190 106 106 hdivn(:,:,jk) = hdivn(:,:,jk) - ( ssh_iau(:,:) / ( ht_0(:,:) + 1.0 - ssmask(:,:) ) ) * ( e3t_0(:,:,jk) / fse3t_n(:,:,jk) ) * tmask(:,:,jk) 107 107 END DO 108 CALL lbc_lnk( hdivn, 'T', 1. ) ! Not sure that's necessary109 108 ENDIF 110 109 #endif -
branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90
r8064 r8190 114 114 115 115 ! 116 #if defined key_asminc 116 117 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: ndaice_da !: NEMO fresh water flux to ocean due to data assim 117 118 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: nfresh_da !: NEMO salt flux to ocean due to data assim 118 119 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: nfsalt_da !: NEMO ice concentration change/second from data assim 120 #endif 119 121 120 122 #endif … … 170 172 ss_iov(jpi,jpj) , fr_iu(jpi,jpj) , fr_iv(jpi,jpj) , & 171 173 a_i(jpi,jpj,ncat) , topmelt(jpi,jpj,ncat) , botmelt(jpi,jpj,ncat) , & 174 #if defined key_asminc 172 175 ndaice_da(jpi,jpj) , nfresh_da(jpi,jpj) , nfsalt_da(jpi,jpj) , & 176 #endif 173 177 sstfrz(jpi,jpj) , STAT= ierr(1) ) 174 178 ! Alex West: Allocating tn_ice with 5 categories. When NEMO is used with CICE, this variable -
branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90
r8037 r8190 303 303 CALL wrk_dealloc( jpi,jpj, ztmp1, ztmp2 ) 304 304 305 #if defined key_asminc 305 306 ! Initialize fresh water and salt fluxes from data assim 306 307 ! and data assimilation index to cice … … 308 309 nfsalt_da(:,:) = 0.0 309 310 ndaice_da(:,:) = 0.0 311 #endif 310 312 ! 311 313 IF( nn_timing == 1 ) CALL timing_stop('cice_sbc_init') -
branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/step.F90
r8036 r8190 300 300 IF ( .NOT. lk_dynspg_ts ) THEN ! eos already called in time-split case 301 301 CALL eos ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 302 CALL lbc_lnk( rhd, 'T', 1.0_wp )303 302 IF( ln_zps .AND. .NOT. ln_isfcav) & 304 303 & CALL zps_hde ( kstp, jpts, tsn, gtsu, gtsv, & ! Partial steps: before horizontal gradient
Note: See TracChangeset
for help on using the changeset viewer.