Changeset 7646 for trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90

@@ -1251 +1251 @@
 
       ! At the end of the day get interpolated means
-      IF ( idayend == 0 .AND. ldnightav ) THEN
-
-         ALLOCATE( &
-            & zsurfm(2,2,isurf)  &
-            & )
-
-         CALL obs_int_comm_2d( 2, 2, isurf, kpi, kpj, igrdi, igrdj, &
-            &               surfdataqc%vdmean(:,:), zsurfm )
-
+      IF (ldnightav ) THEN
+         IF ( idayend == 0 ) THEN
+
+            ALLOCATE( &
+               & zsurfm(2,2,isurf)  &
+               & )
+
+            CALL obs_int_comm_2d( 2, 2, isurf, kpi, kpj, igrdi, igrdj, &
+               &               surfdataqc%vdmean(:,:), zsurfm )
+
+         ENDIF
       ENDIF
 
@@ -1322 +1324 @@
 
       ! At the end of the day also deallocate night-time mean array
-      IF ( idayend == 0 .AND. ldnightav ) THEN
-         DEALLOCATE( &
-            & zsurfm  &
-            & )
+      IF ( ldnightav ) THEN
+         IF ( idayend == 0 ) THEN
+            DEALLOCATE( &
+               & zsurfm  &
+               & )
+         ENDIF
       ENDIF