Skip to content

Commit 151b9af

Browse files
eclare108213eclare108213
committed
1 parent bff5efc commit 151b9af

28 files changed

+6372
-732
lines changed

‎cice/bld/Macros.Linux.LANL.coyote

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ endif
3131

3232
ifeq ($(NETCDF), yes)
3333
CPPDEFS := $(CPPDEFS) -Dncdf
34-
# INCLDIR := $(INCLDIR) -I/usr/projects/climate/maltrud/local/include
35-
# SLIBS := $(SLIBS) -L/usr/projects/climate/maltrud/local/lib -lnetcdf
36-
INCLDIR := $(INCLDIR) -I/scratch2/bzhao/netcdf-3.6.1/include
37-
SLIBS := $(SLIBS) -L/scratch2/bzhao/netcdf-3.6.1/lib -lnetcdf
34+
# INCLDIR := $(INCLDIR) -I/usr/projects/climate/maltrud/local/include_coyote
35+
# SLIBS := $(SLIBS) -L/usr/projects/climate/maltrud/local/lib_coyote -lnetcdf
36+
INCLDIR := $(INCLDIR) -I/usr/projects/climate/bzhao/netcdf-3.6.1/include
37+
SLIBS := $(SLIBS) -L/usr/projects/climate/bzhao/netcdf-3.6.1/lib -lnetcdf
3838
endif
3939

4040
ifeq ($(USE_ESMF), yes)

‎cice/drivers/ccsm_concurrent/ice_step_mod.F90

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ subroutine step_therm1 (dt)
118118

119119
real (kind=dbl_kind), dimension (nx_block,ny_block) :: &
120120
fsensn , & ! surface downward sensible heat (W/m^2)
121-
flatn , & ! surface downward latent heat (W/m^2)
122121
fswabsn , & ! shortwave absorbed by ice (W/m^2)
123122
flwoutn , & ! upward LW at surface (W/m^2)
124123
evapn , & ! flux of vapor, atmos to ice (kg m-2 s-1)
@@ -309,7 +308,8 @@ subroutine step_therm1 (dt)
309308
fswthrun(:,:,n,iblk), &
310309
Sswabsn(:,:,sl1:sl2,iblk), &
311310
Iswabsn(:,:,il1:il2,iblk), &
312-
fsensn, flatn, &
311+
fsurfn(:,:,n,iblk), fcondtopn(:,:,n,iblk),&
312+
fsensn, flatn(:,:,n,iblk), &
313313
fswabsn, flwoutn, &
314314
evapn, freshn, &
315315
fsaltn, fhocnn, &
@@ -365,7 +365,8 @@ subroutine step_therm1 (dt)
365365
alvdrn(:,:,n,iblk), alidrn(:,:,n,iblk), &
366366
alvdfn(:,:,n,iblk), alidfn(:,:,n,iblk), &
367367
strairxn, strairyn, &
368-
fsensn, flatn, &
368+
fsurfn(:,:,n,iblk), fcondtopn(:,:,n,iblk),&
369+
fsensn, flatn(:,:,n,iblk), &
369370
fswabsn, flwoutn, &
370371
evapn, &
371372
Trefn, Qrefn, &
@@ -374,6 +375,7 @@ subroutine step_therm1 (dt)
374375
alvdr (:,:,iblk), alidr (:,:,iblk), &
375376
alvdf (:,:,iblk), alidf (:,:,iblk), &
376377
strairxT(:,:,iblk), strairyT (:,:,iblk), &
378+
fsurf (:,:,iblk), fcondtop (:,:,iblk), &
377379
fsens (:,:,iblk), flat (:,:,iblk), &
378380
fswabs (:,:,iblk), flwout (:,:,iblk), &
379381
evap (:,:,iblk), &
@@ -599,18 +601,22 @@ subroutine step_therm2 (dt)
599601
call add_new_ice (nx_block, ny_block, &
600602
icells, &
601603
indxi, indxj, &
602-
tmask (:,:, iblk), dt, &
603-
aicen (:,:,:,iblk), &
604-
trcrn (:,:,:,:,iblk), &
605-
vicen (:,:,:,iblk), &
606-
eicen (:,:,:,iblk), &
607-
aice0 (:,:, iblk), &
608-
aice (:,:, iblk), &
609-
frzmlt (:,:, iblk), &
610-
frazil (:,:, iblk), &
611-
frz_onset(:,:, iblk), yday, &
612-
Tf (:,:, iblk), l_stop, &
613-
istop, jstop)
604+
tmask (:,:, iblk), dt, &
605+
aicen (:,:,:,iblk), &
606+
trcrn (:,:,:,:,iblk), &
607+
vicen (:,:,:,iblk), &
608+
eicen (:,:,:,iblk), &
609+
aice0 (:,:, iblk), &
610+
aice (:,:, iblk), &
611+
frzmlt (:,:, iblk), &
612+
frazil (:,:, iblk), &
613+
frz_onset (:,:, iblk), yday, &
614+
fresh (:,:, iblk), &
615+
fresh_hist(:,:, iblk), &
616+
fsalt (:,:, iblk), &
617+
fsalt_hist(:,:, iblk), &
618+
Tf (:,:, iblk), l_stop, &
619+
istop , jstop)
614620

