Changeset 9630

Timestamp:

2018-05-24T20:50:11+02:00 (6 years ago)

Author:

antsia

Message:

Code for divergence correction

Location:

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM

Files:

• CONFIG/SHARED/field_def.xml (modified) (1 diff)
• CONFIG/SHARED/namelist_ref (modified) (1 diff)
• NEMO/OPA_SRC/DOM/dom_oce.F90 (modified) (1 diff)
• NEMO/OPA_SRC/DOM/domain.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/DOM/iscplhsb.F90 (added)
• NEMO/OPA_SRC/DOM/iscplini.F90 (added)
• NEMO/OPA_SRC/DOM/iscplrst.F90 (added)
• NEMO/OPA_SRC/DOM/istate.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/DYN/divcur.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/IOM/restart.F90 (modified) (1 diff)
• NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (1 diff)
• NEMO/OPA_SRC/oce.F90 (modified) (2 diffs)

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -11 +11 @@
 ============================================================================================================
     -->
-   <field_definition level="1" prec="4" operation="average" enabled=".TRUE." default_value="1.e20" detect_missing_value="true"> <!-- time step automaticaly defined -->
+   <field_definition level="1" prec="4" operation="average" enabled=".TRUE." default_value="1.e20" detect_missing_value="false"> <!-- time step automaticaly defined -->
 
     <!-- 

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -494 +494 @@
                           !     if you want to keep the cd as in global config, adjust rn_gammat0 to compensate
                           ! 2 = velocity and stability dependent Gamma    Holland et al. 1999
+/
+!-----------------------------------------------------------------------
+&namsbc_iscpl  !   land ice / ocean coupling option
+!-----------------------------------------------------------------------
+   nn_drown  = 10       ! number of iteration of the extrapolation loop (fill the new wet cells)
+   ln_hsb    = .false.  ! activate conservation module (conservation exact after a time of rn_fiscpl)
+   nn_fiscpl = 43800    ! (number of time step) conservation period (maybe should be fix to the coupling frequencey of restart frequency)
 /
 !-----------------------------------------------------------------------

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -43 +43 @@
    INTEGER , PUBLIC ::   nn_closea       !: =0 suppress closed sea/lake from the ORCA domain or not (=1)
    INTEGER , PUBLIC ::   nn_euler        !: =0 start with forward time step or not (=1)
+   LOGICAL , PUBLIC ::   ln_iscpl       !: coupling with ice sheet
    LOGICAL , PUBLIC ::   ln_crs          !: Apply grid coarsening to dynamical model output or online passive tracers
 

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -138 +138 @@
          &             nn_no   , cn_exp    , cn_ocerst_in, cn_ocerst_out, ln_rstart , ln_rstdate, nn_rstctl,   &
          &             nn_it000, nn_itend  , nn_date0    , nn_leapy     , nn_istate , nn_stock ,   &
-         &             nn_write, ln_dimgnnn, ln_mskland  , ln_cfmeta    , ln_clobber, nn_chunksz, nn_euler
+         &             nn_write, ln_dimgnnn, ln_mskland  , ln_cfmeta    , ln_clobber, nn_chunksz, nn_euler, ln_iscpl
       NAMELIST/namdom/ nn_bathy, rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin,   &
          &             nn_acc   , rn_atfp     , rn_rdt      , rn_rdtmin ,                  &
@@ -193 +193 @@
          WRITE(numout,*) '      overwrite an existing file      ln_clobber = ', ln_clobber
          WRITE(numout,*) '      NetCDF chunksize (bytes)        nn_chunksz = ', nn_chunksz
+         WRITE(numout,*) '      IS coupling at the restart step ln_iscpl   = ', ln_iscpl
       ENDIF
 

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

@@ -37 +37 @@
    USE eosbn2          ! equation of state            (eos bn2 routine)
    USE domvvl          ! varying vertical mesh
+   USE iscplrst        ! ice sheet coupling
    USE dynspg_oce      ! pressure gradient schemes
    USE dynspg_flt      ! filtered free surface
@@ -91 +92 @@
          !                                    ! -------------------
          CALL rst_read                           ! Read the restart file
