Changeset 3449

Timestamp:

Jan 25, 2019, 6:27:10 PM (5 years ago)

Author:

oboucher

Message:

changed hard coded CO2 molar mass to corresponding variable
and capitalize all of: if endif or and

File:

• LMDZ6/trunk/libf/phylmd/phyetat0.F90 (modified) (12 diffs)

LMDZ6/trunk/libf/phylmd/phyetat0.F90

@@ -110 +110 @@
   IF (carbon_cycle_tr .OR. carbon_cycle_cpl) THEN
      co2_ppm = tab_cntrl(3)
-     RCO2    = co2_ppm * 1.0e-06  * 44.011/28.97 
+     RCO2    = co2_ppm * 1.0e-06  * RMCO2/28.97 
      ! ELSE : keep value from .def
-  END IF
+  ENDIF
 
   ! co2_ppm0 : initial value of atmospheric CO2 (from create_etat0_limit.e .def)
@@ -121 +121 @@
   tab_cntrl(6)=nbapp_rad
 
-  if (iflag_cycle_diurne.GE.1) tab_cntrl( 7) = iflag_cycle_diurne
-  if (soil_model) tab_cntrl( 8) =1.
-  if (new_oliq) tab_cntrl( 9) =1.
-  if (ok_orodr) tab_cntrl(10) =1.
-  if (ok_orolf) tab_cntrl(11) =1.
-  if (ok_limitvrai) tab_cntrl(12) =1.
+  IF (iflag_cycle_diurne.GE.1) tab_cntrl( 7) = iflag_cycle_diurne
+  IF (soil_model) tab_cntrl( 8) =1.
+  IF (new_oliq) tab_cntrl( 9) =1.
+  IF (ok_orodr) tab_cntrl(10) =1.
+  IF (ok_orolf) tab_cntrl(11) =1.
+  IF (ok_limitvrai) tab_cntrl(12) =1.
 
   itau_phy = tab_cntrl(15)
@@ -222 +222 @@
         zmasq(i) = fractint(i)
      ENDIF
-  END DO
+  ENDDO
   fractint (1 : klon) =  pctsrf(1 : klon, is_oce)  &
        + pctsrf(1 : klon, is_sic)
@@ -233 +233 @@
         zmasq(i) = 1. - fractint(i)
      ENDIF
-  END DO
+  ENDDO
 
 !===================================================================
@@ -358 +358 @@
   !          dummy values (as is the case when generated by ce0l,
   !          or by iniaqua)
-  if ( (maxval(q_ancien).eq.minval(q_ancien))       .or. &
-       (maxval(ql_ancien).eq.minval(ql_ancien))     .or. &
-       (maxval(qs_ancien).eq.minval(qs_ancien))     .or. &
-       (maxval(prw_ancien).eq.minval(prw_ancien))   .or. &
-       (maxval(prlw_ancien).eq.minval(prlw_ancien)) .or. &
-       (maxval(prsw_ancien).eq.minval(prsw_ancien)) .or. &
-       (maxval(t_ancien).eq.minval(t_ancien)) ) then
+  IF ( (maxval(q_ancien).EQ.minval(q_ancien))       .OR. &
+       (maxval(ql_ancien).EQ.minval(ql_ancien))     .OR. &
+       (maxval(qs_ancien).EQ.minval(qs_ancien))     .OR. &
+       (maxval(prw_ancien).EQ.minval(prw_ancien))   .OR. &
+       (maxval(prlw_ancien).EQ.minval(prlw_ancien)) .OR. &
+       (maxval(prsw_ancien).EQ.minval(prsw_ancien)) .OR. &
+       (maxval(t_ancien).EQ.minval(t_ancien)) ) THEN
     ancien_ok=.false.
-  endif
+  ENDIF
 
   found=phyetat0_get(klev,clwcon,"CLWCON","CLWCON",0.)
@@ -433 +433 @@
         found=phyetat0_get(1,trs(:,it),"trs_"//tname(iiq), &
               "Surf trac"//tname(iiq),0.)
-     END DO
+     ENDDO
      CALL traclmdz_from_restart(trs)
   ENDIF
@@ -443 +443 @@
         IF (ierr /= 0) CALL abort_physic('phyetat0', 'pb allocation co2_send', 1)
         found=phyetat0_get(1,co2_send,"co2_send","co2 send",co2_ppm)
-     END IF
-  END IF
+     ENDIF
+  ENDIF
 
 !===========================================
@@ -451 +451 @@
 
 !  ondes de gravite non orographiques
-  if (ok_gwd_rando) found = &
+  IF (ok_gwd_rando) found = &
        phyetat0_get(klev,du_gwd_rando,"du_gwd_rando","du_gwd_rando",0.)
-  IF (.not. ok_hines .and. ok_gwd_rando) found &
+  IF (.NOT. ok_hines .AND. ok_gwd_rando) found &
        = phyetat0_get(klev,du_gwd_front,"du_gwd_front","du_gwd_front",0.)
 
@@ -477 +477 @@
         IF (.NOT. found) THEN
             found=phyetat0_get(1,tslab,"tslab","tslab",0.)
-        END IF
+        ENDIF
       ELSE
           DO i=1,nslay
             WRITE(str2,'(i2.2)') i
             found=phyetat0_get(1,tslab(:,i),"tslab"//str2,"tslab",0.)  
-          END DO
-      END IF
+          ENDDO
+      ENDIF
       IF (.NOT. found) THEN 
           PRINT*, "phyetat0: Le champ <tslab> est absent"
@@ -489 +489 @@
           DO i=1,nslay
               tslab(:,i)=MAX(ftsol(:,is_oce),271.35)
-          END DO
-      END IF 
+          ENDDO
+      ENDIF 
 
       ! Sea ice variables
@@ -499 +499 @@
               PRINT*, "Initialisation a tsol_sic"
                   tice(:)=ftsol(:,is_sic)
-          END IF 
+          ENDIF 
           found=phyetat0_get(1,seaice,"seaice","seaice",0.)
           IF (.NOT. found) THEN
@@ -507 +507 @@
               WHERE (pctsrf(:,is_sic).GT.EPSFRA)
                   seaice=917.
-              END WHERE
-          END IF
-      END IF !sea ice INT
-  END IF ! Slab        
+              ENDWHERE
+          ENDIF
+      ENDIF !sea ice INT
+  ENDIF ! Slab        
 
   ! on ferme le fichier