Changeset 5128 for LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis

Timestamp:

Jul 25, 2024, 5:47:25 PM (4 months ago)

Author:

abarral

Message:

Correct bug in vlspltqs_loc.f90 from r2270 where we call SSUM with incorrect arguments.
Merge the three different versions of abort_gcm into one
Fix seq, para 3D compilation broken from r5107 onwards
(lint) usual + Remove uneeded fixed-form continuations

Location:

LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis

Files:

• sisvat_qso.f90 (modified) (1 diff)
• surf_inlandsis_mod.F90 (modified) (2 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/sisvat_qso.f90

@@ -533 +533 @@
       ist    =   isotSV(ikl)                   ! Soil Type
       SatRat =  (eta_SV(ikl,isl)-etadSV(ist)) & ! OverSaturation Rate
-            *ro_Wat         *dzAvSV(isl) & !
-            *LSdzsv(ikl) & !
-            /dt__SV        !
-      SoRnOF(ikl)     =          SoRnOF(ikl) & !
-            + max(zero,SatRat)       !
-      RuofSV(ikl,3)   = RuofSV(ikl,3) + &
-            + max(zero,SatRat)
+            *ro_Wat         *dzAvSV(isl) &
+            *LSdzsv(ikl) &
+            /dt__SV
+      SoRnOF(ikl)     = SoRnOF(ikl) + max(zero,SatRat)
+      RuofSV(ikl,3)   = RuofSV(ikl,3) + max(zero,SatRat)
       eta_SV(ikl,isl) = max(epsi & !
   ! #ED.                         +etamSV(isotSV(ikl))!

LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/surf_inlandsis_mod.F90

@@ -783 +783 @@
         min_period = 1800. ! en secondes
         dalph_soil = 2.    ! rapport entre les epaisseurs de 2 couches succ.
-        !$OMP MASTER
+        !!! !$OMP MASTER
         !     IF (is_mpi_root) THEN
         !        OPEN(99,file='soil.def',status='old',form='formatted',iostat=ierr)
@@ -795 +795 @@
         !        END IF
         !     ENDIF
-        !$OMP END MASTER
+        !!! !$OMP END MASTER
         !     CALL bcast(min_period)
         !     CALL bcast(dalph_soil)