Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
@eclare108213
eclare108213 committed Apr 28, 2008
1 parent bff5efc commit 151b9af
Show file tree
Hide file tree
Showing 28 changed files with 6,372 additions and 732 deletions.
8 changes: 4 additions & 4 deletions cice/bld/Macros.Linux.LANL.coyote
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ endif

ifeq ($(NETCDF), yes)
CPPDEFS := $(CPPDEFS) -Dncdf
# INCLDIR := $(INCLDIR) -I/usr/projects/climate/maltrud/local/include
# SLIBS := $(SLIBS) -L/usr/projects/climate/maltrud/local/lib -lnetcdf
INCLDIR := $(INCLDIR) -I/scratch2/bzhao/netcdf-3.6.1/include
SLIBS := $(SLIBS) -L/scratch2/bzhao/netcdf-3.6.1/lib -lnetcdf
# INCLDIR := $(INCLDIR) -I/usr/projects/climate/maltrud/local/include_coyote
# SLIBS := $(SLIBS) -L/usr/projects/climate/maltrud/local/lib_coyote -lnetcdf
INCLDIR := $(INCLDIR) -I/usr/projects/climate/bzhao/netcdf-3.6.1/include
SLIBS := $(SLIBS) -L/usr/projects/climate/bzhao/netcdf-3.6.1/lib -lnetcdf
endif

ifeq ($(USE_ESMF), yes)
Expand Down
47 changes: 31 additions & 16 deletions cice/drivers/ccsm_concurrent/ice_step_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ subroutine step_therm1 (dt)

real (kind=dbl_kind), dimension (nx_block,ny_block) :: &
fsensn , & ! surface downward sensible heat (W/m^2)
flatn , & ! surface downward latent heat (W/m^2)
fswabsn , & ! shortwave absorbed by ice (W/m^2)
flwoutn , & ! upward LW at surface (W/m^2)
evapn , & ! flux of vapor, atmos to ice (kg m-2 s-1)
Expand Down Expand Up @@ -309,7 +308,8 @@ subroutine step_therm1 (dt)
fswthrun(:,:,n,iblk), &
Sswabsn(:,:,sl1:sl2,iblk), &
Iswabsn(:,:,il1:il2,iblk), &
fsensn, flatn, &
fsurfn(:,:,n,iblk), fcondtopn(:,:,n,iblk),&
fsensn, flatn(:,:,n,iblk), &
fswabsn, flwoutn, &
evapn, freshn, &
fsaltn, fhocnn, &
Expand Down Expand Up @@ -365,7 +365,8 @@ subroutine step_therm1 (dt)
alvdrn(:,:,n,iblk), alidrn(:,:,n,iblk), &
alvdfn(:,:,n,iblk), alidfn(:,:,n,iblk), &
strairxn, strairyn, &
fsensn, flatn, &
fsurfn(:,:,n,iblk), fcondtopn(:,:,n,iblk),&
fsensn, flatn(:,:,n,iblk), &
fswabsn, flwoutn, &
evapn, &
Trefn, Qrefn, &
Expand All @@ -374,6 +375,7 @@ subroutine step_therm1 (dt)
alvdr (:,:,iblk), alidr (:,:,iblk), &
alvdf (:,:,iblk), alidf (:,:,iblk), &
strairxT(:,:,iblk), strairyT (:,:,iblk), &
fsurf (:,:,iblk), fcondtop (:,:,iblk), &
fsens (:,:,iblk), flat (:,:,iblk), &
fswabs (:,:,iblk), flwout (:,:,iblk), &
evap (:,:,iblk), &
Expand Down Expand Up @@ -599,18 +601,22 @@ subroutine step_therm2 (dt)
call add_new_ice (nx_block, ny_block, &
icells, &
indxi, indxj, &
tmask (:,:, iblk), dt, &
aicen (:,:,:,iblk), &
trcrn (:,:,:,:,iblk), &
vicen (:,:,:,iblk), &
eicen (:,:,:,iblk), &
aice0 (:,:, iblk), &
aice (:,:, iblk), &
frzmlt (:,:, iblk), &
frazil (:,:, iblk), &
frz_onset(:,:, iblk), yday, &
Tf (:,:, iblk), l_stop, &
istop, jstop)
tmask (:,:, iblk), dt, &
aicen (:,:,:,iblk), &
trcrn (:,:,:,:,iblk), &
vicen (:,:,:,iblk), &
eicen (:,:,:,iblk), &
aice0 (:,:, iblk), &
aice (:,:, iblk), &
frzmlt (:,:, iblk), &
frazil (:,:, iblk), &
frz_onset (:,:, iblk), yday, &
fresh (:,:, iblk), &
fresh_hist(:,:, iblk), &
fsalt (:,:, iblk), &
fsalt_hist(:,:, iblk), &
Tf (:,:, iblk), l_stop, &
istop , jstop)

if (l_stop) then
write (nu_diag,*) 'istep1, my_task, iblk =', &
Expand Down Expand Up @@ -676,7 +682,7 @@ subroutine step_therm2 (dt)
fresh (:,:, iblk), fresh_hist(:,:,iblk), &
fsalt (:,:, iblk), fsalt_hist(:,:,iblk), &
fhocn (:,:, iblk), fhocn_hist(:,:,iblk), &
l_stop, &
heat_capacity, l_stop, &
istop, jstop)

