FIX typo

DassHydro · Sep 18, 2024 · 15c862e · 15c862e
1 parent 599c952
commit 15c862e
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 47 deletions.
diff --git a/smash/fcore/forward/forward_openmp_db.f90 b/smash/fcore/forward/forward_openmp_db.f90
@@ -15224,12 +15224,12 @@ SUBROUTINE GR4_RI_TIME_STEP_D(setup, mesh, input_data, options, &
     beta = 9._sp/4._sp*(86400._sp/setup%dt)**0.25_sp
     pn_d = 0.0_4
 !$OMP PARALLEL DO NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
-!$OMP&ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, ac_hi, ac_hp&
-!$OMP&, ac_ht, ac_qt), SHARED(ac_prcp_d, ac_ci_d, ac_cp_d, ac_ct_d, &
-!$OMP&ac_kexc_d, ac_hi_d, ac_hp_d, ac_ht_d, ac_qt_d), PRIVATE(row, col, &
-!$OMP&k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split&
-!$OMP&), PRIVATE(pn_d, en_d, pr_d, perc_d, l_d, prr_d, prd_d, qr_d, qd_d&
-!$OMP&, split_d), PRIVATE(temp), SCHEDULE(static)
+!$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, &
+!$OMP&ac_hi, ac_hp, ac_ht, ac_qt), SHARED(ac_prcp_d, ac_ci_d, ac_cp_d, &
+!$OMP&ac_ct_d, ac_kexc_d, ac_hi_d, ac_hp_d, ac_ht_d, ac_qt_d), PRIVATE(&
+!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
+!$OMP&, qd, split), PRIVATE(pn_d, en_d, pr_d, perc_d, l_d, prr_d, prd_d&
+!$OMP&, qr_d, qd_d, split_d), PRIVATE(temp), SCHEDULE(static)
     DO col=1,mesh%ncol
       DO row=1,mesh%nrow
         IF (.NOT.(mesh%active_cell(row, col) .EQ. 0 .OR. mesh%&
@@ -15331,10 +15331,10 @@ SUBROUTINE GR4_RI_TIME_STEP_B(setup, mesh, input_data, options, &
 ! Beta percolation parameter is time step dependent
     beta = 9._sp/4._sp*(86400._sp/setup%dt)**0.25_sp
 !$OMP PARALLEL NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
-!$OMP&ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, ac_hi, ac_hp&
-!$OMP&, ac_ht, ac_qt), PRIVATE(row, col, k, time_step_returns, pn, en, &
-!$OMP&pr, perc, l, prr, prd, qr, qd, split), PRIVATE(chunk_start, &
-!$OMP&chunk_end)
+!$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, &
+!$OMP&ac_hi, ac_hp, ac_ht, ac_qt), PRIVATE(row, col, k, &
+!$OMP&time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split), &
+!$OMP&PRIVATE(chunk_start, chunk_end)
     CALL GETSTATICSCHEDULE(1, mesh%ncol, 1, chunk_start, chunk_end)
     DO col=chunk_start,chunk_end
       DO row=1,mesh%nrow
@@ -15391,13 +15391,13 @@ SUBROUTINE GR4_RI_TIME_STEP_B(setup, mesh, input_data, options, &
     ac_prcp_b = 0.0_4
     pn_b = 0.0_4
 !$OMP PARALLEL NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
-!$OMP&ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, ac_hi, ac_hp&
-!$OMP&, ac_ht, ac_qt), SHARED(ac_prcp_b, ac_ci_b, ac_cp_b, ac_ct_b, &
-!$OMP&ac_kexc_b, ac_hi_b, ac_hp_b, ac_ht_b, ac_qt_b), PRIVATE(row, col, &
-!$OMP&k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split&
-!$OMP&), PRIVATE(pn_b, en_b, pr_b, perc_b, l_b, prr_b, prd_b, qr_b, qd_b&
-!$OMP&, split_b), PRIVATE(branch, chunk_end, chunk_start), PRIVATE(&
-!$OMP&temp_b)
+!$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, &
+!$OMP&ac_hi, ac_hp, ac_ht, ac_qt), SHARED(ac_prcp_b, ac_ci_b, ac_cp_b, &
+!$OMP&ac_ct_b, ac_kexc_b, ac_hi_b, ac_hp_b, ac_ht_b, ac_qt_b), PRIVATE(&
+!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
+!$OMP&, qd, split), PRIVATE(pn_b, en_b, pr_b, perc_b, l_b, prr_b, prd_b&
+!$OMP&, qr_b, qd_b, split_b), PRIVATE(branch, chunk_end, chunk_start), &
+!$OMP&PRIVATE(temp_b)
     CALL POPREAL4(en)
     CALL POPREAL4(split)
     CALL POPREAL4(prr)
