Changeset 15411 for NEMO/branches/UKMO

Timestamp:

2021-10-20T11:41:34+02:00 (3 years ago)

Author:

hadjt

Message:

Region means updated to calculate river and precip/evap heat flux given surface temperature

File:

• NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/DIA/diaregmean.F90 (modified) (9 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/DIA/diaregmean.F90

@@ -160 +160 @@
       
       IF(ln_diaregmean_diasbc) THEN   
-        ALLOCATE( tmp_field_SBC_mat(jpi,jpj,7),  STAT= ierr ) !SBC terms
+        ALLOCATE( tmp_field_SBC_mat(jpi,jpj,9),  STAT= ierr ) !SBC terms
             IF( ierr /= 0 )   CALL ctl_stop( 'tmp_field_SBC_mat: failed to allocate tmp_field_SBC_mat array' )
         tmp_field_SBC_mat(:,:,:) = 0.
@@ -494 +494 @@
       CHARACTER (len=120), DIMENSION(19) ::    name_dat_mat
       CHARACTER (len=120), DIMENSION(4)  ::    name_AR5_mat
-      CHARACTER (len=120), DIMENSION(7)  ::    name_SBC_mat
+      CHARACTER (len=120), DIMENSION(9)  ::    name_SBC_mat
       CHARACTER (len=120), DIMENSION(4)  ::    name_HSCM_mat
       INTEGER                            ::    vi     
@@ -500 +500 @@
       REAL(wp), DIMENSION(19)            ::    output_mulitpler_dat_mat
       REAL(wp), DIMENSION(4)             ::    output_mulitpler_AR5_mat
-      REAL(wp), DIMENSION(7)             ::    output_mulitpler_SBC_mat
+      REAL(wp), DIMENSION(9)             ::    output_mulitpler_SBC_mat
       REAL(wp), DIMENSION(4)             ::    output_mulitpler_HSVM_mat
 
@@ -691 +691 @@
             tmp_field_SBC_mat(:,:,7) = tmp_field_SBC_mat(:,:,7) + (rnf*tmask(:,:,1))
             name_SBC_mat(7) = 'rnf'
+
+            tmp_field_SBC_mat(:,:,8) = tmp_field_SBC_mat(:,:,8) + (emp*tmask(:,:,1)*tsn(:,:,1,jp_tem)*3850.)
+            name_SBC_mat(8) = 'empheat'
+            tmp_field_SBC_mat(:,:,9) = tmp_field_SBC_mat(:,:,9) + (rnf*tmask(:,:,1)*tsn(:,:,1,jp_tem)*3850.)
+            name_SBC_mat(9) = 'rnfheat'
+
         ENDIF
 
@@ -723 +729 @@
                    IF (iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_ave'))))    .OR. &
                      & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_tot'))))    .OR. &
+                     & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_totheat'))))    .OR. &
                      & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_var'))))    .OR. &
                      & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_cnt'))))    .OR. &
@@ -746 +753 @@
                 IF (iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_ave'))))    .OR. &
                   & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_tot'))))    .OR. &
+                  & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_totarea'))))    .OR. &
                   & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_var'))))    .OR. &
                   & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_cnt'))))    .OR. &
@@ -763 +771 @@
                     IF (iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_ave'))))    .OR. &
                       & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_tot'))))    .OR. &
+                      & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_totarea'))))    .OR. &
                       & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_var'))))    .OR. &
                       & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_cnt'))))    .OR. &
@@ -776 +785 @@
 
             IF( ln_diaregmean_diasbc  ) THEN
-                DO vi=1,7 ! State loop
+                DO vi=1,9 ! State loop
 
                     tmp_name=TRIM( name_SBC_mat(vi) )
                     IF (iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_ave'))))    .OR. &
                       & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_tot'))))    .OR. &
+                      & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_totarea'))))    .OR. &
                       & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_var'))))    .OR. &
                       & iom_use(trim( trim(trim("reg_") // trim(tmp_name) // trim('_cnt'))))    .OR. &
@@ -1122 +1132 @@
           !ENDIF
           
-          !calculate the mean and variance from the total, sum of squares and the count. 
+          ! calculate the mean and variance from the total, sum of squares and the count. 
           ! When area weighting, you can't area weight the total.
           ! this if block may be redundant, as totarea_mat == tot_mat, and cnt_mat == area_mat when ln_diaregmean_areawgt == False