if (l_stop) then
Expand Down Expand Up @@ -1379,6 +1385,15 @@ subroutine step_rad2 (dt)

enddo ! iblk

!----------------------------------------------------------------
! Store grid box mean fluxes before scaled by aice_init
!----------------------------------------------------------------

fresh_hist_gbm (:,:,:) = fresh_hist (:,:,:)
fsalt_hist_gbm (:,:,:) = fsalt_hist (:,:,:)
fhocn_hist_gbm (:,:,:) = fhocn_hist (:,:,:)
fswthru_hist_gbm(:,:,:) = fswthru_hist(:,:,:)

call scale_hist_fluxes ! to match coupler fluxes

end subroutine step_rad2
Expand Down
47 changes: 31 additions & 16 deletions cice/drivers/ccsm_sequential/ice_step_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ subroutine step_therm1 (dt)

real (kind=dbl_kind), dimension (nx_block,ny_block) :: &
fsensn , & ! surface downward sensible heat (W/m^2)
flatn , & ! surface downward latent heat (W/m^2)
fswabsn , & ! shortwave absorbed by ice (W/m^2)
flwoutn , & ! upward LW at surface (W/m^2)
evapn , & ! flux of vapor, atmos to ice (kg m-2 s-1)
Expand Down Expand Up @@ -309,7 +308,8 @@ subroutine step_therm1 (dt)
fswthrun(:,:,n,iblk), &
Sswabsn(:,:,sl1:sl2,iblk), &
Iswabsn(:,:,il1:il2,iblk), &
fsensn, flatn, &
fsurfn(:,:,n,iblk), fcondtopn(:,:,n,iblk),&
fsensn, flatn(:,:,n,iblk), &
fswabsn, flwoutn, &
evapn, freshn, &
fsaltn, fhocnn, &
Expand Down Expand Up @@ -365,7 +365,8 @@ subroutine step_therm1 (dt)
alvdrn(:,:,n,iblk), alidrn(:,:,n,iblk), &
alvdfn(:,:,n,iblk), alidfn(:,:,n,iblk), &
strairxn, strairyn, &
fsensn, flatn, &
fsurfn(:,:,n,iblk), fcondtopn(:,:,n,iblk),&
fsensn, flatn(:,:,n,iblk), &
fswabsn, flwoutn, &
evapn, &
Trefn, Qrefn, &
Expand All @@ -374,6 +375,7 @@ subroutine step_therm1 (dt)
alvdr (:,:,iblk), alidr (:,:,iblk), &
alvdf (:,:,iblk), alidf (:,:,iblk), &
strairxT(:,:,iblk), strairyT (:,:,iblk), &
fsurf (:,:,iblk), fcondtop (:,:,iblk), &
fsens (:,:,iblk), flat (:,:,iblk), &
fswabs (:,:,iblk), flwout (:,:,iblk), &
evap (:,:,iblk), &
Expand Down Expand Up @@ -599,18 +601,22 @@ subroutine step_therm2 (dt)
call add_new_ice (nx_block, ny_block, &
icells, &
indxi, indxj, &
tmask (:,:, iblk), dt, &
aicen (:,:,:,iblk), &
trcrn (:,:,:,:,iblk), &
vicen (:,:,:,iblk), &
eicen (:,:,:,iblk), &
aice0 (:,:, iblk), &
aice (:,:, iblk), &
frzmlt (:,:, iblk), &
frazil (:,:, iblk), &
frz_onset(:,:, iblk), yday, &
Tf (:,:, iblk), l_stop, &
istop, jstop)
tmask (:,:, iblk), dt, &
aicen (:,:,:,iblk), &
trcrn (:,:,:,:,iblk), &
vicen (:,:,:,iblk), &
eicen (:,:,:,iblk), &
aice0 (:,:, iblk), &
aice (:,:, iblk), &
frzmlt (:,:, iblk), &
frazil (:,:, iblk), &
frz_onset (:,:, iblk), yday, &
fresh (:,:, iblk), &
fresh_hist(:,:, iblk), &
fsalt (:,:, iblk), &
fsalt_hist(:,:, iblk), &
Tf (:,:, iblk), l_stop, &
istop , jstop)

if (l_stop) then
write (nu_diag,*) 'istep1, my_task, iblk =', &
Expand Down Expand Up @@ -676,7 +682,7 @@ subroutine step_therm2 (dt)
fresh (:,:, iblk), fresh_hist(:,:,iblk), &
fsalt (:,:, iblk), fsalt_hist(:,:,iblk), &
fhocn (:,:, iblk), fhocn_hist(:,:,iblk), &
l_stop, &
heat_capacity, l_stop, &
istop, jstop)

if (l_stop) then
Expand Down Expand Up @@ -1379,6 +1385,15 @@ subroutine step_rad2 (dt)

enddo ! iblk

!----------------------------------------------------------------
! Store grid box mean fluxes before scaled by aice_init
!----------------------------------------------------------------

fresh_hist_gbm (:,:,:) = fresh_hist (:,:,:)
fsalt_hist_gbm (:,:,:) = fsalt_hist (:,:,:)
fhocn_hist_gbm (:,:,:) = fhocn_hist (:,:,:)
fswthru_hist_gbm(:,:,:) = fswthru_hist(:,:,:)

call scale_hist_fluxes ! to match coupler fluxes

end subroutine step_rad2
Expand Down
Loading

0 comments on commit 151b9af

Please sign in to comment.