Add 'calc_dragio' to namelist and add a test

Add the 'calc_dragio' flag introduced in the previous commit to the Icepack namelist. Add a test for the new feature in the base_suite.
CICE-Consortium · Jun 9, 2021 · 2e761e5 · 2e761e5
1 parent 92f8646
commit 2e761e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/configuration/driver/icedrv_init.F90 b/configuration/driver/icedrv_init.F90
@@ -102,7 +102,7 @@ subroutine input_data
       ! Flux convergence tolerance
       real (kind=dbl_kind) :: atmiter_conv
 
-      logical (kind=log_kind) :: calc_Tsfc, formdrag, highfreq, calc_strair
+      logical (kind=log_kind) :: calc_Tsfc, formdrag, highfreq, calc_strair, calc_dragio
       logical (kind=log_kind) :: conserv_check
 
       integer (kind=int_kind) :: ntrcr
@@ -158,7 +158,7 @@ subroutine input_data
         update_ocn_f,    l_mpond_fresh,   ustar_min,       &
         fbot_xfer_type,  oceanmixed_ice,  emissivity,      &
         formdrag,        highfreq,        natmiter,        &
-        atmiter_conv,                        &
+        atmiter_conv,    calc_dragio,                      &
         tfrz_option,     default_season,  wave_spec_type,  &
         precip_units,    fyear_init,      ycycle,          &
         atm_data_type,   ocn_data_type,   bgc_data_type,   &
@@ -186,7 +186,7 @@ subroutine input_data
            albicev_out=albicev, albicei_out=albicei, ksno_out = ksno,   &
            albsnowv_out=albsnowv, albsnowi_out=albsnowi, &
            natmiter_out=natmiter, ahmax_out=ahmax, shortwave_out=shortwave, &
-           atmiter_conv_out = atmiter_conv, &
+           atmiter_conv_out = atmiter_conv, calc_dragio_out=calc_dragio, &
            albedo_type_out=albedo_type, R_ice_out=R_ice, R_pnd_out=R_pnd, &
            R_snw_out=R_snw, dT_mlt_out=dT_mlt, rsnw_mlt_out=rsnw_mlt, &
            kstrength_out=kstrength, krdg_partic_out=krdg_partic, &
@@ -578,6 +578,7 @@ subroutine input_data
          write(nu_diag,1005) ' atmiter_conv              = ', atmiter_conv
          write(nu_diag,1010) ' calc_strair               = ', calc_strair
          write(nu_diag,1010) ' calc_Tsfc                 = ', calc_Tsfc
+         write(nu_diag,1010) ' calc_dragio               = ', calc_dragio
          write(nu_diag,1005) ' floediam                  = ', floediam
          write(nu_diag,1005) ' hfrazilmin                = ', hfrazilmin
 
@@ -757,7 +758,7 @@ subroutine input_data
            albicev_in=albicev, albicei_in=albicei, ksno_in=ksno, &
            albsnowv_in=albsnowv, albsnowi_in=albsnowi, &
            natmiter_in=natmiter, ahmax_in=ahmax, shortwave_in=shortwave, &
-           atmiter_conv_in = atmiter_conv, &
+           atmiter_conv_in = atmiter_conv, calc_dragio_in=calc_dragio, &
            albedo_type_in=albedo_type, R_ice_in=R_ice, R_pnd_in=R_pnd, &
            R_snw_in=R_snw, dT_mlt_in=dT_mlt, rsnw_mlt_in=rsnw_mlt, &
            kstrength_in=kstrength, krdg_partic_in=krdg_partic, &

diff --git a/configuration/scripts/icepack_in b/configuration/scripts/icepack_in
@@ -87,6 +87,7 @@
     natmiter        = 5
     atmiter_conv    = 0.0d0
     ustar_min       = 0.0005
+    calc_dragio     = .false.
     emissivity      = 0.985
     fbot_xfer_type  = 'constant'
     update_ocn_f    = .false.

diff --git a/configuration/scripts/options/set_nml.calcdragio b/configuration/scripts/options/set_nml.calcdragio
@@ -0,0 +1 @@
+calc_dragio = .true.
diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts
@@ -16,6 +16,7 @@ smoke          col     1x1        debug,run1year,leap,dt30min
 smoke          col     1x1        debug,run1year,dyn
 smoke          col     1x1        debug,run1year,fsd12
 smoke          col     1x1        debug,run1year,fsd1
+smoke          col     1x1        debug,run1year,calcdragio
 restart        col     1x1        debug
 restart        col     1x1        diag1
 restart        col     1x1        pondcesm