@@ -15506,9 +15506,10 @@ SUBROUTINE GR4_RI_TIME_STEP(setup, mesh, input_data, options, returns&
 ! Beta percolation parameter is time step dependent
     beta = 9._sp/4._sp*(86400._sp/setup%dt)**0.25_sp
 !$OMP PARALLEL DO NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
-!$OMP&ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, ac_hi, ac_hp&
-!$OMP&, ac_ht, ac_qt), PRIVATE(row, col, k, time_step_returns, pn, en, &
-!$OMP&pr, perc, l, prr, prd, qr, qd, split), SCHEDULE(static)
+!$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, &
+!$OMP&ac_hi, ac_hp, ac_ht, ac_qt), PRIVATE(row, col, k, &
+!$OMP&time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split), &
+!$OMP&                                                  SCHEDULE(static)
     DO col=1,mesh%ncol
       DO row=1,mesh%nrow
         IF (.NOT.(mesh%active_cell(row, col) .EQ. 0 .OR. mesh%&
@@ -17258,13 +17259,13 @@ SUBROUTINE GR5_RI_TIME_STEP_D(setup, mesh, input_data, options, &
     beta = 9._sp/4._sp*(86400._sp/setup%dt)**0.25_sp
     pn_d = 0.0_4
 !$OMP PARALLEL DO NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
-!$OMP&ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2, ac_ct, &
-!$OMP&ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), SHARED(ac_prcp_d, &
-!$OMP&ac_ci_d, ac_cp_d, ac_alpha1_d, ac_alpha2_d, ac_ct_d, ac_kexc_d, &
-!$OMP&ac_aexc_d, ac_hi_d, ac_hp_d, ac_ht_d, ac_qt_d), PRIVATE(row, col, &
-!$OMP&k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split&
-!$OMP&), PRIVATE(pn_d, en_d, pr_d, perc_d, l_d, prr_d, prd_d, qr_d, qd_d&
-!$OMP&, split_d), PRIVATE(temp), SCHEDULE(static)
+!$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2&
+!$OMP&, ac_ct, ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), SHARED(&
+!$OMP&ac_prcp_d, ac_ci_d, ac_cp_d, ac_alpha1_d, ac_alpha2_d, ac_ct_d, &
+!$OMP&ac_kexc_d, ac_aexc_d, ac_hi_d, ac_hp_d, ac_ht_d, ac_qt_d), PRIVATE&
+!$OMP&(row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
+!$OMP&, qd, split), PRIVATE(pn_d, en_d, pr_d, perc_d, l_d, prr_d, prd_d&
+!$OMP&, qr_d, qd_d, split_d), PRIVATE(temp), SCHEDULE(static)
     DO col=1,mesh%ncol
       DO row=1,mesh%nrow
         IF (.NOT.(mesh%active_cell(row, col) .EQ. 0 .OR. mesh%&
@@ -17366,10 +17367,10 @@ SUBROUTINE GR5_RI_TIME_STEP_B(setup, mesh, input_data, options, &
 ! Beta percolation parameter is time step dependent
     beta = 9._sp/4._sp*(86400._sp/setup%dt)**0.25_sp
 !$OMP PARALLEL NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
-!$OMP&ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2, ac_ct, &
-!$OMP&ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), PRIVATE(row, col, k&
-!$OMP&, time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split)&
-!$OMP&, PRIVATE(chunk_start, chunk_end)
+!$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2&
+!$OMP&, ac_ct, ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), PRIVATE(&
+!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
+!$OMP&, qd, split), PRIVATE(chunk_start, chunk_end)
     CALL GETSTATICSCHEDULE(1, mesh%ncol, 1, chunk_start, chunk_end)
     DO col=chunk_start,chunk_end
       DO row=1,mesh%nrow
@@ -17427,14 +17428,14 @@ SUBROUTINE GR5_RI_TIME_STEP_B(setup, mesh, input_data, options, &
     ac_prcp_b = 0.0_4
     pn_b = 0.0_4
 !$OMP PARALLEL NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
-!$OMP&ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2, ac_ct, &
-!$OMP&ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), SHARED(ac_prcp_b, &
-!$OMP&ac_ci_b, ac_cp_b, ac_alpha1_b, ac_alpha2_b, ac_ct_b, ac_kexc_b, &
-!$OMP&ac_aexc_b, ac_hi_b, ac_hp_b, ac_ht_b, ac_qt_b), PRIVATE(row, col, &
-!$OMP&k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split&
-!$OMP&), PRIVATE(pn_b, en_b, pr_b, perc_b, l_b, prr_b, prd_b, qr_b, qd_b&
-!$OMP&, split_b), PRIVATE(branch, chunk_end, chunk_start), PRIVATE(&
-!$OMP&temp_b)
+!$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2&
+!$OMP&, ac_ct, ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), SHARED(&
+!$OMP&ac_prcp_b, ac_ci_b, ac_cp_b, ac_alpha1_b, ac_alpha2_b, ac_ct_b, &
+!$OMP&ac_kexc_b, ac_aexc_b, ac_hi_b, ac_hp_b, ac_ht_b, ac_qt_b), PRIVATE&
+!$OMP&(row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
+!$OMP&, qd, split), PRIVATE(pn_b, en_b, pr_b, perc_b, l_b, prr_b, prd_b&
+!$OMP&, qr_b, qd_b, split_b), PRIVATE(branch, chunk_end, chunk_start), &
+!$OMP&PRIVATE(temp_b)
     CALL POPREAL4(en)
     CALL POPREAL4(split)
     CALL POPREAL4(prr)
@@ -17544,10 +17545,10 @@ SUBROUTINE GR5_RI_TIME_STEP(setup, mesh, input_data, options, returns&
 ! Beta percolation parameter is time step dependent
     beta = 9._sp/4._sp*(86400._sp/setup%dt)**0.25_sp
 !$OMP PARALLEL DO NUM_THREADS(options%comm%ncpu), SHARED(setup, mesh, &
-!$OMP&ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2, ac_ct, &
-!$OMP&ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), PRIVATE(row, col, k&
-!$OMP&, time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split)&
-!$OMP&, SCHEDULE(static)
+!$OMP&returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2&
+!$OMP&, ac_ct, ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt), PRIVATE(&
+!$OMP&row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr&
+!$OMP&, qd, split), SCHEDULE(static)
     DO col=1,mesh%ncol
       DO row=1,mesh%nrow
         IF (.NOT.(mesh%active_cell(row, col) .EQ. 0 .OR. mesh%&

diff --git a/smash/fcore/operator/md_gr_operator.f90 b/smash/fcore/operator/md_gr_operator.f90
@@ -449,8 +449,8 @@ subroutine gr4_ri_time_step(setup, mesh, input_data, options, returns, time_step
         beta = (9._sp/4._sp)*(86400._sp/setup%dt)**0.25_sp
 #ifdef _OPENMP
         !$OMP parallel do schedule(static) num_threads(options%comm%ncpu) &
-        !$OMP& shared(setup, mesh, returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_ct, ac_kexc, ac_hi, ac_hp, ac_ht, &
-        !$OMP& ac_qt) &
+        !$OMP& shared(setup, mesh, returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, &
+        !$OMP&  ac_ct, ac_kexc, ac_hi, ac_hp, ac_ht, ac_qt) &
         !$OMP& private(row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split)
 #endif
         do col = 1, mesh%ncol
@@ -1025,8 +1025,8 @@ subroutine gr5_ri_time_step(setup, mesh, input_data, options, returns, time_step
 
 #ifdef _OPENMP
         !$OMP parallel do schedule(static) num_threads(options%comm%ncpu) &
-        !$OMP& shared(setup, mesh, returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, ac_alpha1, ac_alpha2, ac_ct, ac_kexc, ac_aexc, ac_hi, &
-        !$OMP& ac_hp, ac_ht, ac_qt) &
+        !$OMP& shared(setup, mesh, returns, ac_prcp, ac_pet, ac_ci, ac_cp, beta, &
+        !$OMP& ac_alpha1, ac_alpha2, ac_ct, ac_kexc, ac_aexc, ac_hi, ac_hp, ac_ht, ac_qt) &
         !$OMP& private(row, col, k, time_step_returns, pn, en, pr, perc, l, prr, prd, qr, qd, split)
 #endif
         do col = 1, mesh%ncol