Changeset 11200 for branches/UKMO

Timestamp:

2019-07-01T10:51:24+02:00 (5 years ago)

Author:

emmafiedler

Message:

Avoid multiple lines of write statement and change of variable name following CICE review

Location:

branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC

Files:

• OBS/obs_prep.F90 (modified) (1 diff)
• SBC/sbcice_cice.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC/OBS/obs_prep.F90

@@ -736 +736 @@
       
            IF ( ( kobsstp(jobs) == (nit000 - 1) ) ) THEN
-              WRITE(numout,*)( 'Sea-ice not initialised on zeroth '// &
-                        &    'time-step but observation valid then, flagging '// &
+              IF (lwp) WRITE(numout,*)( 'Sea-ice not initialised on zeroth '// &
+                        &    'time-step but SIT observation valid then, flagging '// &
                              'in time check subroutine obs_coo_tim.' )                  
               kobsqc(jobs) = IBSET(kobsqc(jobs),13)

branches/UKMO/dev_r5518_obs_oper_update_icethick/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -57 +57 @@
                 flatn_f,fsurfn_f,fcondtopn_f,                    &
 #ifdef key_asminc
-                daice_da,dsit_da,fresh_da,fsalt_da,             &
+                daice_da,dhi_da,fresh_da,fsalt_da,             &
 #endif
                 uatm,vatm,wind,fsw,flw,Tair,potT,Qa,rhoa,zlvl,   &
@@ -516 +516 @@
 !Ice thickness change (from assimilation)
       ztmp(:,:)=ndsit_da(:,:)*tmask(:,:,1)
-      Call nemo2cice(ztmp,dsit_da,'T', 1. )
+      Call nemo2cice(ztmp,dhi_da,'T', 1. )
 #endif