Changeset 5889 for branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

Timestamp:

2015-11-13T17:58:13+01:00 (8 years ago)

Author:

kuniko

Message:

Incorporated flux adjustment. Job compiles and runs.

File:

• branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -90 +90 @@
          &             ln_blk_mfs, ln_apr_dyn, nn_ice, nn_ice_embd, ln_dm2dc   , ln_rnf   ,   &
          &             ln_ssr    , nn_isf    , nn_fwb, ln_cdgw    , ln_wave    , ln_sdw   ,   &
-         &             nn_lsm    , nn_limflx , nn_components, ln_cpl
+         &             nn_lsm    , nn_limflx , nn_components, ln_cpl, ln_flx_adj
       INTEGER  ::   ios
       INTEGER  ::   ierr, ierr0, ierr1, ierr2, ierr3, jpm
@@ -144 +144 @@
          WRITE(numout,*) '              iceshelf formulation                       nn_isf      = ', nn_isf
          WRITE(numout,*) '              Sea Surface Restoring on SST and/or SSS    ln_ssr      = ', ln_ssr
+         WRITE(numout,*) '              Sea Surface Flux adjustment on heat and/or freshwater    ln_flx_adj      = ', ln_flx_adj
          WRITE(numout,*) '              FreshWater Budget control  (=0/1/2)        nn_fwb      = ', nn_fwb
          WRITE(numout,*) '              closed sea (=0/1) (set in namdom)          nn_closea   = ', nn_closea
@@ -299 +300 @@
       !
       ! KY 12/11/2015
-                               CALL sbc_flx_adj_init           ! Sea-Surface Flux adjustment
+      IF( ln_flx_adj       )   CALL sbc_flx_adj_init           ! Sea-Surface Flux adjustment
       !
       IF( ln_ssr           )   CALL sbc_ssr_init               ! Sea-Surface Restoring initialisation
@@ -404 +405 @@
  
       ! KY 12/11/2015
-                             CALL sbc_flx_adj( kt )               ! add flux adjustment term
+      IF( ln_flx_adj     )   CALL sbc_flx_adj( kt )               ! add flux adjustment term
  
       IF( ln_ssr         )   CALL sbc_ssr( kt )                   ! add SST/SSS damping term