Solve merge conflict with model/src/w3ounf3metamd.F90

CarstenHansen · Nov 16, 2023 · 7a05488 · 7a05488
2 parents a424694 + f1e9b1d
commit 7a05488
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/model/src/w3ounf3metamd.F90 b/model/src/w3ounf3metamd.F90
@@ -398,13 +398,13 @@ SUBROUTINE INIT_META(VEC)
       DO J = 1,NOGE(I)
         ! Does the field have sub-fields?
         S=I*NOGMAX+J
-        DO K=1,size(SPIJ2)
-          IF ( SPIJ2(K) .EQ. S ) EXIT
-        ENDDO
-        IF ( SPIJ2(K) .NE. S ) THEN
+        IF ( .NOT. ANY( SPIJ2 .EQ. S ) ) THEN 
           ALLOCATE(GROUP(I)%FIELD(J)%META(3)) ! Hardcode to 3 components for the moment
         ELSE
-          ! If S is one of the fields with sub-fields
+          DO K=1,size(SPIJ2)
+            IF ( SPIJ2(K) .EQ. S ) EXIT
+          ENDDO
+          ! S is index K in the fields with sub-fields
           NFSMAX = MAX( NFSMAX, NSP(K) )
           ALLOCATE(GROUP(I)%FIELD(J)%SUBFIELD(NSP(K)))
           DO S = 1,NSP(K)