Remove OMP loop around buoyancy initialisation

vt-max · Werner Kramer · commit a06b51291f41 · 2024-01-15T12:32:50.000+01:00
diff --git a/model_efdc_dll/native/efdc_fortran_dll/openDA_wrapper/model_init_3.for b/model_efdc_dll/native/efdc_fortran_dll/openDA_wrapper/model_init_3.for
@@ -714,15 +714,7 @@ C
 C  
 C **  INITIALIZE BUOYANCY AND EQUATION OF STATE  
 C  
-!$OMP PARALLEL DO PRIVATE(LF,LL)
-
-      do ithds=0,nthds-1
-         LF=jse(1,ithds)
-         LL=jse(2,ithds)
-c
-         CALL CALBUOY(LF,LL)
-c
-      enddo   
+      CALL CALBUOY
 C  
 C **  INITIALIZE SFL IF(ISRESTI.EQ.0.AND ISTRAN(4).GE.1)  
 C  
diff --git a/model_efdc_dll/native/efdc_fortran_dll/original_efdc_files/CALBUOY.for b/model_efdc_dll/native/efdc_fortran_dll/original_efdc_files/CALBUOY.for
@@ -9,7 +9,6 @@ C
 	IMPLICIT NONE
 	INTEGER::NS,K,L
 	REAL::RHOO,SSTMP,TTMP,RHTMP,PRES,CCON,TMP,TEM0
-        INTEGER::LF,LL,ithds
 C  
       IF(IBSC.EQ.1) GOTO 1000  
       ISPCOR=0  

Original file line number	Diff line number	Diff line change
`@@ -714,15 +714,7 @@ C`
`714`	`714`	`C`
`715`	`715`	`C ** INITIALIZE BUOYANCY AND EQUATION OF STATE`
`716`	`716`	`C`
`717`		`-!$OMP PARALLEL DO PRIVATE(LF,LL)`
`718`		`-`
`719`		`- do ithds=0,nthds-1`
`720`		`- LF=jse(1,ithds)`
`721`		`- LL=jse(2,ithds)`
`722`		`-c`
`723`		`- CALL CALBUOY(LF,LL)`
`724`		`-c`
`725`		`- enddo`
	`717`	`+ CALL CALBUOY`
`726`	`718`	`C`
`727`	`719`	`C ** INITIALIZE SFL IF(ISRESTI.EQ.0.AND ISTRAN(4).GE.1)`
`728`	`720`	`C`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ C`
`9`	`9`	`IMPLICIT NONE`
`10`	`10`	`INTEGER::NS,K,L`
`11`	`11`	`REAL::RHOO,SSTMP,TTMP,RHTMP,PRES,CCON,TMP,TEM0`
`12`		`- INTEGER::LF,LL,ithds`
`13`	`12`	`C`
`14`	`13`	`IF(IBSC.EQ.1) GOTO 1000`
`15`	`14`	`ISPCOR=0`