615621
if (l_stop) then
616622
write (nu_diag,*) 'istep1, my_task, iblk =', &
@@ -676,7 +682,7 @@ subroutine step_therm2 (dt)
676682
fresh (:,:, iblk), fresh_hist(:,:,iblk), &
677683
fsalt (:,:, iblk), fsalt_hist(:,:,iblk), &
678684
fhocn (:,:, iblk), fhocn_hist(:,:,iblk), &
679-
l_stop, &
685+
heat_capacity, l_stop, &
680686
istop, jstop)
681687

682688
if (l_stop) then
@@ -1379,6 +1385,15 @@ subroutine step_rad2 (dt)
13791385

13801386
enddo ! iblk
13811387

1388+
!----------------------------------------------------------------
1389+
! Store grid box mean fluxes before scaled by aice_init
1390+
!----------------------------------------------------------------
1391+
1392+
fresh_hist_gbm (:,:,:) = fresh_hist (:,:,:)
1393+
fsalt_hist_gbm (:,:,:) = fsalt_hist (:,:,:)
1394+
fhocn_hist_gbm (:,:,:) = fhocn_hist (:,:,:)
1395+
fswthru_hist_gbm(:,:,:) = fswthru_hist(:,:,:)
1396+
13821397
call scale_hist_fluxes ! to match coupler fluxes
13831398

13841399
end subroutine step_rad2

‎cice/drivers/ccsm_sequential/ice_step_mod.F90

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ subroutine step_therm1 (dt)
118118

