Fixing record length for CHIMERE adjoint; adapting tests to run CHIMERE on gitlab

.gitlab-ci.yml

@@ -119,7 +119,7 @@ pages:
 # Run the tests
 tests:
   stage: test
-  image: pycif/pycif-ci:0.2
+  image: pycif/pycif-debug:0.1
   before_script:
     - apt-get update
     - pip freeze
@@ -136,8 +136,8 @@ tests:
       - reports/pytest*.html
       - reports/coverage/
       - coverage/.current_coverage
-  only:
-    - devel
+  except:
+    - LSCE
 
 # Check the code format using flake8
 # code_format:

model_sources/chimereGES/src_ad/model/awrite_concs_hour.F90

@@ -25,7 +25,7 @@ subroutine awrite_concs_hour(iop, idout)
         write(idoutstr, '(i2.2)')idout
         fnconc = 'TMPconchour' // idoutstr
         recordlen = 2 * nspectot * (nverti * nmerid * nzonal + (nverti + 1) * (nmerid + 6) * (nzonal + 6))
-        call opfi(ifnconch, fnconc, 'd', 'n', recordlen)
+        call opfi(ifnconch, fnconc, 'd', 'n', 8 * recordlen)
     endif
 
     ! direct print

model_sources/chimereGES/src_ad/model/awrite_concs_phys.F90

@@ -28,7 +28,7 @@ subroutine awrite_concs_phys(iop, idout, moreid)
         write(moreidstr, '(i5.5)')moreid
         fnconc = 'TMPconcphys' // idoutstr // '_' // moreidstr
         recordlen = 2 * nspectot * (nverti * nmerid * nzonal + (nverti + 1) * (nmerid + 6) * (nzonal + 6))
-        call opfi(ifnconcp, fnconc, 'd', 'n', recordlen)
+        call opfi(ifnconcp, fnconc, 'd', 'n', 8 * recordlen)
 
     endif
     ! direct print
@@ -45,7 +45,7 @@ subroutine awrite_concs_phys(iop, idout, moreid)
        write(moreidstr, '(i5.5)')moreid
        fnconc = 'TMPconcphys' // idoutstr // '_' // moreidstr
        recordlen = 2 * nspectot * (nverti * nmerid * nzonal + (nverti + 1) * (nmerid + 6) * (nzonal + 6))
-       call opfi(ifnconcp, fnconc, 'd', 'n', recordlen)
+       call opfi(ifnconcp, fnconc, 'd', 'n', 8 * recordlen)
     endif
 
     ! adjoint read: loop to ensure to read the right table

pycif-debug.Dockerfile

@@ -14,10 +14,10 @@ RUN cd /tmp \
     && ./configure --prefix=${NCDIR} --disable-netcdf-4 \
     && make install;
 
-COPY . /tmp/CIF
+COPY ACAD_TEST /tmp/CIF
 
-RUN cd /tmp/CIF/ \
-    && python setup.py install
-
-RUN cd /tmp/CIF/config_files/tuto_chimere/ \
-    && python -m pycif config_chimere_fwd_academic_onespec.yml;
+#RUN cd /tmp/CIF/ \
+#    && python setup.py install
+#
+#RUN cd /tmp/CIF/config_files/tuto_chimere/ \
+#    && python -m pycif config_chimere_fwd_academic_onespec.yml;

tests/chimere/fixtures/__init__.py

@@ -12,8 +12,8 @@ def ref_chimere(tmpdir):
     """
     current_dir = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
     root_dir = os.path.abspath(os.path.join(current_dir, "../../.."))
-    data_dir = "${PYCIF_DATATEST}/CHIMERE/"
-    input_dir = "{}/ACADOK/3hour/".format(data_dir)
+    data_dir = "${PYCIF_DATATEST}/"
+    input_dir = "{}/ACADOK/".format(data_dir)
     
     tmpdir_str = tmpdir.strpath
 
@@ -31,7 +31,7 @@ def ref_chimere(tmpdir):
             "autorestart": True,
         },
         "platform": {
-            "plugin": {"name": "LSCE", "version": "obelix"},
+            "plugin": {"name": "docker", "version": "cif"},
             "cores": 10,
             "queue": "mediump"
         },
@@ -47,11 +47,12 @@ def ref_chimere(tmpdir):
             "direxec": os.path.join(
                 root_dir, "model_sources/chimereGES/"
             ),
+            "auto-compile": True,
             "periods": "3H",
             "nphour_ref": 6,
             "ichemstep": 1,
             "ideepconv": 0,
-            "nzdoms": 3,
+            "nzdoms": 1,
             "nmdoms": 1,
             "nivout": 17,
             "nlevemis": 17,

tests/chimere/fixtures/setups/melchior.py

@@ -9,8 +9,8 @@ def setup_melchior(ref_chimere):
     (tmp_dir, config, marker) = ref_chimere
     
     # Data directory
-    data_dir = "${PYCIF_DATATEST}/CHIMERE/"
-    input_dir = "{}/ACADOK/3hour/".format(data_dir)
+    data_dir = "${PYCIF_DATATEST}/"
+    input_dir = "{}/ACADOK/".format(data_dir)
     
     # Update parameters
     config["chemistry"]["schemeid"] = "univ.melchior2"

tests/chimere/test_integration_1fwd.py

@@ -11,6 +11,7 @@ from pycif.utils.datastores.dump import read_datastore
 @pytest.mark.chimere
 @pytest.mark.short
 @pytest.mark.long
+@pytest.mark.test_in_ci
 def test_integration_fwd(pytestconfig, chimere_config_fwd):
     """
     Integration test that runs the chimere_forward model.