+         IF (ln_iscpl)       CALL iscpl_stp      ! extraloate restart to wet and dry
          CALL day_init                           ! model calendar (using both namelist and restart infos)
       ELSE

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/NEMO/OPA_SRC/DYN/divcur.F90

@@ -35 +35 @@
    USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
+   USE iscplhsb
 
    IMPLICIT NONE
@@ -327 +328 @@
       !                                                ! ===============
 
+      IF( ln_iscpl .AND. kt == nit000)   THEN 
+         IF(lwp) WRITE(numout,*) 'for nit000, update hdivn after calling div_cur with the divergence correction'
+                          CALL iscpl_div( hdivn ) !
+      ENDIF
       IF( ln_rnf      )   CALL sbc_rnf_div( hdivn )                            ! runoffs (update hdivn field)
       IF( ln_divisf .AND. (nn_isf .GT. 0) )   CALL sbc_isf_div( hdivn )          ! ice shelf (update hdivn field)

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -169 +169 @@
                      ENDIF
                      ENDIF
+                  IF ( ln_iscpl ) THEN
+                     CALL iom_rstput( kt, nitrst, numrow, 'tmask'  , tmask     ) ! need to extrapolate T/S
+                     CALL iom_rstput( kt, nitrst, numrow, 'umask'  , umask     ) ! need to correct barotropic velocity
+                     CALL iom_rstput( kt, nitrst, numrow, 'vmask'  , vmask     ) ! need to correct barotropic velocity
+                     CALL iom_rstput( kt, nitrst, numrow, 'smask'  , ssmask    ) ! need to correct barotropic velocity
+                     CALL iom_rstput( kt, nitrst, numrow, 'fse3t_n', fse3t_n(:,:,:) )   ! need to compute temperature correction
+                     CALL iom_rstput( kt, nitrst, numrow, 'fse3u_n', fse3u_n(:,:,:) )   ! need to compute bt conservation
+                     CALL iom_rstput( kt, nitrst, numrow, 'fse3v_n', fse3v_n(:,:,:) )   ! need to compute bt conservation
+                     CALL iom_rstput( kt, nitrst, numrow, 'fsdepw_n', fsdepw_n(:,:,:) ) ! need to compute extrapolation if vvl
+                  END IF
+
                      IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
 

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -220 +220 @@
       !
       !
+
+      !---start the tendency with tracer source/sink from divergence correction
+      IF ( ln_iscpl .AND. kt == nit000) THEN        
+         IF (lwp) WRITE(numout,*) 'add tendency tsa due to re-meshing at kt = nit000'
+         tsa(:,:,:,jp_tem) = tsa(:,:,:,jp_tem) + rhdivdiff_trac(:,:,:,jp_tem)*tmask(:,:,:)
+         tsa(:,:,:,jp_sal) = tsa(:,:,:,jp_sal) + rhdivdiff_trac(:,:,:,jp_sal)*tmask(:,:,:)
+      ENDIF
+
       !----------------------------------------
       !       Ice Shelf effects (ISF)

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/NEMO/OPA_SRC/oce.F90

@@ -71 +71 @@
    !! Energy budget of the leads (open water embedded in sea ice)
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   fraqsr_1lev        !: fraction of solar net radiation absorbed in the first ocean level [-]
+
+  !!------array used for divergence correction
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  rhdivdiff
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) ::  rhdivdiff_trac
  
    !! Arrays used in coupling when MEDUSA is present. These arrays need to be declared
@@ -129 +133 @@
          &     ge3rui(jpi,jpj)   , ge3rvi(jpi,jpj)   ,                     &
          &     grui(jpi,jpj)     , grvi(jpi,jpj)     ,                     &
-         &     riceload(jpi,jpj),                             STAT=ierr(2) )
+         &     riceload(jpi,jpj),  rhdivdiff(jpi,jpj,jpk), rhdivdiff_trac(jpi,jpj,jpk,2) ,  STAT=ierr(2) )
          !
       ALLOCATE( snwice_mass(jpi,jpj) , snwice_mass_b(jpi,jpj), snwice_fmass(jpi,jpj) , STAT=ierr(3) )