119119
real (kind=dbl_kind), dimension (nx_block,ny_block) :: &
120120
fsensn , & ! surface downward sensible heat (W/m^2)
121-
flatn , & ! surface downward latent heat (W/m^2)
122121
fswabsn , & ! shortwave absorbed by ice (W/m^2)
123122
flwoutn , & ! upward LW at surface (W/m^2)
124123
evapn , & ! flux of vapor, atmos to ice (kg m-2 s-1)
@@ -309,7 +308,8 @@ subroutine step_therm1 (dt)
309308
fswthrun(:,:,n,iblk), &
310309
Sswabsn(:,:,sl1:sl2,iblk), &
311310
Iswabsn(:,:,il1:il2,iblk), &
312-
fsensn, flatn, &
311+
fsurfn(:,:,n,iblk), fcondtopn(:,:,n,iblk),&
312+
fsensn, flatn(:,:,n,iblk), &
313313
fswabsn, flwoutn, &
314314
evapn, freshn, &
315315
fsaltn, fhocnn, &
@@ -365,7 +365,8 @@ subroutine step_therm1 (dt)
365365
alvdrn(:,:,n,iblk), alidrn(:,:,n,iblk), &
366366
alvdfn(:,:,n,iblk), alidfn(:,:,n,iblk), &
367367
strairxn, strairyn, &
368-
fsensn, flatn, &
368+
fsurfn(:,:,n,iblk), fcondtopn(:,:,n,iblk),&
369+
fsensn, flatn(:,:,n,iblk), &
369370
fswabsn, flwoutn, &
370371
evapn, &
371372
Trefn, Qrefn, &
@@ -374,6 +375,7 @@ subroutine step_therm1 (dt)
374375
alvdr (:,:,iblk), alidr (:,:,iblk), &
375376
alvdf (:,:,iblk), alidf (:,:,iblk), &
376377
strairxT(:,:,iblk), strairyT (:,:,iblk), &
378+
fsurf (:,:,iblk), fcondtop (:,:,iblk), &
377379
fsens (:,:,iblk), flat (:,:,iblk), &
378380
fswabs (:,:,iblk), flwout (:,:,iblk), &
379381
evap (:,:,iblk), &
@@ -599,18 +601,22 @@ subroutine step_therm2 (dt)
599601
call add_new_ice (nx_block, ny_block, &
600602
icells, &
601603
indxi, indxj, &
602-
tmask (:,:, iblk), dt, &
603-
aicen (:,:,:,iblk), &
604-
trcrn (:,:,:,:,iblk), &
605-
vicen (:,:,:,iblk), &
606-
eicen (:,:,:,iblk), &
607-
aice0 (:,:, iblk), &
608-
aice (:,:, iblk), &
609-
frzmlt (:,:, iblk), &
610-
frazil (:,:, iblk), &
611-
frz_onset(:,:, iblk), yday, &
612-
Tf (:,:, iblk), l_stop, &
613-
istop, jstop)
604+
tmask (:,:, iblk), dt, &
605+
aicen (:,:,:,iblk), &
606+
trcrn (:,:,:,:,iblk), &
607+
vicen (:,:,:,iblk), &
608+
eicen (:,:,:,iblk), &
609+
aice0 (:,:, iblk), &
610+
aice (:,:, iblk), &
611+
frzmlt (:,:, iblk), &
612+
frazil (:,:, iblk), &
613+
frz_onset (:,:, iblk), yday, &
614+
fresh (:,:, iblk), &
615+
fresh_hist(:,:, iblk), &
616+
fsalt (:,:, iblk), &
617+
fsalt_hist(:,:, iblk), &
618+
Tf (:,:, iblk), l_stop, &
619+
istop , jstop)
614620

615621
if (l_stop) then
616622
write (nu_diag,*) 'istep1, my_task, iblk =', &
@@ -676,7 +682,7 @@ subroutine step_therm2 (dt)
676682
fresh (:,:, iblk), fresh_hist(:,:,iblk), &
677683
fsalt (:,:, iblk), fsalt_hist(:,:,iblk), &
678684
fhocn (:,:, iblk), fhocn_hist(:,:,iblk), &
679-
l_stop, &
685+
heat_capacity, l_stop, &
680686
istop, jstop)
681687

682688
if (l_stop) then
@@ -1379,6 +1385,15 @@ subroutine step_rad2 (dt)
13791385

13801386
enddo ! iblk
13811387

1388+
!----------------------------------------------------------------
1389+
! Store grid box mean fluxes before scaled by aice_init
1390+
!----------------------------------------------------------------
1391+
1392+
fresh_hist_gbm (:,:,:) = fresh_hist (:,:,:)
1393+
fsalt_hist_gbm (:,:,:) = fsalt_hist (:,:,:)
1394+
fhocn_hist_gbm (:,:,:) = fhocn_hist (:,:,:)
1395+
fswthru_hist_gbm(:,:,:) = fswthru_hist(:,:,:)
1396+
13821397
call scale_hist_fluxes ! to match coupler fluxes
13831398

13841399
end subroutine step_rad2

0 commit comments

Comments
 (0)